ADmad
16d29a8d0e
Making Folder::delete() code more PHP5ish
2011-12-15 03:07:17 +05:30
mark_story
07a2a60468
Merge branch '2.0' into 2.1
2011-12-13 22:03:40 -05:00
mark_story
645ef47878
Fix multiple date formats in Validation::date()
...
Fixes #2364
2011-12-12 20:21:10 -05:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
mark_story
bc8ae11fc1
Fix fatal error with abstract/interface classes
...
Abstract/Interface classes + ClassRegistry::init() should
raise an exception, not cause fatal errors.
Update CakeSchema to swallow and ignore any exceptions coming from
ClassRegistry.
Fixes #2328
2011-12-07 20:58:01 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
c1f5dc1e40
Make XmlView consistent with JsonView.
...
Both allow a view script or a serialize key with the name
of the variable to be serialized.
2011-11-27 23:51:48 -05:00
Christian Hieke
a51626840e
Escape special characters in XML.
...
Fixes #2188 .
2011-11-25 21:20:26 -05:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
Kyle Robinson Young
708ae873a5
Add @link to Set methods
2011-11-18 11:13:46 -08:00
Kyle Robinson Young
53f7a716ec
Add @link to File/Folder properties
2011-11-18 11:05:30 -08:00
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
Rachman Chavik
aab8e98531
Configure ClassRegistry in test mode
...
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
2011-11-17 11:31:36 +07: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
Kyle Robinson Young
3248e34819
Add @link to File and Folder utilities
2011-11-14 22:40:02 -08:00
mark_story
2c7854cc2f
Replace complicated $$foo with simple variable.
2011-11-12 21:42:20 -05: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
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
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
Renan Gonçalves
53be552370
Fixing use of options['exclude'] in Debugger::trace(), tests added.
2011-10-27 16:01:54 +02:00
mark_story
ad524b25ef
Merge branch '2.0' into 2.1
2011-10-25 22:29:03 -04:00
mark_story
bd87400131
Fix inflection for words ending in media.
...
Fixes #2149
2011-10-24 21:05:56 -04:00
Daniel Pakuschewski
318ea27c8d
File::info() return the file size.
2011-10-22 11:01:22 -04:00
mark_story
52010a3e9d
Fix double encoding in debug().
2011-10-20 21:38:31 -04:00
AD7six
53bc963315
Merge branch '2.0' into 2.1
2011-10-20 08:57:49 +02:00
mark_story
535b45b600
Fix strict warnings on Validation class.
2011-10-19 23:18:46 -04:00
mark_story
bca6492309
Update debug()
...
debug() now uses Debugger to output content and generate traces.
This improves the readability of its output as null/true/false are better
represented. Objects are easier to interpret as well.
2011-10-19 22:27:55 -04:00
mark_story
49f687b0c4
New Debugger::exportVar() formatting.
...
Better resembles var_dump().
Includes types, and is less noisy to read than before.
2011-10-19 22:27:55 -04:00
mark_story
183ffb29d7
Improving the exception stack traces.
...
Adding Debugger::getType()
2011-10-19 22:27:55 -04:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
Renan Gonçalves
3a04bb4733
Dropping short syntax support for Behavior configuration.
...
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
2011-10-15 20:52:41 +02:00
Jose Lorenzo Rodriguez
f23d62d411
Fixing more @link annotations
2011-10-15 12:42:23 -04:30
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
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
mark_story
dff45740ea
Add 'trace' to the data provided to Debugger formats.
...
Allows custom debugger output formats to display
a stack trace.
2011-09-28 23:26:38 -04:00
mark_story
864cb70645
Moving basic templates to the 'base' key.
2011-09-28 23:25:14 -04:00
mark_story
36928d35f9
Redoing fix done in 155968349f
...
Adding more test cleanup to try and solve build issues.
2011-09-22 22:05:36 -04:00
mark_story
eccc05d8b1
Revert previous commit. Trying to fix jenkins build.
2011-09-22 21:39:00 -04:00
mark_story
155968349f
Skip . and .. when generating trees.
...
Fixes #2012
2011-09-22 21:14:27 -04:00
mark_story
027dba72c9
Removing the helpPath feature as its not documented, not tested and most likely
...
entirely unused.
2011-09-03 12:18:03 +01:00
mark_story
f1f4afacbd
Fixing duplication of classes. cake-debug was used for debug and error messages.
2011-09-03 10:06:01 +01:00
mark_story
815b78c2f9
More tweaks to the error output and headings.
...
Removing extra | from debugger output.
2011-09-03 10:06:00 +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
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