adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-25 08:17:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18156 commits 7 branches 0 tags 44 MiB
Commit graph

1077 commits

Author SHA1 Message Date
Kyle Robinson Young
bb51b0f497 Add @link to Shell docblocks 2011-11-21 21:33:07 -08: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
ADmad
90b007ef75 Implemented priority based triggering of callbacks for objects in collection 2011-11-17 12:36:54 +05:30
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
542e5c91de Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-15 23:11:07 -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
ADmad
233a63366f Syncing files between app directory and bake skeleton 2011-11-14 02:32:59 +05:30
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
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
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
Vitor Pacheco
2b5b7694c9 Property 'name' removed of PagesController. 2011-11-05 15:25:41 -02: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
mark_story
98a8f44fa7 Make formatting tag removal smarter. 
Instead of removing all tags, only known
formatting tags.

Fixes #2203
 2011-11-02 21:50:16 -04:00
Marko Marković
385f6f164f Fixed typos in css 2011-11-01 16:59:11 +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
8529d76e6f Removing Xml prolog from default xml layouts. 
Both DOMDocument and SimpleXML output the prolog when
saving xml.

Fixes #2171
 2011-10-27 20:58:03 -04:00
mark_story
ad524b25ef Merge branch '2.0' into 2.1 2011-10-25 22:29:03 -04:00
m
5a5a542a71 Missing ini_set of include path for test.php 
Fixes #2167

Signed-off-by: mark_story <mark@mark-story.com>
 2011-10-25 22:26:59 -04:00
mark_story
d92c73d821 Remove reference to XmlHelper. 
Refs #2164
 2011-10-25 20:16:58 -04:00
mark_story
d6f7669f54 Merge branch '2.0' into 2.1 2011-10-23 21:07:09 -04:00
Majna
a9dbde0cbd Fixing incorrect doc blocks regarding error handler. 2011-10-23 21:55:20 +02:00
James Larking
75daff8df9 Camelize type of test being generated. 
This fixes use for:

`cake bake model ModelName`

When classTypes and directories should be CamelCase.
This solves issue whereby model tests are written directly to Cases folder rather than into Cases/Model

Signed-off-by: mark_story <mark@mark-story.com>
 2011-10-23 11:13:56 -04:00
mark_story
72006b9369 Fix options in OptionParser for TestTask 
Fix the allowed options for type to allow Camelcase versions as well.
 2011-10-23 11:10:52 -04:00
mark_story
ab6aab8a1a Merge branch '2.0' into 2.1 2011-10-22 11:03:42 -04:00
Renan Gonçalves
d9e8b3b6a2 Parsing every parameter until there is no more. Good to have alias but with the ability to override the arguments. 2011-10-21 12:20:43 +02:00
AD7six
53bc963315 Merge branch '2.0' into 2.1 2011-10-20 08:57:49 +02:00
mark_story
f5ae9622e6 Add missing argument. 
Without this argument calls with two arguments would be
treated as invalid shell commands.
 2011-10-19 22:26:51 -04:00
mark_story
7a4aa401d1 Adding backwards compatible plugin syntax. 
Thie got lost during 2.0, and it inflecting only the shell name
is kind of bad.
 2011-10-19 21:33:03 -04:00
mark_story
bad819773e Update CommandListShell to give better help. 
plugins require plugin prefixes now.  Update the help
to suggest how to run plugin shells.

Fixes #2121
 2011-10-19 21:26:31 -04:00
Jose Lorenzo Rodriguez
d666d6175a Improving the upgrade shell by adding more renaming rules and making it more robust in case insensitive systems 2011-10-19 16:46:55 -04:30
Rachman Chavik
a60d71d19b removing 'empty' files from nonempty directories 2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc fixing typos 2011-10-19 12:19:28 +07:00
mark_story
d7155d374b Making apc feature test rely on apc_dec. 
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.

Fixes #2105
 2011-10-18 20:48:58 -04:00
AD7six
a538c5d220 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 
Conflicts:
	lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
 2011-10-18 17:46:00 +02:00
AD7six
25ce1cc823 remove inherited logic 2011-10-18 12:28:52 +02:00
AD7six
2e547cad19 revert to original code 2011-10-18 12:24:59 +02:00
AD7six
11a11bf583 add a backwards compatibility shell for the previous syntax 2011-10-18 12:18:50 +02:00
AD7six
868f8d21ad don't duplicate the arguments description 2011-10-18 12:18:01 +02:00
AD7six
f82ae66790 add a couple of tests for detecting the right app file 2011-10-18 11:36:30 +02:00
AD7six
6ab5f1f2a2 make it possible to test for files that don't exist 2011-10-18 11:02:08 +02:00
AD7six
d492c86ddc update main descrition 2011-10-18 10:28:05 +02:00
AD7six
511207494e remove incorrect description text 2011-10-18 10:24:09 +02:00
AD7six
b4228dcaee Merge branch '2.1' into 2.1-simpler-tests 2011-10-18 10:03:32 +02:00
Jose Lorenzo Rodriguez
e47b970811 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-16 15:45:47 -04:30
Jose Lorenzo Rodriguez
b38c0e50a4 Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating 
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
 2011-10-16 15:43:10 -04:30
Renan Gonçalves
d2a664c2df Fixing @package at in Cake/Console/Templates/skel files. 2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653 Fixing @package at in Cake/Console/Templates files. 2011-10-15 20:26:48 +02:00
Renan Gonçalves
1cf67b1e55 Little cleanup in exceptions. 
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
 2011-10-15 20:08:02 +02:00
Jose Lorenzo Rodriguez
670917070e Changing a bunch of links in doc blocks 2011-10-15 10:43:26 -04:30
Jose Lorenzo Rodriguez
f8772dc524 Also changing shell script in skel directory 2011-10-15 10:18:36 -04:30
mark_story
bda8df1b50 Fix issues with bash quoting and directories with spaces. 2011-10-15 09:56:04 -04:00
Jose Lorenzo Rodriguez
36fa2e87b4 Adding symlink support to the cake console executable 2011-10-14 22:15:26 -04:30
mark_story
6bf6d79979 Removing 'cake' domain from core. 
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.

Fixes #2103
 2011-10-14 21:01:17 -04:00
Heath Nail
9e9b1f0382 Windows newlines for .bat files. 2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf Incresing sync between app and skel directories. 2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b Incresing sync between app and skel directories. 2011-10-14 15:06:36 -04:00
mark_story
7f3c5662ba Fix issue where plugin prefixes would be included in generated view. 
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
 2011-10-12 21:09:19 -04:00
mark_story
f65d763551 Removing ?> from AppModel and AppController plugin templates. 2011-10-12 20:42:23 -04:00
evilbloodydemon
8e78308261 Removed unnecessary ClassRegistry::flush() from test template. 2011-10-12 13:37:50 +04:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
mark_story
788d38ccef Merge branch '1.3' into 1.3-merge 
Conflicts:
	cake/console/cake.php
	cake/console/libs/shell.php
	cake/tests/cases/console/libs/shell.test.php
 2011-10-10 09:37:06 -04:00
mark_story
3f778d8936 Fix inconsistency between app and skel directory. 
Fixes #2077
 2011-10-08 14:40:11 -04:00
mark_story
e07256b6d4 Update the .htaccess files to increase 
compatibility with shared hosting servers.
Fixes #2010
 2011-10-07 20:59:20 -04:00
ADmad
fa214e8716 Updating old usage Configure::read() to new Configure::read('debug'). Closes #2070 2011-10-06 17:02:15 +05:30
mark_story
2cc9523509 Adding old webkit gradient prefixes. 
Fixes #2066
 2011-10-05 17:59:39 -04:00
mark_story
0e47c98c91 Moving cache disabling earlier so it takes 
effect.
Refs #2063
 2011-10-04 23:03:44 -04:00
mark_story
e56a2cdb2b Set debug=2 when bake is run. 
This should help with model caches being re-used when they shouldn't.
Fixes #2063
 2011-10-04 22:25:18 -04:00
mark_story
cb1ce83a54 Removing duplicate inflection. 
Fixes #2058
 2011-10-04 20:10:25 -04:00
mark_story
042e817e1b Fix issue where missing command would exit as success. 2011-10-03 23:08:48 -04:00
mark_story
aa7448e3ed Fixing incorrect exit codes on console exceptions. 
Uncaught exceptions on the console would result in exit code 0.
This is not helpful in *nix scripting.

- Update the ConsoleErrorHandler to not inherit from the web error handler.
- Make ErrorHandler::_mapErrorCode() public as it isn't overly private.
- Make ConsoleErrorHandler methods instance methods so mocking can be done.
- Add a _stop method to correctly exit.
- Update tests.
 2011-10-03 22:48:50 -04:00
Jose Lorenzo Rodriguez
4110ab7952 Fixing error introduced in my last commit 2011-10-03 12:08:08 -04:30
Jose Lorenzo Rodriguez
d08f916179 Grabbing the first available config defined in connection manager as a default for baking. Fixing a couple of failing test cases 2011-10-03 11:54:40 -04:30
mark_story
84f805419d Fixing issue where DbConfigTask would try to rebuild 
database configuration.

This could happen when using commands like `Console/cake bake controller`.
Using ConnectionManager ensures that the database config file will be loaded
if its available.
 2011-10-02 22:53:45 -04:00
mark_story
aae2b0c257 Fixing issue baking controller tests. 
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
 2011-10-02 22:53:37 -04:00
mark_story
aa8965d3f3 Merge branch 'merger' into 2.0 2011-10-01 22:38:39 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger 
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
 2011-10-01 22:38:20 -04:00
Graham Weldon
f69fc937cb Fixed missing string append operator for baked homepage to include banner. 2011-10-02 11:58:11 +11:00
mark_story
f4b2e03295 Errors should be output on stderr. 2011-09-30 21:56:57 -04:00
Jose Lorenzo Rodriguez
5a181d8705 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-30 01:56:19 -04:30
Jose Lorenzo Rodriguez
fff42e92ed Adding a few class loading related changes to make the ApiGenerator plugin happy 2011-09-30 01:55:33 -04:30
Ceeram
22029a1199 fixing email.php.default, from should have email as key 2011-09-29 14:59:27 +02:00
mark_story
dffcf048d9 Fix incorrect documentation. 2011-09-24 12:06:44 -04:00
mark_story
8272758eb9 Adding block to home page for PHP version. 
Fixes #2010
 2011-09-24 10:41:22 -04:00
Renan Gonçalves
0bcb8d0dfa Improving the regex and moving more files around. 
- Making the regex case insensitive so it can also matches capital C in class (ie. Class).
- Adding a new protected method to move view files, the directory will be camelized.
 2011-09-22 15:03:42 +02:00
Renan Gonçalves
1b2b191212 Updating cake.generic.css to its newest version from app directory. 2011-09-20 20:29:55 +02:00
Gordon Pettey (petteyg)
744558de90 Add validation guess for Postgress inet field 2011-09-20 17:45:35 +00:00
ADmad
7c87e9abc1 For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994 2011-09-16 13:40:04 +05:30
Graham Weldon
9d1e3cbb05 Fix comment for ife() Upgrade. Thanks SkieDr. 2011-09-16 00:38:26 +10:00
Graham Weldon
d8468c1a38 Fixed incorrect ife() conversion. Thanks SkieDr. 2011-09-16 00:34:39 +10:00
Renan Gonçalves
cd6c370dd9 Adding tests method to Upgrade shell, fixing FooTestCase to FooTest. 
Also making sure the preg_match matches the right class and not move the file to other directory rather than tests.
The method `tests` need to be run before `locations` to work properly.
 2011-09-14 13:33:01 +02:00
ADmad
97a975c6c4 Refactoring Model::invalidFields() a bit. 2011-09-12 05:10:34 +05:30
AD7six
61f8de440d Merge branch '2.0-simpler-test' of github.com:cakephp/cakephp into feature/2.0-simpler-tests 
Conflicts:
	lib/Cake/Console/Command/TestShell.php
 2011-09-10 17:08:00 +02:00
mark_story
3cb3424b4f Add App::uses to baked controllers. 
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
 2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0 Adding App::uses() call to model baking. 
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
 2011-09-09 20:43:04 -04:00
mark_story
3d44489b0c Deprecating the %page% style placeholders in PaginatorHelper. 
Updating scaffold and bake templates to not use deprecated placeholders.
 2011-09-06 02:37:43 +01:00
Jose Lorenzo Rodriguez
74ba030e7c More postgres tests passing again 2011-09-03 18:34:11 -04:30
Jose Lorenzo Rodriguez
2bca1435ab Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-03 07:05:48 -04:30
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
mark_story
8c75488979 More changes to the CSS, and updating the bake templates and scaffolds. 2011-09-03 10:06:01 +01:00
mark_story
efbeab6199 Merge branch '1.3' into merger 
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
 2011-09-03 00:48:09 +01:00
Renan Gonçalves
bc3828179b Not using Folder if its a git repository. 2011-09-02 00:19:37 +02:00
Renan Gonçalves
65956ab863 Adding __d(...) to the upgrade shell messages. Althought there is no 'real' need for it its good to be aligned to the others shells. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
81c46a76b7 Not running 'git mv ...' if its dry-run. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
265c094f2f Fixing the path to tests on upgrade shell and also fixing the option for git, it needs to be boolean. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
7ae89c3679 Checking if short options exist, fixed an warning caused by not checking it. 2011-09-01 22:10:42 +02:00
Renan Gonçalves
edbe60e965 Overriding the files array, so it will not try to perform actions on files that no longer exists. 2011-09-01 19:31:32 +02:00
Jose Lorenzo Rodriguez
a8b38beb9d Fixing bug in SchemaShell where it would always force a read on all tables 2011-08-30 00:07:57 -04:30
Mark Story
59c6b419e5 Merge branch '1.3' into merger 
Conflicts:
	cake/console/libs/bake.php
	cake/libs/configure.php
	cake/libs/controller/components/request_handler.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Utility/Validation.php
 2011-08-28 22:08:49 -04:00
Juan Basso
7d0250ff47 Merge branch '2.0-api-doc' into 2.0 2011-08-26 20:22:26 -04:00
mark_story
f060fdafb7 Adding the --debug flag that later versions of PHPUnit support. 2011-08-22 22:29:32 -04:00
ADmad
34d3d6fe9e Fixing doc block related to session configuration. Closes #1927 2011-08-23 04:07:08 +05:30
Juan Basso
689c7ffd45 Fixed some problems caused by the visibility changes. 2011-08-21 01:04:55 -04:00
Juan Basso
61833294f0 Changed the visibility to methods that not affect others classes. 2011-08-20 01:39:30 -04:00
Juan Basso
f5a54d00dd Changed methods and attributes from private to protected. 2011-08-20 00:43:34 -04:00
Juan Basso
40654df5ab Fixing more documentations. 2011-08-18 22:31:00 -04:00
Juan Basso
0575e92833 Added visibility in some methods and attributes. 2011-08-18 22:30:28 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc 
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
 2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200 Merge branch '1.3' into merger 
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
 2011-08-14 14:39:49 -04:00
Majna
826001adc7 Added doc blocks for WincacheEngine. Fixed Memcache doc block. 2011-08-10 16:55:05 +02:00
mark_story
95f3eb48f9 Fixing plugin option + locations subcommand. 2011-08-07 18:17:14 -04:00
mark_story
be262f30f0 Fixing notice errors caused by undefined property. 2011-08-06 21:12:48 -04:00
Mark Story
2f079b33dd Fixing issues output xml help. 2011-08-06 16:26:58 -04:00
Mark Story
5d3c470871 Fixing issues where option values started with '-'. 2011-08-06 15:43:41 -04:00
Mark Story
b7391274fb Adding an exception when a short option is longer than one 
character. Having long short options breaks parsing, and
doesn't make sense with how short options are used.
 2011-08-06 15:21:42 -04:00
Mark Story
fb756c5aee Fixing incorrectly inflected shell names in help. 2011-08-06 09:52:07 -04:00
Mark Story
5f84b4846c Making long options & arguments replaced with short forms. 
Fixes #1882
 2011-08-06 09:50:41 -04:00
mark_story
c1b0eb8f21 Updating output of project task to better reflect what 
happened.
 2011-08-03 21:56:24 -04:00
Mark Story
b45e8eb0cd Adding comments about CAKE_CORE_INCLUDE_PATH. 
Removing ini_set() blocks that don't need to exist.
 2011-08-03 20:06:47 -04:00
Mark Story
cdcabc79b6 Doing some refactoring in the project task. 
Adding tests for constants staying commented out when CakePHP is on the include_path.
 2011-08-03 20:06:47 -04:00
Mark Story
6e2870c706 Removing APP_PATH it is always the same as APP. 
Fixing a typo in index.php.
 2011-08-03 20:06:47 -04:00
Mark Story
20e9015f80 Making skel files generate hard coded paths, when CakePHP 
is not on the include_path, and exclude hard coded paths when it is.
 2011-08-03 20:06:47 -04:00
Mark Story
721c438817 Re-adding support for PHP's include_path. 
Moving constants that are made of other constants into bootstrap.php
 2011-08-03 20:06:47 -04:00
Ceeram
dbdc0a1e37 moving test icons one dir up, and remove subdir img in img 2011-08-02 14:56:03 +02:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
d84531d29c Using @property to autocomplete components and helpers in some IDEs. Also added @property to bake of controller and model. Fixes #103. 2011-07-31 20:28:35 -04:00
Juan Basso
7604763888 Updated some file headers to include correct license and copyright. 2011-07-31 19:14:36 -04:00
Juan Basso
2a50a1ea99 Included @var in API that was missing. 2011-07-31 17:05:20 -04:00
Juan Basso
fedadc091c Included @throws in API that was missing. 2011-07-31 16:55:52 -04:00
ADmad
b15c77ecc3 Enhancing validation messages to have placeholders. Closes #1855 2011-07-31 06:33:56 +05:30
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
3723f7d396 Fixed some API doc in controllers and errors. 2011-07-30 16:48:37 -04:00
Juan Basso
511b480285 Reverted the change from while to if. 2011-07-28 23:33:27 -04:00
Juan Basso
9e75de2f28 Fixed some API doc in core and utility folders. 2011-07-28 23:33:17 -04:00
Juan Basso
a0ee8b49fe Fixed some API doc in console. 2011-07-28 22:05:29 -04:00
Majna
29e4cad99e Fix for lowercased schema folder when baking plugin skel 2011-07-28 18:57:10 +02:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Mark Story
74e2cb1507 Updating doc blocks and @package strings for Console 
classes.
 2011-07-25 21:46:52 -04:00
Jose Lorenzo Rodriguez
febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0 
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
 2011-07-25 14:44:23 -04:30
Mark Story
4101388069 Syncing skel directory with app/Config. 2011-07-22 20:29:45 -04:00
mark_story
2141b494cd Adding charset as it was previously omitted. 2011-07-22 20:29:44 -04:00
mark_story
ec40ce6aad Updating index.php and skel dir for response change. 2011-07-22 20:29:43 -04:00
Ceeram
a025cb2e01 Adding option to ProjectTask, for setting CAKE_CORE_INCLUDE_PATH. Tests added. 2011-07-13 23:54:24 +02:00
Ceeram
e3dfec98c7 fixing regex for setting constant in test.php 2011-07-13 18:23:07 +02:00
Jose Lorenzo Rodriguez
feb567d4ee Adding better help and documentation for loading plugins. The exception renderer will serve a helpful page if a plugin is missing 2011-07-07 02:34:22 -04:30
Jose Lorenzo Rodriguez
eaa80bbced Completing support for extracting model validation messages from application plugins 2011-07-07 02:11:48 -04:30
Jose Lorenzo Rodriguez
d2519ae0ae Adding support to the extract task to operate on a single plugin, thus removing the hassle of declaring the plugin path in command line 2011-07-07 01:57:55 -04:30
Jose Lorenzo Rodriguez
765164f33b Merge branch '2.0-extract-model-validation' into 2.0 2011-07-07 01:05:39 -04:30
José Lorenzo Rodríguez
9ea1a049fe Fixing typo in UpgradeShell 2011-07-02 14:21:27 -07:00
José Lorenzo Rodríguez
f671be60d1 Merge pull request #141 from luisarmando/componentsUpgrade 
Update component task, make components extend Component instead of Object
 2011-07-02 13:05:43 -07:00
Luís Armando
ae9a3ef479 Update component task, make components extend Component instead of Object. 2011-07-02 17:49:29 +02:00
Robert Sworder
fb3a1928d3 Minor comment and path changes. 2011-06-25 15:08:41 +01:00
Mark Story
91a1cf81f3 Merge branch '1.3' into merger 
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-06-23 12:48:06 -07:00
Mark Story
0e09f75a66 Updating table styles. 2011-06-22 13:53:38 -07:00
Mark Story
7392902abd Syncing skel CSS with app/webroot css. 2011-06-22 13:17:38 -07:00
Mark Story
f547032f6f Removing altrow from the bake default templates. 
Refs #306
 2011-06-22 13:14:31 -07:00
Mark Story
c1e674f9c1 Actually checking that files exist before saying they do. 2011-06-21 10:45:01 -07:00
Jose Lorenzo Rodriguez
552bd82b5b Fixing tests from CommandListShell when run on windows 2011-06-21 12:14:36 -04:30
Jose Lorenzo Rodriguez
d54f8dc07a Fixing some shell tests when that fail when they are run in window 2011-06-21 11:24:59 -04:30
Jose Lorenzo Rodriguez
41603cacb7 Fixing Fixture generation task to be more compatible with SqlSrv 2011-06-20 19:03:00 -04:30
Jose Lorenzo Rodriguez
33c74b6062 Implementing validation domain extraction in the ExtractionTask 2011-06-20 00:36:31 -04:30
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Mark Story
aee5ee5fe5 Merge pull request #119 from neterslandreau/2.0 
Merging changes for skel files.
 2011-06-13 17:53:17 -07:00
Niles
d5012f0e33 add required uses to template. 2011-06-13 10:18:59 -04:00
Renan Gonçalves
dfe58d7851 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-06-12 23:25:01 +02:00
Renan Gonçalves
2e3f828098 Updating the home.ctp file to include last changes made on directories name and i18n usage. 2011-06-12 23:24:42 +02:00
Renan Gonçalves
564bf87764 Using exit instead of die, as did in 2e8bbd5e. 
Fixing an typo.
Using i18n on test.php file and pointing it to right directory.
 2011-06-12 23:12:22 +02:00
Renan Gonçalves
2a3f49bf00 Updating the cake.generic.css from skeleton template to match the changes made on commit cb946bbc. 2011-06-12 22:42:22 +02:00
Niles
1079889d9f fix missing uses command in bake template. fixes #1770. 2011-06-12 11:54:47 -04:00
Vitor Pacheco
bfa7c12866 printing the legend of the forms in the templates 2011-06-04 14:42:22 -03:00
Juan Basso
21348169fa Camelized templates folder. 2011-05-30 23:02:39 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7 According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything. 2011-05-30 22:26:42 +02:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
Renan Gonçalves
d0af5c78d5 Fixing the path used to create fixtures. 2011-05-30 21:04:38 +02:00
Renan Gonçalves
f55fa4d026 Removing the specific getPath() method, it was giving the same result as the parent one. 2011-05-30 20:52:58 +02:00
ADmad
c5a2efc5dd Merge pull request #103 from tPl0ch/2.0-bake-controller 
2.0 Shell - Wrong underscore naming of Shells and Tasks
 2011-05-29 04:56:40 -07:00
Thomas Ploch
a80d82e4a0 Fixed Shell naming from using Inflector::underscore() to Inflector::camelize(). Added small test case for Shell naming. Fixed missing CakePlugin::load() call in ShellTest. 2011-05-29 12:32:30 +02:00
AD7six
13fe6ec424 slim down some more logic 2011-05-29 01:57:18 +02:00
AD7six
8b1045a631 simplify path logic 
we know the category - use it to simplify some regexs
 2011-05-29 01:49:21 +02:00
AD7six
ca59ea3dd5 make it possible to use "cake test <file>" 2011-05-29 01:19:14 +02:00
AD7six
a6fecb5c6f prepare for allowing cake test <file> 2011-05-28 23:42:40 +02:00
mark_story
f905237303 Adding missing import. Fixes #1736 2011-05-28 11:42:20 -04:00
Jose Lorenzo Rodriguez
93ac47fa60 Adding ability to ExtractTask to inspect models and extract the validation messages from them 2011-05-27 22:18:56 -04:30
Jose Lorenzo Rodriguez
991501d489 Implementing a new option 'exclude-plugins' from the ExtractTask 2011-05-27 15:55:50 -04:30
Ceeram
5f97292648 Change case of Controller::$plugin, fixing missing plugin exceptions, tests updated. Also removing no longer needed camelize() calls 2011-05-26 15:31:40 +02:00
Juan Basso
acc0660989 Changed the emails folder in layouts to CamelCased. Fixes #1730. 2011-05-24 01:05:29 -04:00
Juan Basso
3812ac70cb Fixed the default name of email transport. Fixes #1728. 2011-05-24 01:01:58 -04:00
Juan Basso
2ea5be5de2 Merge branch '2.0-mssql' into 2.0 2011-05-24 00:07:56 -04:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
Jose Lorenzo Rodriguez
8d52907be7 Merge remote-tracking branch 'origin/2.0' into 2.0 2011-05-22 21:55:07 -04:30
Jose Lorenzo Rodriguez
5b8865a3a7 Making plugin routes load after app routes, closes #1722 2011-05-22 21:50:56 -04:30
mark_story
87bccdafe6 Updating PluginTask to filter out paths that don't exist, and not offer 
them as options for baking plugins into.  Fixes #1723
 2011-05-22 22:04:08 -04:00
mark_story
85752e21c1 Removing undefined variable use. 
Making the plugin path match the old plugins directory.
 2011-05-22 22:04:08 -04:00
Ceeram
95a5b99b0e Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-05-22 23:36:48 +02:00
Ceeram
661a0cca23 removing DS, App::core('Console') already ends with DS 2011-05-22 23:29:17 +02:00
mark_story
1d687214e9 Fixing ViewTask so it creates properly cased directories for 2.0. 
Fixes #1725
 2011-05-22 14:42:43 -04:00
mark_story
4d76840d44 Fixing 'no' option when baking projects. Replying no, will enter 
iteractive mode now.  Fixes #1721
 2011-05-22 08:56:19 -04:00
mark_story
2b20eb8999 Fixing issues with ProjectTask and absolute paths. 
Fixes #1720
 2011-05-22 08:49:51 -04:00
Heath Nail
e645fa7340 Make baked plugin directories consistent with 2.0 conventions. 2011-05-19 13:06:12 -04:00
Heath Nail
eecd91e99f Load AppShell class. 2011-05-18 21:05:21 -04:00
Heath Nail
930ef89f8c Pages directory should be capitalized. 2011-05-17 18:37:12 -04:00
Heath Nail
dc85d21f05 Dots appear in the text searched for, added to search pattern. 
The define statement in skel/webroot/index.php contains dots. Added \.
to the search pattern so that bake will update the core path in
webroot/index.php
 2011-05-17 14:34:10 -04:00
AD7six
183b2ea9fc correct for case fixes the ProjectTask test case 2011-05-16 23:29:59 +02:00
AD7six
fe2ec74b0e correct paths to Config dir 2011-05-16 21:52:25 +02:00
Renan Gonçalves
f3bd0faa94 Fixing typo on the documentation. Patch by mamchenkov. 2011-05-16 21:14:46 +02:00
AD7six
a199e72610 the correct argument for plugins is infact "plugins" 2011-05-15 19:28:17 +02:00
AD7six
56c6e35437 adding an upgrade option to correct constants 2011-05-15 19:10:53 +02:00
AD7six
42c5c6e7fe when using App::path but expecting 1 result - use the first 2011-05-15 18:39:38 +02:00
AD7six
0cb70ae3bb remove CONFIGS constant 2011-05-15 18:34:52 +02:00
AD7six
afa8f6b441 remove LIBS constant 
libs always means the Cake lib - so use the CAKE constant
 2011-05-15 18:29:52 +02:00
AD7six
0508055ee9 remove CAKE_TEST_LIB constant 2011-05-15 17:36:39 +02:00
AD7six
998cba0759 remove CONSOLE_LIBS constnat 2011-05-15 17:36:39 +02:00
AD7six
e313448998 remove VIEWS constant 2011-05-15 17:35:01 +02:00
AD7six
62d66bc3ad remove MODELS constant 2011-05-15 17:35:00 +02:00
AD7six
80e68763a3 remove CONTROLLERS constant 2011-05-15 17:35:00 +02:00
Jose Lorenzo Rodriguez
91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge 
Conflicts:
	lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
	lib/Cake/tests/Case/Log/Engine/FileLog.php
	lib/Cake/tests/Case/Log/Engine/FileLogTest.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
 2011-05-15 00:40:54 -04:30
Jose Lorenzo Rodriguez
5f56642e0e Updating tests and classes in Console package after most recent updates in folder casing 2011-05-14 23:40:09 -04:30
mark_story
23d9e5d769 Merge remote-tracking branch 'tploch/2.0-memcache' into 2.0 2011-05-13 21:48:41 -04:00
Thomas Ploch
4aa9254316 Updated Memcache settings docblock in core.php (skel and config). Removed probably misleading comment about FCGI. Fixes #1705 2011-05-14 00:55:28 +02:00
Jose Lorenzo Rodriguez
eea981940e Replacing config string in favor of Config 2011-05-13 03:36:45 -04:30
Jose Lorenzo Rodriguez
2a54f0923d More string replacing for new paths 2011-05-13 03:23:53 -04:30
Jose Lorenzo Rodriguez
7ba60ff424 Changing more paths 2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
3b725290ba Renaming elements and layouts 2011-05-13 02:45:36 -04:30
Jose Lorenzo Rodriguez
ded3cb4826 Renaming more folders 2011-05-13 02:31:33 -04:30
Jose Lorenzo Rodriguez
e78345035a Updating CommandListShell to use the new CakePLugin class 2011-05-12 00:20:29 -04:30
Jose Lorenzo Rodriguez
2be486844e Fixing PluginTask tests 2011-05-11 23:48:51 -04:30
mark_story
011aeae951 Giving a useful value to FULL_BASE_URL in CLI if it doesn't get defined by the developer. 2011-05-10 21:05:14 -04:00
AD7six
c7794c1e1f also move any error classes (AppError) to Lib/Error/* 2011-05-09 00:46:51 +02:00
AD7six
ade85c1cd0 add exception for Dbo classes 2011-05-09 00:00:19 +02:00
AD7six
07ffe2fcd8 update the move logic 
whereas previously it only checked if the filename matched the class,
the logic now checks the file is located in the folder expected too.
 2011-05-08 23:55:16 +02:00
AD7six
cb010b62e6 Merge branch '2.0-upgrade' into 2.0 2011-05-07 19:00:17 +02:00
AD7six
7532ab0586 reset files on each itteration 2011-05-01 23:30:24 +02:00
AD7six
4c66db253a don't forget tasks 2011-05-01 23:30:24 +02:00
AD7six
1d493ca122 add a function to make sure file names match the class they contain 2011-05-01 23:30:24 +02:00
AD7six
d100f09bb2 move/rename folders 2011-05-01 23:30:24 +02:00
AD7six
afa6baab2d add a command to run all options 2011-05-01 23:30:24 +02:00
AD7six
f3b216dfe2 remove unused var 2011-05-01 23:30:24 +02:00
AD7six
9ac717819f code standards 2011-05-01 23:30:24 +02:00
AD7six
bbf87f062e don't fail if the dir doesn't exist 2011-05-01 23:30:24 +02:00
Luís Armando
12bf3eae38 Correction of UpgradeShell file name. 2011-05-01 23:30:24 +02:00
Graham Weldon
35485a13e5 Moved Upgrade console into place for 2.0 Console standards. 2011-05-01 23:30:24 +02:00
mark_story
317aad9526 Fixing missing uses for Controller Task. 
Fixing incorrect import() for ClassRegistry.
 2011-05-01 14:58:32 -04:00
Sonny Gauran
4add005baa Fixed baked database.php constants 2011-04-30 02:12:15 +08:00
Renan Gonçalves
170ba71850 Changing the visiblity from private to protected, for extensibility sake. 2011-04-25 22:08:12 +02:00
Renan Gonçalves
9da76a8655 Fixing a couple of typos from last commit. 2011-04-25 21:35:27 +02:00
Renan Gonçalves
abbe5aaea2 Updating console to use i18n'ed strings. 2011-04-25 21:24:16 +02:00
Renan Gonçalves
3251faf8e9 Expliciting methods visibility. 
No need to keep track of line anymore, token_get_all (PHP 5.2.2) returns it.
... and fixing some grammar typos on the way.
 2011-04-25 21:24:07 +02:00
Renan Gonçalves
cd3529c986 Implementing support to multiline string in __*() calls. 2011-04-25 21:23:56 +02:00
Juan Basso
24fbaafe01 Merge with 2.0-email. 2011-04-23 22:36:55 -04:00
Jose Lorenzo Rodriguez
1d384ec68f Reverting change for console help, and improving it so it returns help for the command intended to be run 2011-04-22 16:46:32 -04:30
Jose Lorenzo Rodriguez
63fd35b384 Merge branch 'unused-vars' of https://github.com/evilbloodydemon/cakephp into evilbloodydemon-unused-vars 2011-04-22 16:27:14 -04:30
Jose Lorenzo Rodriguez
3c4f616737 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-04-22 16:10:06 -04:30
Jose Lorenzo Rodriguez
fa1d7da56e Making shells return help if a ConsoleException is catched, like when passing bad parameters 2011-04-22 16:08:26 -04:30
evilbloodydemon
cebcd64090 Unused variables in Console removed 2011-04-23 00:02:06 +04:00
AD7six
bb99f9bc13 removing clear from welcome 
while it's superficially useful to start from a clean screen - it's
not actually helpful.

Quite often cake will issue setup errors which a user will not see
because they are immediately cleared. Users continue using the cli
unaware that they have (possibly significant) problems
 2011-04-22 21:53:02 +02:00
Jose Lorenzo Rodriguez
cf73c1da3a Removing refactoring artifact in TestsuiteShell 2011-04-21 13:31:34 -04:30
Jose Lorenzo Rodriguez
1014806c7b Colorful error if not PHPUnit is found 2011-04-21 13:28:49 -04:30
Jose Lorenzo Rodriguez
8fa73e9650 Throwing an exception if no PHPUnit is installed and running from console 2011-04-21 13:26:50 -04:30
Juan Basso
fac5ae50d0 Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415. 2011-04-20 23:47:21 -04:00
Jose Lorenzo Rodriguez
b1e74cff5b Fixing more path generation for plugins, and typo from previous commit 2011-04-20 11:32:16 -04:30
Juan Basso
e0b4623065 Added support to sender email. Fixes #13. 2011-04-19 20:24:51 -04:00
Jose Lorenzo Rodriguez
147b04ab59 Fixing more paths in skel directory for project generation 2011-04-19 13:04:12 -04:30
Jose Lorenzo Rodriguez
254225372a Fixing problem with skel generation in project task 2011-04-19 12:14:02 -04:30
AD7six
0c2bc7f015 bye bye webroot/css.php 2011-04-18 12:05:50 +02:00
Juan Basso
25705af8ed Added the same email config sample of app/config to console skeleton. 2011-04-17 21:53:30 -04:00
AD7six
9ac79da3f7 don't repeat the default value in the message 
the default value is the cli prompt anywaya
 2011-04-17 18:17:25 +02:00
AD7six
1c62a66b0b simpler bake prompt 
we don't need to repeat the defualt path twice, and a user can just as
easily type "appname" instead of /some/absolute/path/appname
 2011-04-17 18:12:25 +02:00
AD7six
4ab27d6fea full paths are /not/ needed. 
having the help/text state it is necessary is confusing
 2011-04-17 18:08:10 +02:00
AD7six
010feb2092 prevent surpirses with Folder not being available. 
Previously loading File would load Folder also - that's not true with
the new changes, ensure that the Folder class is regsitered with
App::users when the Folder class is used.
 2011-04-17 18:03:43 +02:00
AD7six
65121a4292 apc is disabled on the cli by default 
Therefore, on the cli if the extension is loaded - it's necessary to
check if it's also enabled. Otherwise on the cli there will be no cache.
 2011-04-17 11:42:04 +02:00
AD7six
c1a8dbbce7 provide a default skel dir, and default to the core 2011-04-16 20:20:27 +02:00
AD7six
a0fce70c13 prevent undefined index error baking a new project 
if you call `cake bake project` the skel param is not present
 2011-04-16 19:22:53 +02:00
mark_story
0c4a16bc98 Fixing missing import for AppModel when baking with cake bake all 2011-04-16 09:33:16 -04:00
mark_story
a0660ffd9d Fixing constants being incorrect when calling cake console from the root of the source tree checkout. 2011-04-16 09:32:54 -04:00
Jose Lorenzo Rodriguez
9f5ab79abc Fixing bake tasks after most recent changes 2011-04-11 23:01:48 -04:30
Jose Lorenzo Rodriguez
000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
 2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
75a1481e22 Fixing test loading in cli 2011-04-11 22:23:03 -04:30
Jose Lorenzo Rodriguez
1bbdefc4ad Fixing some bake tasks 2011-04-11 22:15:51 -04:30
Jose Lorenzo Rodriguez
241a3bf624 Fixing ProjectTask tests and renaming folders in skel directory 2011-04-11 21:43:40 -04:30
Jose Lorenzo Rodriguez
85a7f74f30 Renaming folders in skel dir 2011-04-10 21:04:19 -04:30
Jose Lorenzo Rodriguez
662abd6419 Refactoring FixtureTask so it generates correct file names 2011-04-10 20:56:06 -04:30
Jose Lorenzo Rodriguez
d561460fda Refactoring TestTask so it generates tests according to the new file naming standard 2011-04-10 20:49:16 -04:30
Jose Lorenzo Rodriguez
7f2734d053 Starting to migrate internal tests files to the new file schema, and fixing related tests 2011-04-10 15:02:19 -04:30
Jose Lorenzo Rodriguez
5c91827c44 Fixing typo in controller task 2011-03-21 00:45:05 -04:30
AD7six
2078dbccaa use the cake_console domain for everything related to the cli 
using big po files causes a lot of noise to be loaded whenver the
langauge domain is touched - therefore avoid any cli messages from being
loaded by web requests at all.
 2011-03-19 18:32:35 +01:00
AD7six
69ce628f07 fix file permissions 
except for app/console/cake and lib/cake/Console/cake no files should
be executable
 2011-03-16 16:06:44 +01:00
AD7six
39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations 
Conflicts:
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Core/Configure.php
	lib/Cake/View/pages/home.ctp
 2011-03-16 12:29:39 +01:00
AD7six
4f29f58a5e correct path to tmp and core.php file when running outside your app dir. 
also wrapped HttpException class declaraion in an if !class_exists test
- the class exists in the pecl http extension.
 2011-03-16 12:13:47 +01:00
Jose Lorenzo Rodriguez
8ce605ab88 Fix for regression introduced in last commit 2011-03-16 00:28:08 -04:00
Jose Lorenzo Rodriguez
3f7928fccc Changing paths againg form datasources sub packages, 
Updating database.php.default file
Fixing view generation task
 2011-03-16 00:14:37 -04:00
Jose Lorenzo Rodriguez
32e42aaf6f Updating more skel files 2011-03-15 23:56:28 -04:00
Jose Lorenzo Rodriguez
8213160bb1 Udating template home.ctp and providing a default skel dir in tamplate task 2011-03-15 23:48:51 -04:00
Jose Lorenzo Rodriguez
9293361562 Updating ControllerTask to crete files with new naming conventions 2011-03-15 22:23:51 -04:00
Jose Lorenzo Rodriguez
b0a7a109e9 Updating ModelTask to crete files following the new namings 2011-03-15 22:14:10 -04:00
Jose Lorenzo Rodriguez
bd2bd4ba22 Udating skel directory, doc blocs and the location of the Console package 2011-03-15 21:53:42 -04:00
Jose Lorenzo Rodriguez
0cd51de827 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-12 23:49:02 -04:30
AD7six
8f0c923cf6 translations for the console dir 2011-03-12 19:59:06 +01:00
Jose Lorenzo Rodriguez
bab30bd48d More fixes after the recent changes in App::core() 2011-03-12 00:32:44 -04:30
Jose Lorenzo Rodriguez
a1fe95e072 REverting some changes made to constants 2011-03-08 17:32:22 -04:30
Jose Lorenzo Rodriguez
4c90868652 Fixing the Api shell 2011-03-08 15:37:15 -04:30
Jose Lorenzo Rodriguez
dac34555f8 Fixing parse error in bake shell 2011-03-08 15:18:10 -04:30
Jose Lorenzo Rodriguez
65136e8cb1 Re-adding the support for the topmost plugins folder and homogenizing some constants in shell dispatcher 2011-03-08 15:08:28 -04:30
Jose Lorenzo Rodriguez
9f189d39db Fixing the HelpFormatter test 2011-03-08 14:43:00 -04:30
Jose Lorenzo Rodriguez
ac3caf3154 Fixing the testsuite shell and renaming class for BC 2011-03-08 14:18:46 -04:30
Jose Lorenzo Rodriguez
48b3593a25 Fixing the CommandList shell, renaming the TestSuiteShell to TestsuiteShell for BC 2011-03-08 14:15:44 -04:30
Jose Lorenzo Rodriguez
8442d93d9e Fixing the Sell tests 2011-03-08 01:26:21 -04:30
Jose Lorenzo Rodriguez
fd8a7ed6d6 Fixing ControllerTask tests 2011-03-08 01:25:01 -04:30
Jose Lorenzo Rodriguez
0f993fa767 Fixing ModelTaks tests and starting to work on PluginTask tests 2011-03-08 00:50:07 -04:30
Jose Lorenzo Rodriguez
a56c4bff77 Fxing ProjectTask tests 2011-03-07 01:25:05 -04:30
Jose Lorenzo Rodriguez
2ef02ba29b Starting to move all console related classes, ViewTask tests passing 2011-03-07 00:45:00 -04:30
Jose Lorenzo Rodriguez
42b3f993b9 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-01 23:04:52 -04:30
Jose Lorenzo Rodriguez
ba694c45c9 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-27 22:50:53 -04:30
José Lorenzo Rodríguez
4cebe55a9b Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	app/webroot/index.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/tests/cases/libs/controller/components/auth.test.php
 2011-02-21 22:28:30 -04:30
José Lorenzo Rodríguez
f8b51bfd92 Making the test suite load again 2011-02-13 23:56:41 -04:30
José Lorenzo Rodríguez
1b38d7c851 Resolving conflict left out in previous commit 2011-02-13 23:42:41 -04:30
José Lorenzo Rodríguez
6e4f4efb79 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/bootstrap.php
	lib/Cake/Console/Command/TestSuiteShell.php
	lib/Cake/Console/TaskCollection.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/App.php
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
	lib/Cake/TestSuite/CakeWebTestCase.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/TestSuite/TestRunner.php
	lib/Cake/View/HelperCollection.php
	lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	lib/Cake/tests/cases/libs/test_manager.test.php
 2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
 2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
1332561164 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/helpers/js.php
	lib/Cake/Console/Command/Task/FixtureTask.php
 2011-01-09 23:32:05 -04:30
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
 2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
b2ad8fe113 Removing constant TEST_CAKE_CORE_INCLUDE_PATH 2010-12-19 23:33:37 -04:30
José Lorenzo Rodríguez
5fa028839e Fixing paths location in cake.php files 2010-12-19 23:17:53 -04:30
José Lorenzo Rodríguez
8bcabdea6a Fixing constants for test suite 2010-12-18 22:02:25 -04:30
José Lorenzo Rodríguez
07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
 2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
b8344ecd33 Replacing some of the App::import by App::uses 2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
848461f7a0 Making the testsuite run again 2010-12-08 01:49:36 -04:30
José Lorenzo Rodríguez
02ad049559 Fixing more shells, and updating code in home.ctp 2010-12-07 20:42:50 -04:30
José Lorenzo Rodríguez
66145db2a9 Fixing class loading for bake tasks 2010-12-07 19:50:56 -04:30
José Lorenzo Rodríguez
b5122e6e81 Fixing more console classes 2010-12-07 01:44:47 -04:30
José Lorenzo Rodríguez
e3690ebccb Making shells run again 2010-12-07 01:26:10 -04:30
José Lorenzo Rodríguez
1c0a4c9e0a Starting to move console classes 2010-12-07 00:47:53 -04:30