Commit graph

409 commits

Author SHA1 Message Date
mark_story
e8d63725d8 Merge branch '2.x' into 2.next 2016-09-04 23:54:22 -04:00
Marc Würth
f2638b3e38 Remove superfluous "Class" from doc blocks 2016-08-10 12:22:09 +02:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
nojimage
e71d83c612 TestShell passes the 'directive' option to PHPUnit correctly 2016-08-08 20:09:37 +09:00
mark_story
432eb9c432 Merge branch '2.x' into 2.next 2016-06-27 21:47:47 -04:00
xhs345
4d65091d0c Updated tests 2016-05-03 15:39:37 -07:00
mark_story
12c6fd4e22 Merge branch '2.x' into 2.next 2016-05-02 21:58:41 -04:00
mark_story
9536a10d6d Make schema import plugin friendly.
The changes in #8694 pointed out that schema importing doesn't play nice
with plugins. This corrects that.
2016-04-23 16:18:15 -04:00
mark_story
3a75e8aa72 Use import options when going through execute()
The `records` and `schema` options should work when using execute().
Previously they were not working. Furthermore, the records option did
a non-sensical thing where it both set import=>records and generated
static records from the live table. The `records` option now enables
the generation of static data from a live table, as I think this is
a more common scenario.

Refs #8693
2016-04-23 16:15:54 -04:00
Mark Story
be35880b2f Merge pull request #8692 from garethellis36/dont-override-shell-loggers
Don't override already-configured loggers
2016-04-22 16:05:03 -04:00
Gareth Ellis
bfb6ebb049 PHPCS fixes 2016-04-22 19:21:47 +01:00
Gareth Ellis
bc3a1fb6c5 Makes ShellTest::testShellLoggersDoNotGetOverridden actually useful 2016-04-22 19:18:29 +01:00
Gareth Ellis
153f04a976 Changes behaviour of _useLogger so that already-configured loggers are not overridden 2016-04-22 13:56:26 +01:00
mscherer
dda9e83ab6 Refactor Object to CakeObject for future PHP7 comp. 2016-04-08 14:33:26 +02:00
mark_story
4389c79442 Update tests.
The old tests were relying on the fixed inherit bug. Instead check
a specific permission which will result in a deny.

Refs #8114
2016-02-18 21:24:52 -05:00
mark_story
c0d897b45c Merge branch '2.x' into 2.8 2016-02-06 20:55:08 -05:00
Edgaras Janušauskas
f389231058 Improve ExtractTask when CakePHP installed via Composer 2016-02-03 14:52:15 +02:00
Gareth Ellis
3f992695b2 Use traditional array syntax 2015-12-01 15:16:54 +00:00
Gareth Ellis
eafee25d13 PHPCS fixes 2015-12-01 14:26:22 +00:00
Gareth Ellis
6b6a90e5c1 Add table shell helper 2015-12-01 13:29:08 +00:00
Gareth Ellis
53b9dc83f6 Add helper method to shell class for loading/fetching helper instances 2015-12-01 13:07:56 +00:00
Gareth Ellis
2854940693 Renamed progress helper files to include Shell to avoid conflicts with existing view helpers 2015-12-01 13:07:32 +00:00
Gareth Ellis
788c57dd4b Add progress helper 2015-12-01 12:03:09 +00:00
Gareth Ellis
e580ad813e Add overwrite method to ConsoleOutput class 2015-12-01 12:01:39 +00:00
mark_story
c26b7bbffe Fix PHPCS errors and failing test.
Refs #7577
2015-10-20 21:08:57 -04:00
mark_story
ae83e197dc Merge branch '2.8' of github.com:cakephp/cakephp into 2.8 2015-09-27 11:13:12 -04:00
mark_story
8a57d78dba Merge branch '2.7' into 2.8 2015-09-27 11:12:55 -04:00
Marc Würth
1ede742d92 Various improvements to the CakePHP test files
Mostly CS, doc blocks and unused variables.
2015-09-25 17:22:00 +02:00
Marc Würth
5b41a9b52d Swallow the "--quiet" shell parameter before calling PHPUnit.
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions

Resolves #7432
2015-09-22 14:25:53 +02:00
Jose Lorenzo Rodriguez
40d628530a Merge branch '2.7' into 2.8 2015-08-21 10:54:30 +02:00
mattmemmesheimer
d4467f9acf Fixing unit tests. 2015-08-18 22:14:10 -05:00
mark_story
ca19b63a32 Merge branch '2.7' into 2.8 2015-08-07 22:04:46 -04:00
Marc Würth
b412b405f9 Make fixture import from table aware of records found 2015-07-23 18:03:42 +02:00
Walter Nasich
9d74bb289c Fixing a coding standars issue 2015-07-14 00:04:04 -03:00
Walter Nasich
80896cef2a Replacing param --locations by boolean flag --no-location 2015-07-13 19:47:26 -03:00
Walter Nasich
06b8cb0c30 Renaming option 'headers' to 'locations' 2015-07-13 00:54:11 -03:00
Walter Nasich
67d81e499e Removing trivial asserts from UT 2015-07-12 23:30:14 -03:00
Walter Nasich
44756eaac5 Adding a new option to i18n shell to generate .pot files without sentence references 2015-07-12 23:08:50 -03:00
mark_story
47378427e3 Merge branch '2.6' into 2.7 2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf Capitalize Windows, the OS 2015-07-09 15:54:03 +02:00
mark_story
cbd45f702d Make FlashComponent/FlashHelper more backwards compatible.
Merge branch 'issue-6874' into 2.7.

Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
Highstrike
a9d77d26f0 fix failing tests
fixing...
2015-06-25 13:40:50 +03:00
Mark Scherer
1c56c723f5 Backport param() access. 2015-06-25 00:52:33 +02:00
mark_story
9626f0e726 Exclude deprecated validators from bake.
Don't include deprecated validators in bake.

Refs #6581
2015-05-22 22:03:32 -04:00
Mark Scherer
4f3602ad5f Adjust bake, docblocks and tests for notBlank. 2015-05-17 22:27:16 +02:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
mark_story
5a6a74e2f8 Fix failing tests.
The test was taking the wrong index when creating mock path choices.

Refs #6125
2015-03-20 20:35:43 -04:00
mark_story
63769ae4a6 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
AD7six
d7d2516dc1 Remove unwanted whitespace 2015-02-23 17:22:55 +00:00
AD7six
b151295f1b Add a better test for the index being correct 2015-02-23 16:46:23 +00:00