ADmad
a2e818e509
Deprecated ConsoleShell
2013-08-03 03:04:32 +05:30
mark_story
5bd45ec65d
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-08-01 08:50:02 +00:00
AD7six
69be4bb1e8
Update the console shell for easier maintenance
2013-08-01 08:39:01 +00:00
mark_story
1202456ef2
Fix errors in ConsoleShell.
...
The switch statement was failing to evaluate conditions properly and
always attempted to run the bind command.
2013-07-31 23:51:30 -04:00
mark_story
810fd28186
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-07-31 23:41:49 -04: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
Mark
f9fdc1e6e0
Merge pull request #1408 from dereuromark/master-cleanup
...
remove @access and unnecessary $name
2013-07-12 07:10:23 -07:00
mark_story
cfa260d8c5
Update ServerShell to use provided documentRoot.
...
Fix ServerShell from using the wrong path to the routing script when
a custom document root is used. Thanks to Marko Marković for the patch.
Fixes #3909
2013-07-09 21:10:37 -04:00
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
euromark
a643295e4c
remove @access and unnecessary $name
2013-07-08 15:50:50 +02: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
Kim Egede Jakobsen
6c3a63ea9b
Correct small typos.
2013-06-05 09:57:18 +02: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
2eb9841c54
Add short option for theme in BakeShell
2013-05-29 13:49:51 +00: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
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
Daniel Hofstetter
dae978fb3a
Split sentence into two sentences
2013-05-09 10:22:43 +03:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00
Mark Story
293ba4cdb9
Merge pull request #1261 from dereuromark/2.4-bake-fixtures
...
add schema param and skip interactive prompts if unnecessary
2013-05-07 18:59:42 -07:00
mark_story
eee37bb04e
Improve docs for AclShell.
2013-05-07 21:58:57 -04:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
euromark
0959c7008f
add schema param and skip interactive prompts if unnecessary
2013-05-02 00:19:46 +02:00
euromark
fab5a6f4d9
spelling corrections
2013-04-30 14:11:50 +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
Rémi Dewitte
c70a3868a9
schema update CREATEs non-existing tables instead of ALTER
2013-04-03 17:37:09 +02:00
euromark
dab0c5e753
Allow behaviors to be added to bake templates and improve doc blocks
2013-03-15 12:14:06 +01:00
mark_story
026df62a1f
Merge branch 'master' into 2.4
2013-03-12 09:41:37 -04:00
mark_story
f1da6b4cbc
Disable the cache when running schema commands.
...
This prevents stale cached schema definitions from preventing updates.
Fixes #3690
2013-03-11 13:10:14 -04:00
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Alexander Hofbauer
c920209f58
SchemaShell: Implement "exclude" parameter
...
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652 .
2013-03-04 22:37:44 +01: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
mark_story
1d529c1dd2
Add type hints in SchemaShell.
...
I'm trying to figure out what's going on in the failing travis builds.
2013-02-28 22:54:31 -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
95bc8be4d5
Make path to router script absolute in server shell.
...
Relative paths fail when you run the server from inside app/Console
or any other path.
2013-02-07 20:32:26 -05: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
410981296c
Fix ServerShell not being able to handle plugin assets.
...
Fixes #3575
2013-01-28 22:21:58 -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
jroberts0001
e8647d77eb
Added App::uses to the PluginAppController and PluginAppModel bake templates
2013-01-20 08:47:52 +07:00
mark_story
5a6a45d0d1
Add support for --admin to bake controller all.
...
I missed this when originally implementing bake controller all.
Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
0ed9e3c120
Only bake HABTM associations for tables that exist.
...
bake often guesses wrong when it comes to habtm. Only add associations
we're highly confident of. This includes tables where the foreign table
also exists.
Refs #3532
2013-01-15 21:43:30 -05:00
mark_story
eff4004261
Don't treat tables that substring match as associations
...
The table structure of:
- packages
- userpackages
- georegions
- userpackages_georegions
Should not create a habtm between packages & georegions.
Fixes #3532
2013-01-14 20:39:01 -05:00
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
euromark
41f2d812bb
fix ticket 3429
2012-12-03 12:31:56 +01:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
euromark
8f78b1e05b
fix coding standards for whitespaces
2012-11-14 12:24:08 +01:00
mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Renan Gonçalves
929ed57844
Fixed TestShell options, removed space which caused the option to not be recognized.
2012-11-06 01:44:51 +01:00
Kyle Robinson Young
f10c669813
Code standards fixes
2012-10-29 08:14:17 -07:00
euromark
f3bbe89ede
solves ticket 3306
2012-10-25 17:08:52 +02:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
ADmad
035f727686
Replace Model::read() with Model::find('first') in baked controller
...
Removed references to Ajax and Javascript helpers
2012-09-30 14:41:37 +05:30
euromark
b7f1740d2b
correcting coding-standards
2012-09-28 13:49:51 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
mark_story
3dd82e6d88
Fix Database/ from always being appended to the driver name.
...
Fixes #3223
2012-09-19 20:55:39 -04:00
euromark
213d4caa85
coding standards
2012-09-20 01:50:15 +02:00
dogmatic69
f5a8eb6bbf
ADmads comments
2012-09-14 19:57:51 +01:00
dogmatic69
cfadc4dbb0
strict type checks and removing some duplicate count() calls by setting a variable
2012-09-14 19:26:00 +01:00
dogmatic69
5cc03ca805
converting if($foo == true) to if($foo)
2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00