Brian Porter
543e520ccb
Corrects logic to only apply default filename in **all** cases where none provided.
2014-08-11 10:34:30 -05:00
Brian Porter
6358208e32
Figures it'd be a missing paren.
2014-08-11 09:23:56 -05:00
Brian Porter
f93029b29f
SchemaShell always uses --file param when present.
...
Addresses **part** of the problem described in #4174 .
Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.
2014-08-11 09:08:59 -05:00
Marc Würth
120bd37ffa
Be forward compatible to PHP 7's "Uniform Variable Syntax"
...
https://wiki.php.net/rfc/uniform_variable_syntax
2014-08-11 01:33:25 +02:00
mark_story
9c3089796f
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Model/Model.php
2014-08-08 23:28:06 -04:00
José Lorenzo Rodríguez
92957913d9
Merge pull request #4023 from cvo-technologies/2.6-basics-context
...
Add the other translation shortcuts for context support
2014-08-07 08:54:11 +02:00
euromark
9ef7b5713a
CS fixes.
2014-08-04 13:53:52 +02:00
ADmad
713f430fc4
Merge branch 'master' into 2.6
2014-08-03 01:05:36 +05:30
Anthony GRASSIOT
aa42b80a4d
a
/ an
typo fixes fot API
2014-07-30 22:11:03 +02:00
ADmad
9e21d048ce
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-07-27 12:29:39 +05:30
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
euromark
26fe1265ab
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 11:52:29 +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
mark_story
153141a6c7
Make help clearer around how to use UpgradeShell.
...
Closes #3504
2014-05-15 11:32:32 -04: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
Brian Porter
e5dd8acb60
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 11:08:46 -05:00
mark_story
f9b45f1b60
Merge branch 'master' into 2.5
2014-03-30 21:24:55 -04:00
sam-at-github
dbbf6c6ad9
No array short syntax in 2.4\!
2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9
Fixed CS issues. Fixed bug - added missing condition to find.
2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245
on cake acl delete <>
delete all matching records. Makes more sense than deleting one of possibly many.
2014-03-29 13:37:08 +11:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
ADmad
9de3418079
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
ADmad
d838e7b56f
Updated upgrade shell to change CakeRequest::onlyAllow() usages.
2014-02-10 18:18:09 +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
ADmad
c093804b35
Merge branch 'master' into 2.5
2014-01-26 17:39:50 +05:30
mark_story
46eda802e5
Fix mising connection parameter to schema objects.
...
When calling create/update the created schema object should be passed
the current connection.
Fixes #2668
2014-01-16 17:19:22 -05: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
euromark
483cd13a26
rename method
2014-01-06 20:00:45 +01:00
euromark
3e48d2e082
Add return early statements for redirecting in controllers.
2014-01-04 13:18:14 +01: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
mark_story
411f510406
Fix file always being set to 'schema.php'
...
When the name parameter is set and no custom file value is provided,
the name should be used to generate the file name. empty() cannot be
used because the file parameter has a default value of 'schema.php'.
Fixes #2202
2013-10-25 23:36:25 -04:00
euromark
8a90cbd4fe
coding standards
2013-10-24 23:14:09 +02:00
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
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Mark Story
04eae1fc24
Merge pull request #1715 from bcrowe/hotfix-docblocks
...
Additional Cake references to CakePHP and docblock typo.
2013-10-10 09:54:14 -07:00
Rick Guyer
a091c630d7
Prevent name param from overwriting file if both are passed
2013-10-09 23:20:25 -05:00
Bryan Crowe
4242bd4f3d
Additional Cake references to CakePHP and docblock typo
2013-10-09 19:38:16 -04:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
wyrihaximus
ac9b7f3882
Refactored the shell reflection portion into a seperate task.
2013-10-02 22:30:12 +02:00
Cees-Jan
5c523a0cd5
Updated the shell given @renansaddam pointers
2013-10-02 22:02:40 +02:00
Cees-Jan
79202ad8a0
Updated doc blocks
2013-10-02 22:02:40 +02:00
Cees-Jan
cdf2b8c40d
Base completion files from @AD7six/cakephp-completion adjusted to be part of the framework
2013-10-02 22:02:40 +02:00
mark_story
cc5795c67d
Merge branch 'master' into 2.5
2013-09-26 10:07:10 -04: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
mark_story
d2577fac60
Merge branch 'master' into 2.5
2013-09-21 20:01:50 -04:00
euromark
58f38f1667
Fix casing of validation rules in bake
2013-09-18 18:31:55 +02:00
Marc Würth
84a669aa7a
Shortened the if clause line length by doing it the @markstory style ;-)
...
Also shortened the line length of some arrays
2013-09-02 20:38:31 +02:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04: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
Gilles Wittenberg
a54e8f238e
Add y/yes option to schema create and update subcommands
2013-08-29 09:13:54 +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
José Lorenzo Rodríguez
8e21e255dc
Merge pull request #1543 from dereuromark/2.4-translations
...
remove code, class names and paths from translation strings.
2013-08-20 15:33:42 -07:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
6d80d6a3cb
Add missing return.
2013-08-20 18:03:52 -04:00
mark_story
67855896ef
Remove invalid code.
...
Fixes #4002
2013-08-20 11:34:30 -04: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
euromark
f3018cc532
refactor methods to avoid else block on returning early
2013-08-12 19:06:34 +02:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
mark_story
86dcebf28b
Update bakeshell so bake all
gets the correct connection name.
...
Fixes #3972
2013-08-09 10:08:01 -04:00