Graham Weldon
af2e7c1e9b
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-29 23:00:47 +11:00
Jose Lorenzo Rodriguez
76e334ca38
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-28 22:30:36 -04:30
Ceeram
57a1a2814d
Fixing modeltask to use correct table
...
ModelTask will now bake correct primaryKey when not id
2011-11-29 00:00:00 +01:00
ADmad
73674c648c
Moving AppShell inside Console/Command for consistency with file location of other App classes. Also making all core shells and tasks extends AppShell instead of Shell. Closes #2278
2011-11-26 02:48:49 +05:30
Rachman Chavik
204851842b
In a multidb habtm, we cannot rely on 'joinTable'
...
Instead, we should use value from 'with' when it's available.
2011-11-25 22:29:23 +07:00
Rachman Chavik
fa80be50eb
Removing timestamp lines from generated files
...
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
Rachman Chavik
211146fb7a
Enable short option for --plugin and --connection
...
This is done to make things more consistent with the bake shell
2011-11-24 19:29:27 +07:00
mark_story
4103fe14a2
Fix double / issue in ExtractTask
...
Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.
Fixes #2284
2011-11-23 21:03:24 -05:00
Mark Story
340d112693
Merge pull request #327 from bigclick/patch-1
...
Fix for when trying to use "Console/cake schema generate snapshot"
2011-11-21 07:20:07 -08:00
mark_story
6d6ac10834
Fix failing tests caused by previous commit.
2011-11-20 23:00:58 -05:00
bigclick
037f2c016e
preg_quote'd $fileName to avoid issues when using a special character in their schema filename
2011-11-21 13:19:57 +11:00
bigclick
7a68f7fed1
Fix for when trying to use "Console/cake schema generate snapshot" command, line 67 was making the name param snapshot, also fixed auto numbering in the case where the filename wasn't "schema"
2011-11-21 11:43:51 +11:00
AD7six
adf73abb07
another bulletproofing for schemaless baking
2011-11-20 16:08:01 +01:00
AD7six
43ae7af17d
prevent missing-index notices
...
when baking with a schemaless db
2011-11-20 15:44:44 +01:00
AD7six
f0fa6c7875
code standards
2011-11-20 01:17:07 +01:00
AD7six
8e38f666b7
allow baking models with missing tables - even for rdbms
...
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
2011-11-20 01:11:33 +01:00
AD7six
ac8e1e8304
allow creating models without the table existing
...
particularly useful/appropriate for schemaless datasources
2011-11-19 23:51:39 +01:00
Gordon Pettey (petteyg)
99e6072fd3
Make App::path('Console') overwrite App::core('Console') for themes
2011-11-18 05:00:45 +00:00
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
mark_story
8981f49bd5
Add stricter validation to TestTask.
...
Empty classnames, and classnames without the correct type suffix
are no longer accepted. They did the wrong thing anyways.
Fixes #2267
2011-11-16 20:38:31 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Graham Weldon
eefdc43214
Fix plugins not being loaded before looking for pluign paths
2011-11-15 17:30:49 +11:00
mark_story
0a0a09920b
Updating for PHP5.4
...
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
mark_story
99caa98df3
Update message for PHPUnit3.6
2011-11-11 21:28:34 -05:00
Ceeram
767d1afcd8
fixing helptext for AclShell
2011-11-09 21:07:01 +01:00
Mark Story
e8e2bbc4d7
Merge pull request #304 from jamiemill/2.0-upgradefix2
...
Add exception migration to the upgrade shell.
2011-11-08 06:47:52 -08:00
Renan Gonçalves aka renan.saddam
2a33bc862a
Merge pull request #296 from majna/2.0-dbconfig-task
...
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Majna
57afa1873e
Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes.
2011-11-07 01:01:56 +01:00
jamiemill
e16890225c
Fixed mistake in UpgradeShell::exceptions()
...
My fault ;)
2011-11-06 23:19:30 +00:00
jamiemill
c966a35beb
Fixed bug in UpgradeShell::findFiles().
...
$this->_files was reset on each loop through paths, which means, for
example, if you still had the old 'views' directory kicking around
the results from 'View' would be overwritten.
2011-11-06 21:53:20 +00:00
jamiemill
4368b62dfb
Added an 'exceptions' method to the UpgradeShell.
...
This just replaces some of the basic cakeError() calls with
equivalent exceptions.
2011-11-06 21:53:11 +00:00
jamiemill
1d52dc05e1
Fix for UpgradeShell::helpers() not discovering core helpers.
2011-11-06 21:53:03 +00:00
Mark Story
db41a7dd16
Merge pull request #302 from majna/2.0-viewtask-methods
...
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 12:59:38 -08:00
mark_story
aae8a89623
Change var -> public in controllertask.
...
Makes the confirmation message and generated code the same.
Fixes #2216
2011-11-06 11:50:16 -05:00
mark_story
a2b6f18000
Merge branch '2.0' into 2.1
2011-11-06 11:39:01 -05:00
mark_story
cfe38985cf
Fix failing tests caused by changes in App::objects()
2011-11-06 11:23:11 -05:00
Majna
d84b66e744
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 16:14:55 +01:00
ADmad
e1354b2ee6
Merge branch '2.0' into 2.1
2011-11-06 20:39:08 +05:30
jamiemill
13ebd60b26
Removed invalid 'Helper' suffix in UpgradeShell::helpers()
2011-11-06 12:02:19 +00:00
jamiemill
6c9c36bc0e
Fixed missing array wrap in UpgradeShell::tests()
2011-11-05 22:18:49 +00:00
Majna
3374406bbf
Fix View task missing 'app' param when baking custom action.
2011-11-05 19:54:21 +01:00
Majna
1b9b90d2e7
Replacing 'driver' with 'datasource'.
2011-11-04 23:07:31 +01:00
Majna
1455c59e0c
Fix notice when baking db config: Undefined variable 'driver'.
2011-11-04 22:49:38 +01:00
mark_story
0304bb8796
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Majna
51ccbad170
Fixing ignored '--exclude-plugins' option on Windows for Extract task.
2011-11-03 21:34:32 +01:00
Jose Lorenzo Rodriguez
d49096aab9
Fixing DbConfigTask to produce correct configurations
2011-10-30 18:25:43 -04:30
Majna
14efc4daae
Added missing 'write' param for schema dump shell. Fixes #2179 .
2011-10-29 00:51:40 +02:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
d6f7669f54
Merge branch '2.0' into 2.1
2011-10-23 21:07:09 -04:00