bcrowe
70d9ae9a03
Fix docblock typo of ObjectCollection class
2013-03-28 20:14:41 -04: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
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
...
2.3 unify object collection
2012-12-22 14:24:26 -08: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
euromark
83b0c5042f
correct the doc block
2012-11-16 23:32:56 +01:00
euromark
94f19ef4b8
deprecate attached()
2012-11-16 12:19:23 +01:00
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
mark_story
921c2c67ab
Fix strict error in 5.4
2012-09-13 20:59:17 -04:00
dogmatic69
173524ade2
PHP 5.4 strict error fix
2012-09-13 21:12:04 +01:00
dogmatic69
91c09d87bc
simplify the code for object collection
...
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
2012-09-12 21:56:59 +01:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
mark_story
9d325fe46e
Fixing most coding standard issues in Utility/
2012-03-03 17:31:47 -05:00
dogmatic69
be49b2b942
fixing up the docs for Collection::attached(), was showing behaviors but is for all collections
2012-02-17 13:25:37 +00:00
mark_story
5936fa5930
Fix strict errors.
2011-12-29 11:10:25 -05:00
Jose Lorenzo Rodriguez
1651257919
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
2011-12-26 13:06:48 -04:30
Jose Lorenzo Rodriguez
35ecbfebde
Making the CakeEvent -> ObjectCollection bridge more intelligent, adding tests
2011-12-25 23:17:08 -04:30
Jose Lorenzo Rodriguez
7fdc1cc8d4
Migrating the beforeRedirect callback to the CakeEventManager, reorganizing how events are triggered in controller
2011-12-25 22:48:27 -04:30
Jose Lorenzo Rodriguez
078a2dfd72
Migrating View and Helpers events to use the CakeEvenManager
2011-12-25 19:00:19 -04:30
Jose Lorenzo Rodriguez
5d67195bf7
Migrating Controller events to use the CakeEventManager
2011-12-25 14:44:34 -04:30
mark_story
39b1203e9a
Making modParams work with non-array values.
...
All but true, false, null will replace the parameter now.
This allows modification of string and object parameters.
2011-12-17 22:23:36 -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
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
ADmad
a7d08a6b39
Removed unused option triggerDisabled from ObjectCollection::trigger().
...
Fixed docblock for ObjectCollection::load();
2011-11-06 20:29:46 +05:30
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
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Juan Basso
a0ee8b49fe
Fixed some API doc in console.
2011-07-28 22:05:29 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
a3447592d5
updating langauge domains
...
cake - end user
cake_error - error messages
cake_developer - not an error just for the developer
2011-03-19 18:23:01 +01:00
AD7six
e2dfafddb2
translation changes for the Utility dir
2011-03-12 20:02:37 +01:00
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
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
e57b3d8e74
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/View/Helper.php
2010-12-10 01:25:00 -04:30
José Lorenzo Rodríguez
fbbb5c9337
Moving more clases to the new layout while trying to make controller related classes load
2010-12-04 02:45:22 -04:30
