Commit graph

1183 commits

Author SHA1 Message Date
Val Bancer
92e380737d fixed failing shell dispatcher test 2016-11-08 10:44:08 +01:00
Val Bancer
467ee851bf some refactoring to fix failed shell dispatcher tests 2016-11-08 10:03:46 +01:00
Val Bancer
aa21244593 accept webroot shell parameter 2016-11-08 00:40:46 +01:00
Mark Sch
bf908762db Remove dead code 2016-10-07 01:35:26 +02:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
nojimage
9a5d5705cd TestShell support --coverage-text option 2016-08-08 20:13:40 +09: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
Mark Story
5b83f702c9 Merge pull request #8759 from xhs345/patch-2
2.x cake bake Controller: Only add Flash component when required
2016-05-03 22:20:13 -04:00
Marc Würth
d640e6874a Add new forum link to home page 2016-05-03 14:19:25 +02:00
mark_story
12c6fd4e22 Merge branch '2.x' into 2.next 2016-05-02 21:58:41 -04:00
Alex
31cddbe48a Only add Flash component when required
If a user selected no to the question "Would you like to use Session flash messages?" it would still use the Flash component, but not use it
2016-05-02 14:37:47 -07: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
153f04a976 Changes behaviour of _useLogger so that already-configured loggers are not overridden 2016-04-22 13:56:26 +01:00
mscherer
657b1a1029 Fix doc block param types. 2016-04-08 15:02:03 +02:00
mscherer
dda9e83ab6 Refactor Object to CakeObject for future PHP7 comp. 2016-04-08 14:33:26 +02: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
mark_story
3b5a71df37 Merge branch '2.7' into 2.8 2016-01-28 21:51:59 -05:00
Edgaras Janušauskas
fde1d08b43 Fix PHPDoc @return by replacing $this to self 2016-01-28 23:10:42 +02:00
mark_story
91109c33b2 Merge branch '2.7' into 2.8 2016-01-19 21:15:08 -05:00
mscherer
c06bde34d6 Backport CODE_ERROR constant and return as per expectation. 2016-01-19 16:53:23 +01:00
Larry E. Masters
0aa8847762 Merge pull request #7840 from cakephp/2.8-PHP7
2.8 PHP7 compatibility
2015-12-29 00:27:33 -05:00
mark_story
b5e64bbad5 Merge branch '2.7' into 2.8 2015-12-24 16:20:27 -05:00
Mark S
fd021909ba Remove an empty line output 2015-12-22 17:10:42 +01:00
mark_story
8343f6c81d Merge branch '2.8' of github.com:cakephp/cakephp into 2.8 2015-12-21 12:41:52 -05:00
mark_story
37fe25909f Merge branch '2.7' into 2.8 2015-12-20 21:59:43 -05:00
Edgaras Janušauskas
c6fdcea3aa Clear model cache after schema update. 2015-12-17 22:38:35 +02:00
Gareth Ellis
e640420dd9 Re-order code in Shell::helper() to return slightly earlier 2015-12-14 09:48:36 +00:00
Gareth Ellis
75cabfe78b Rename ShellHelper to BaseShellHelper to avoid potential naming conflicts with existing apps 2015-12-14 09:47:22 +00:00
Gareth Ellis
7ba19c717e Update docblock for ConsoleOutput::overwrite() $size param 2015-12-01 17:09:42 +00:00
Gareth Ellis
031ae3d105 Use traditional array syntax 2015-12-01 15:37:06 +00:00
Gareth Ellis
d84b6a2c22 Use traditional array syntax 2015-12-01 15:32:54 +00:00
Gareth Ellis
56cfe8492a Use traditional array syntax 2015-12-01 15:32:06 +00: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 Scherer
8c5f78bc58 Remove another type hint 2015-11-10 00:32:48 +01:00
mark_story
707915e693 Merge branch '2.7' into 2.8 2015-10-15 22:10:56 -04:00
Marc Würth
86da57d2be Minor improvements to the front controller 2015-10-04 15:38:48 +02:00
mark_story
a6a699b4b9 Merge branch '2.7' into 2.8 2015-09-28 21:17:45 -04:00
Marc Würth
26a05a4e87 Update another link to DebugKit 2.2 branch 2015-09-28 12:51:30 +02:00
Marc Würth
2d82a120af CS 2015-09-28 12:47:25 +02:00
Marc Würth
f1160b7401 Update link to DebugKit 2.2 branch
Refs https://github.com/cakephp/debug_kit/issues/372
2015-09-28 12:47:14 +02: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
Mark Story
0da9c4976d Merge pull request #7448 from ravage84/2.7-tests-improved
Various improvements to the CakePHP test files
2015-09-25 18:00:14 -04:00
Mark Story
3aec527fad Merge pull request #7449 from ravage84/2.7-app-skel-sync
App & skel folder sync + some improvements
2015-09-25 12:49:20 -04:00
Mark Story
12f5aee5a2 Merge pull request #7447 from ravage84/2.7-lib-improvements
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
1267586f23 Re-add closing tags to ctp files
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715
2015-09-25 18:10:18 +02:00
Marc Würth
5eedc0f2bb Fix broken test 2015-09-25 17:55:01 +02:00
Marc Würth
dbfd2c44e9 App & skel folder sync + some improvements
Mostly CS, doc blocks and some CSS
2015-09-25 17:25:35 +02:00
Marc Würth
e690662f0e Various improvments to the CakePH Plib files
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +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
Mark Scherer
450a544eb4 Backport 3.x limit of fixture data generation. 2015-09-13 13:12:53 +02:00
Jose Lorenzo Rodriguez
40d628530a Merge branch '2.7' into 2.8 2015-08-21 10:54:30 +02:00
mattmemmesheimer
d3cf879195 Updating deprecated SessionComponent::setFlash calls to FlashComponent magic calls. 2015-08-16 18:01:23 -05:00
mattmemmesheimer
604cb0e48b Including the FlashComponent by default in the controller when baking. 2015-08-16 17:58:41 -05:00
mark_story
ca19b63a32 Merge branch '2.7' into 2.8 2015-08-07 22:04:46 -04:00
Mark Scherer
3f15c8a199 fix templates 2015-08-05 11:45:27 +02:00
Mark Story
58bede76d1 Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
Marc Würth
27c88a872b Use tabs and single spaces in all .htaccess files 2015-08-01 00:39:10 +02:00
Mark Scherer
a239324a0d use constant PHP_SAPI 2015-07-26 15:35:03 +02:00
mark_story
7f6ab82c9b Merge branch '2.7' into 2.8 2015-07-25 21:49:03 -04:00
Mark Story
de4b44a37b Merge pull request #7077 from dereuromark/2.7-static
Replacing self with static due to PHP5.3+. Following #7040.
2015-07-23 22:27:37 -04:00
Marc Würth
b412b405f9 Make fixture import from table aware of records found 2015-07-23 18:03:42 +02:00
Marc Würth
71e4ed91af Slightly improve the bake templates 2015-07-23 17:29:47 +02:00
antograssiot
94b2ea29a6 enable colors for windows ConEmu user
backport of #7090
2015-07-23 05:49:15 +02:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following #7040. 2015-07-21 10:22:53 +02: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
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
mark_story
ae2ea1ea6c Merge branch '2.6' into 2.7 2015-06-25 21:50:47 -04:00
Mark Scherer
1c56c723f5 Backport param() access. 2015-06-25 00:52:33 +02:00
Highstrike
8257100f54 How about this? 2015-06-24 15:46:48 +03:00
Humberto Pereira
26630991a6 CakeShells should not print html in case of a error 2015-06-20 22:19:07 -04:00
mark_story
d7d8b90986 Merge branch '2.6' into 2.7 2015-05-28 19:34:59 -04: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
f742fa51fe Dont include deprecated options for bake 2015-05-17 23:24:23 +02:00
Mark Scherer
4f3602ad5f Adjust bake, docblocks and tests for notBlank. 2015-05-17 22:27:16 +02:00
ovidiupruteanu
a55685c278 Replace preg_replace with basename in SchemaShell 2015-05-11 14:52:31 +03:00
ovidiupruteanu
4b3386c16f Replace rtrim with preg_replace in SchemaShell
The second parameter of rtrim is a character mask, not a string to be replaced. It was breaking file names ending in one or more 'p' or 'h' characters.
2015-05-11 14:35:20 +03: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
Edgaras Janušauskas
b444fe7b81 Do not warn about i18n functions definitions on extract task 2015-03-16 23:16:50 +02:00
Jonas
5f40161e24 2.6.2: cake bake / ModelTask should respect decimal
PR for https://github.com/cakephp/cakephp/issues/6066
2015-03-13 21:35:12 +01:00
mark_story
63769ae4a6 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
AD7six
5066bc33b4 Fix whitespace for paginator counter call 2015-02-23 16:46:43 +00:00
AD7six
5342605d92 The parentheses were unbalanced 2015-02-23 15:21:39 +00:00
mark_story
831fe53f79 Ignore LC_TIME category when extracting messages.
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.

Refs #5933
2015-02-22 22:39:38 -05:00
Michael Houghton
4f2ed15612 fix for confirm message on the bake templates 2015-02-21 10:21:37 +00:00