mark_story
d5589d26bd
more doc blocks.
2010-12-21 22:27:17 -05:00
mark_story
6206fefcee
Starting to switch to a _mergeParent. This will allow un skipping of many tests, and make mergeVars more flexible.
2010-12-15 23:44:43 -05:00
Jeremy Harris
904cb8a4a6
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-12-14 20:30:58 -08:00
Jeremy Harris
b9143dc7d4
Added ControllerTestCase class for testing controllers. Fixes #1244
2010-12-14 19:58:27 -08:00
mark_story
478d158133
Removing a var_dump because I'm a muppet.
2010-12-14 22:52:31 -05:00
Jeremy Harris
9fa1bec0cb
Move Controller::paginate() into PaginatorComponent
2010-12-14 18:21:39 -08:00
mark_story
ceca179184
Fixing more tests that were failing post merge.
2010-12-10 23:17:42 -05:00
Graham Weldon
33d2f9a6ed
Refs #621 . Provides default maxLimit for pagination to prevent url manipulation causing long queries.
2010-12-10 12:22:12 +11:00
mark_story
55e06ec244
Merge branch '2.0-config' into 2.0
...
Conflicts:
cake/libs/configure.php
2010-12-05 23:00:05 -05:00
mark_story
5f47de7658
Adding @package tags.
...
Moving MissingModelException with the other exceptions.
2010-12-05 00:02:20 -05:00
mark_story
d202ea643d
Fixing issue loading plugin models when uses == false.
2010-12-04 23:49:00 -05:00
Graham Weldon
dd18efbe7c
Append Controller to error class name for isAuthorized() not implemented.
2010-12-04 22:21:10 +11:00
mark_story
8a129ec3a0
Adding a normalize parameter to Object::_mergeVars(). This allows existing behavior to be maintained.
...
Updating Controller and Shell usage to match new parameters.
2010-11-21 00:47:42 -05:00
mark_story
8821bec049
Moving _mergeVars() into Object as its common to Controller, Model and Shell.
2010-11-21 00:14:29 -05:00
mark_story
8f82156a51
Adding _mergeVars to Controller (this duplicated method will be re-factored away).
...
Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.
2010-11-21 00:14:29 -05:00
mark_story
3237402fb8
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
6d9b000aee
Changing how mergeVars are handled, so the difference of app/current is used as a base.
...
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
mark_story
9b08b725fe
Merge branch '2.0' into 2.0-view
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
01894b315f
Fixing issues caused by not accessing the request object correctly.
2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
mark_story
6c0dfe9592
Fixing error where params[url] has moved.
2010-11-09 23:44:33 -05:00
mark_story
22497eb41c
Fixing failing tests in controller test.
2010-11-07 13:23:45 -05:00
mark_story
1bc6433ecd
Removing duplicate import() and fixing missing dependency.
2010-11-07 13:23:43 -05:00
Juan Basso
7f448a1d35
Allowed the use of empty() and isset() in Controllers aliases properties.
2010-10-31 22:02:26 -02:00
mark_story
f847080cbf
Changing more php version strings.
2010-10-03 12:46:03 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
e91fa68f8e
Making the set() functions use + instead of array_merge() so that numeric indices are properly preserved across multiple method calls. Fixes #1105
2010-09-18 00:13:03 -04:00
mark_story
1707c92aa1
Removing duplicated code.
2010-09-14 23:15:10 -04:00
mark_story
f34cfd1f1e
Updating EmailComponent to use new methods on the ComponentCollection to ensure it always has a controller reference.
...
Removing triggerDisabled key as its no longer needed or wanted.
2010-09-14 23:02:38 -04:00
mark_story
97dd7c7644
Adding support to ObjectCollection and its subclasses to trigger callbacks on all objects instead of just the enabled ones. Fixes issues where inner components would not get access to the controller as the initialize callback wasn't fired. This fixes some backwards compatibility issues. Tests updated.
2010-09-14 21:57:40 -04:00
mark_story
e4b2fb173b
Removing the deprecated properties.
...
Removing property copying to helpers.
Making the view test cases pass again.
2010-09-13 23:11:59 -04:00
mark_story
a521291afd
Adding a __set() method to make some tests pass.
...
Updating internal usage to not use deprecated attributes.
Updating test cases to not use deprecated attributes.
2010-09-13 23:11:59 -04:00
mark_story
84565151de
Removing all the deprecated properties from Controller.
...
Adding a __get() method to provide the properties that were moved to CakeRequest.
Tests added.
2010-09-13 23:11:59 -04:00
mark_story
e4d34b640b
Merge branch '2.0-exceptions' into 2.0
...
Conflicts:
cake/libs/error.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/error.test.php
2010-09-10 20:31:16 -04:00
Mark Story
474ace09c1
Adding CakeResponse to the list of included files for Controller.
2010-09-06 01:11:26 -04:00
Mark Story
2e8a60f932
Removing some mentions of cakeError as its been removed. Also adding information about exceptions that can be raised.
2010-09-02 16:38:19 -04:00
mark_story
a8d4015f47
Updating bootstrap process in CLI to match the one in web.
...
Updating all_libs to use new file.
Updating error_handler test to run in cli.
Updating Controller so it imports required classes.
2010-08-30 22:59:10 -04:00
mark_story
9485f0a993
Merge branch 'request-response' into 2.0
...
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
2010-08-28 00:24:07 -04:00
mark_story
2cdb10812d
Merge branch '2.0-exceptions' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/tests/cases/dispatcher.test.php
2010-08-28 00:14:34 -04:00
José Lorenzo Rodríguez
f63b093d24
Merge branch '2.0-request' into 2.0
...
Still tons of tests failing
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/html.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helper.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
2010-08-27 23:31:41 -04:30
mark_story
b301b0d86e
Adding MissingModelException.
2010-08-27 23:04:35 -04:00
mark_story
7221f9c3b9
Moving response construction into Controller, this will let controller classes more easily modify the response subclass they want to use.
...
Test case updated.
2010-08-22 12:31:55 -04:00
mark_story
c6a63bae82
Fixing incorrect method call from merge with 1.3
2010-08-10 23:18:42 -04:00
mark_story
5068d62473
Fixing issue that came up in rebasing.
2010-08-10 23:18:42 -04:00
mark_story
d01708b1ef
Adding temporary $View property to controller until I figure out a better way to provide access for it. Test case updated to reflect View not being in the registry anymore.
2010-08-10 23:18:42 -04:00
mark_story
a4e2f7c55f
Updating intialiize() callbacks. Moving $this->_set() int Component::__construct as all the core components did it. Updating constructors and including parent calls.
2010-08-10 23:18:40 -04:00
mark_story
fac97738ce
Making Controller use ComponentCollection.
2010-08-10 23:18:39 -04:00
José Lorenzo Rodríguez
077f71aaa1
Refactoring controller rendering to use the CakeResponse object
2010-08-01 01:38:45 -04:30
José Lorenzo Rodríguez
0824348db1
Removing Controller::output property and refactoring methods to not use it. CakeResponse::body() should be used instead
2010-08-01 01:13:41 -04:30
José Lorenzo Rodríguez
f9c97383e9
Refactored Controller::disableCache() to use the CakeResponse object, method was also deprecated
2010-08-01 00:16:50 -04:30
