Commit graph

14917 commits

Author SHA1 Message Date
Mark Story
946753acde Merge pull request #306 from shama/patch-2
Fix incorrect toQuarter docblock return tag
2011-11-07 06:18:44 -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
Renan Gonçalves
f09904ca91 Merge branch 'patch-time-gmt' of https://github.com/shama/cakephp into shama-patch-time-gmt 2011-11-07 10:44:28 +01:00
Ceeram
7224de962e removing unused variable, fixes #2227 2011-11-07 09:19:01 +01:00
Kyle Robinson Young
72502e8fec Remove extra fromString in TimeHelper::gmt and update docblock 2011-11-06 22:54:52 -08:00
Kyle Robinson Young
09300433f5 Fix incorrect toQuarter docblock return tag 2011-11-06 22:26:58 -08:00
José Lorenzo Rodríguez
bab613652a Merge pull request #305 from majna/2.0-prefixed-actions
Make View task use prefixed template before falling back to generic one
2011-11-06 19:41:57 -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
6fd69b022d Merge pull request #303 from shama/patch-1
Remove 5.3 notice from Config/core timezone comment
2011-11-06 13:47:31 -08:00
mark_story
d87f9f060b Make parent method check explicit to Shell.
This makes only methods on Shell inaccessible on the command line.
Parent methods in AppShell or other parent classes can now be called directly.
Fixes #2193
2011-11-06 16:32:51 -05:00
Kyle Robinson Young
b2414a777f Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment 2011-11-06 13:17:07 -08: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
ADmad
01aa91b3cf Fixing bug where content length was not set for clients which don't accept compressed response. Closes #2225 2011-11-07 02:04:57 +05:30
Kyle Robinson Young
60718c3b9f Remove 5.3 notice from Config/core timezone comment 2011-11-06 11:04:19 -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
3fa0bdb60f Revert "Fix missing objects in App::objects()"
This change caused non controller objects to show in the
controller list.  Reverting until a better implementation
can be done.

This reverts commit ba6f3c17fa.
2011-11-06 11:24:33 -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
ADmad
a7d08a6b39 Removed unused option triggerDisabled from ObjectCollection::trigger().
Fixed docblock for ObjectCollection::load();
2011-11-06 20:29:46 +05:30
mark_story
ba6f3c17fa Fix missing objects in App::objects()
App::objects() should include core objects when asking
for application objects.
2011-11-06 09:42:15 -05:00
mark_story
3e54ffd8c1 Defaulting autoMock to true.
This fixes issues with mock controllers being discarded after use.
Not always mocking controllers causes issues with using redirect().

Fixes #2200
2011-11-06 09:36:35 -05:00
Graham Weldon
cc0f0b4e55 Merge pull request #301 from jamiemill/2.0-upgradefix
Removed invalid 'Helper' suffix in UpgradeShell::helpers()
2011-11-06 04:05:22 -08:00
jamiemill
13ebd60b26 Removed invalid 'Helper' suffix in UpgradeShell::helpers() 2011-11-06 12:02:19 +00:00
Mark Story
73205dc797 Merge pull request #300 from jamiemill/2.0-upgradefix
2.0 upgradefix
2011-11-05 16:45:09 -07:00
jamiemill
6c9c36bc0e Fixed missing array wrap in UpgradeShell::tests() 2011-11-05 22:18:49 +00:00
mark_story
c2eae6caf8 Nerfing coverage generation with PHPUnit3.6 for now.
PHPUnit3.6 totally changed how coverage data can be accessed, its going
to take some time to update things.  This is a quick work around until
more time can be dedicated to fixing it.
2011-11-05 17:46:59 -04:00
mark_story
ad237ec681 Don't collect code coverage on every request. 2011-11-05 17:29:55 -04:00
mark_story
61d6a720d6 Add test for using autoMock and multiple redirects.
Having multiple redirects and not calling generate() before each test, or
using autoMock results in an exit.  This is related to
[c5ca10ca69] where controller re-use was removed.

Refs #2200
2011-11-05 17:28:13 -04:00
Graham Weldon
812e449680 Created a buffer for CakeResponse testing 2011-11-06 08:21:10 +11:00
mark_story
15753ab641 Apply patch from 'Carlos Gant'
Remove un-necessary loop when deleting without cascade.
Fixes #2050
2011-11-05 16:16:13 -04:00
Mark Story
05df15cdd3 Merge pull request #299 from majna/2.0-view-task
Fix View task missing 'app' param when baking custom action.
2011-11-05 13:03:53 -07:00
Majna
3374406bbf Fix View task missing 'app' param when baking custom action. 2011-11-05 19:54:21 +01:00
Vitor Pacheco
2b5b7694c9 Property 'name' removed of PagesController. 2011-11-05 15:25:41 -02:00
mark_story
cd81f9c30a Fix comment in I18n
Move construction details to a protected constructor.
Fixes #2222
2011-11-05 08:19:57 -04:00
Marko Marković
4e702b2fae Updated test for debug
It now detects being called from CLI
2011-11-05 10:24:46 +01:00
mark_story
bfd95d0e04 Fixing remaining failing tests in PHPUnit 3.6 2011-11-04 22:54:09 -04:00
mark_story
d68053c4d4 Fix exception expectations.
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
2011-11-04 22:54:08 -04:00
mark_story
13900dc75c Starting to fix issues with PHPUnit 3.6 compatibility. 2011-11-04 22:54:08 -04: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
Marko Marković
c7363bb042 Updated tests for debug() 2011-11-04 19:43:43 +01:00
Jose Lorenzo Rodriguez
d74b64d475 Merge remote-tracking branch 'origin/2.0' into 2.1 2011-11-04 12:09:31 -04:30
Jose Lorenzo Rodriguez
b983aa9192 Small optimization in DboSource 2011-11-04 10:01:45 -04:30
Marko Marković
73429b357f Fixed inconsistent debug parameters and empty '(line )' 2011-11-04 14:58:06 +01:00