Commit graph

410 commits

Author SHA1 Message Date
euromark
99d6932ecc Fix project baking 2014-07-24 18:43:48 +02:00
Marlin Cremers
fbeb8fe26b Add the other translation shortcuts for context support 2014-07-21 15:47:04 +02:00
mark_story
0aabc5d910 Merge branch 'master' into 2.6 2014-07-18 21:50:05 -04:00
Mark Story
dbe7329e54 Merge pull request #3703 from MMS-Projects/i18n-context-2.6
Basic support for I18n contexts as requested by #2063
2014-07-18 21:48:19 -04:00
David Yell
28ec1c40a5 When specifying Session as a component and using Session flash messages, you end up with 'Paginator, Session, Session' which doesn't make sense. Added an array_unique to remove any duplicated components. 2014-07-18 15:37:22 +01:00
Marlin Cremers
b47f91c47c Add context support to the I18n class which resolves cakephp/cakephp#2063
This change adds Gettext context support to the I18n class. This
allows custom translations for verbs and nouns and more.
2014-07-17 11:01:11 +02:00
euromark
974ca851c2 Correct doc blocks according to cs guidelines.
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
mark_story
f6c868d706 Fix remaining doc block errors in Console/ 2014-05-27 23:34:53 -04:00
Mischa ter Smitten
329fd3fe4c Consistent use of Shell::err for errors 2014-05-27 12:29:09 +02:00
ADmad
d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
euromark
a7744e6ff4 a few more corrections 2014-04-08 01:49:33 +02:00
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
mark_story
b8e21c99ee Only count _id if it is the last 3 characters in the field name.
This prevents issues when baking models for tables containing `_id`.

Fixes #3230
2014-04-04 21:26:31 -04:00
ADmad
9de3418079 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
Mark Story
7a72431442 Merge pull request #2770 from ukk1337/master
Added missing 'Session'-Component in bake
2014-02-09 16:04:25 -05:00
Eric Martins
2793dca671 Fix ApiGen errors 2014-02-07 18:29:54 -02:00
mark_story
be8ebfc005 Merge branch 'master' into 2.5 2014-02-05 09:22:46 -05:00
ukk1337
3cd6bb39bd fixed coding standard errors 2014-02-04 15:37:23 +01:00
ukk1337
60c289fd68 removed indentation 2014-02-04 13:47:50 +01:00
ukk1337
9670a5af88 Added missing 'Session'-Compomnent in bake
If a Controller was baked interactively and one want to use Session flash messages, the required 'Session'-Component wasn't added to the $components-Array
2014-02-04 13:35:48 +01:00
mark_story
4d57d3ce5b Fix plugin path filtering when directories do not exist.
When paths do not exist we should correctly remove them from the output
paths.

Fixes #2748
2014-01-30 21:40:08 -05:00
mark_story
c1ab6fa9d1 Merge branch 'master' into 2.5 2014-01-30 10:13:37 -05:00
joostdekeijzer
42daa25340 Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly 2014-01-29 14:53:52 +01:00
mark_story
75dd2ff1fb Merge branch 'master' into 2.5 2014-01-16 15:20:40 -05:00
pummra
5605ff48ab Update ControllerTask.php
Removed $admin from message in regards to no controllers being baked in all() function
2014-01-08 12:23:03 +00:00
pummra
a981c7fa8c Removed trailing whitespace. 2014-01-08 10:16:06 +00:00
pummra
0214ac403e Update ControllerTask.php
Updated if statement for clarity and also fixed spelling mistake.
2014-01-08 10:10:40 +00:00
pummra
d41bb0b1b3 Update ControllerTask.php
Added an output message if no controllers are baked using the all() function.
2014-01-08 09:52:05 +00:00
Ber Clausen
5c08c77b93 Set console options in the same fashion for every shell/task. 2013-12-05 22:59:01 -03:00
mark_story
430ef88118 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
eac6d7850f Remove pointless array cast. 2013-11-23 12:36:15 -05:00
mark_story
311189a662 Sort tables before returning them.
This fixes unsorted table lists in the various bake related tasks.

Fixes #2386
2013-11-23 12:34:16 -05:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Marc Würth
19b972cfeb Implemented skipping of fields for the data validation rules when baking a model 2013-11-13 13:36:19 +01:00
ADmad
d9ca148499 Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
euromark
fca8a01c15 Correct casing of class names. 2013-10-21 22:34:29 +02:00
mark_story
bcafde6212 Add numeric validator for float fields by default.
Make bake add numeric validator to float fields.

Fixes #2163
2013-10-20 22:54:30 -04:00
wyrihaximus
ac9b7f3882 Refactored the shell reflection portion into a seperate task. 2013-10-02 22:30:12 +02:00
euromark
0ae69aace9 App::import to App::uses 2013-09-25 19:40:14 +02:00
euromark
653aed7701 is_a() to instance of - completes PR 1669 2013-09-24 22:57:51 +02:00
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00
mark_story
4f237e6a93 Merge branch '2.4' making 2.4 into the master branch.
Conflicts:
	lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
Mark van Driel
256e1f6532 Removed unused variable 2013-08-29 10:49:23 +02:00
Mark van Driel
cce1fafd80 Fixed typo in comments 2013-08-28 18:49:34 +02:00
Mark van Driel
ed10c3332d Fixed typos in text and comments 2013-08-27 21:12:03 +02:00
Mark van Driel
c4ec8bedd0 Fixed category constant values: constants in Cake don't use the same values as PHP (Linux) 2013-08-27 12:30:39 +02:00
Mark van Driel
1fd936f3cc Fixed cross-platform issue: LC_* constants have different values on windows 2013-08-27 10:51:00 +02:00
Mark van Driel
88d7fbeb53 Extract category strings to separate .po files 2013-08-25 23:04:05 +02:00
euromark
361980fade remove code, class names and paths from translation strings. 2013-08-21 00:05:53 +02:00
mark_story
0f2d59d987 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
euromark
6cf147e8c8 unify null checks - avoid method call in favor of strict check 2013-08-16 20:12:49 +02:00
Phally
6b41eaa950 Merge branch 'master' into 2.4 2013-07-26 19:44:11 +02:00
Phally
5953171c7b Fixes cake bake all. Refs #1443. 2013-07-20 20:21:35 +02:00
Phally
6d6be87f8f Replaces deprecated paginate() calls in controller bake templates.
Fixes #3895.
2013-07-20 16:59:39 +02:00
euromark
0b6919ee94 force option for bake tasks (view, model, controller, test, fixture) 2013-07-18 13:09:00 +02:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
Rachman Chavik
542d594b86 Fix deprecated value in argument and disable caching
This aligns better with changes required in the 3.x branch.
Related: 4bb0a122
2013-07-08 21:55:14 +07:00
ADmad
4ded269549 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
Rachman Chavik
4bb0a1228a Fix I18n to extract plugin model validation messages 2013-07-07 11:20:14 +07:00
euromark
af455b4121 correct return types in doc blocks 2013-07-05 17:19:22 +02:00
mark_story
c597855fe4 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
euromark
f389435bae coding standards and else block simplification 2013-07-03 19:27:17 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
Mischa ter Smitten
dad1f16eaf Made _stop() usage in Consoles / Tasks more consistent 2013-07-01 14:15:54 +02:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
4518624187 more whitespace coding standard corrections 2013-06-09 17:39:48 +02:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
Arnold Almeida
dacf7e0ebe Update FixtureTask.php
Using err() does not stop shell output when used in the context of a script. 

Also no nice color syntax to indicate that there was an error with one of the fixture generations.

Using error() fixes that.
2013-06-07 14:21:35 +08:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Christian Winther
5aac41ed43 Fix indentation and add short option 't' for template 2013-05-29 13:49:12 +00:00
Christian Winther
ae3d9a7a8e Remove ` from help line 2013-05-29 13:46:13 +00:00
Christian Winther
2fca41c35d Enable the user to provide a CLI theme through the --theme option for all bake tasks 2013-05-29 13:41:57 +00:00
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
Mischa ter Smitten
c0039f642e Output to stderr, not stdout 2013-05-25 23:19:31 +02:00
Mischa ter Smitten
caec0abcfc Fix for ExtractTask does not check output directory (ticket 3852) 2013-05-25 22:32:07 +02:00
euromark
e3e11a48e6 fix some domain translations and remove leftover true param from 1.x 2013-05-22 11:15:01 +02:00
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
euromark
e1d6bb2120 code is not translatable and should not be part of the translation strings 2013-05-17 15:54:55 +02:00
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
euromark
0959c7008f add schema param and skip interactive prompts if unnecessary 2013-05-02 00:19:46 +02:00
mark_story
aee8b50507 Merge branch 'master' into 2.4 2013-04-15 21:48:26 -04:00
mark_story
8eb56960d8 Remove remaining reference operators.
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
euromark
dab0c5e753 Allow behaviors to be added to bake templates and improve doc blocks 2013-03-15 12:14:06 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
Ceeram
e2ebeefda0 add CAKE to the paths after handling parameters that depend on _isExtractingApp() return value, fixes LH-3442 2013-03-04 14:49:01 +01:00
mark_story
474210d007 Properly initialize variable.
Fixes #3658
2013-03-01 13:42:39 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
7d72a6f249 Fix issue where bake was missing habtm associations
If the current model is not the first table, habtm associations would be
missed. This was caused by eff4004261

Refs #3532
Fixes #3605
2013-02-06 20:31:15 -05:00
mark_story
4af6039107 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Gordon Pettey (petteyg)
ec619eec04 Remove some spacial overkill 2013-01-23 23:20:41 +00:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
Rachman Chavik
622d2f04f9 removing extra newline in baked files 2013-01-20 09:07:31 +07:00