mark_story
4960b6e7bf
Changing method names on CakeLog and Debugger to better reflect what they do. Updating test cases.
2010-11-25 22:51:28 -05:00
mark_story
da3bf1c747
Adding ErrorHandler::handleError for consolidating core error handling out of CakeLog and Debugger.
2010-11-25 22:51:28 -05:00
mark_story
6d5cf96d1c
Making instance method use the instance, and not call itself statically.
2010-11-25 22:51:28 -05:00
mark_story
7013a8f1e0
Fixing typo. Should be AppShell, not AppModel.
2010-11-22 21:07:21 -05:00
mark_story
2d21e9c331
Removing cache hits, as App::core() is almost always called before Cache is initialized, as Cache uses App::core to load the first configured engine. This Cache::read call can never succeed so it should be removed.
2010-11-21 23:02:39 -05:00
mark_story
8e1f7cc7b9
Removing extra line.
2010-11-21 15:12:44 -05:00
mark_story
8aabf3689e
Making BehaviorCollection more consistent with other object collections.
...
Fixing failing tests caused by not being updated when behavior changed.
2010-11-21 14:42:13 -05: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
e2aeae3825
Adding _mergeVars() into Model.
...
Refactoring how Model does its property merging.
Eventually _mergeVars() could be moved into Object.
2010-11-21 00:12:07 -05:00
mark_story
cbd88ede37
Adding support for AppShell into App. When you import a Shell class, App will automatically load Shell and AppShell.
2010-11-21 00:12:07 -05:00
mark_story
66c9b79c2e
Removing App::__overload() it does nothing anymore.
2010-11-21 00:12:06 -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
e0a8ffe8a3
Applying patch from 'jmccaffrey' to fix issues on windows where virtual
...
machine paths would not be correctly handled. Fixes #1254
2010-11-20 13:26:30 -05:00
PhpNut
82d46067ab
Corrected doc comment.
2010-11-17 15:00:27 -06:00
PhpNut
bed7767258
Removing __cache property that can be altered outside of the class definition.
...
Adding __resetCache() as a replacement for checking if cache should be reset and written.
2010-11-17 14:02:35 -06:00
mark_story
47f6a29998
Small optimizations in env() and Helper::_parseAttributes().
2010-11-16 22:24:54 -05:00
mark_story
d89581dcca
Changing object construction and method call to use file_put_contents.
2010-11-16 21:54:05 -05:00
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
5349257bbd
Changing empty() to !isset() to avoid additional cache hits when po files are missing or empty.
2010-11-16 07:32:14 -05:00
mark_story
66e6ec763e
Merge branch 'dispatcher-request' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/tests/cases/libs/all_routing.test.php
cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
mark_story
293ef95f33
Adding more documentation, and adding some return early changes.
2010-11-14 18:43:46 -05:00
mark_story
db3f74dfa0
Moving a method around.
2010-11-14 18:38:10 -05:00
mark_story
070066be18
Expanding doc blocks for Dispatcher.
...
Extracting _isPrivateAction() so subclasses could change the behavior.
2010-11-14 18:37:27 -05:00
mark_story
1631f31460
Adding doc comments to Configure and App.
2010-11-14 18:26:54 -05:00
mark_story
1b89547c58
Pulling App out into its own file. Trying to stick with one class per file conventions.
...
Removing class_exists check, as Set is loaded during the framework
bootstrap.
2010-11-14 13:02:30 -05:00
mark_story
afd2683602
Adding a check for loaded routes. This prevents routes being loaded on each dispatched action, such as when requestAction is called.
2010-11-14 01:12:39 -05:00
mark_story
f27566336c
Renaming private method to protected.
...
Removing return by reference operator.
2010-11-14 01:08:13 -05:00
mark_story
f36f38e7f6
Adding doc blocks and adding type hints for _invoke().
2010-11-14 01:05:42 -05:00
mark_story
f02e0483ee
Reworking parameter munging specific to requestAction into requestAction. Updating tests cases for Object. As request->data is an array() not null. And leading / is trimmed off of [url][url].
2010-11-14 01:01:11 -05:00
mark_story
ea80a6dbbb
Removing instance variables that were no longer needed, as they weren't actually being used for much.
2010-11-14 00:16:07 -05:00
mark_story
1fe84c00dd
Starting to try and simplify the bootstrap process, and give a choice
...
over which GET param is used for cake's url.
2010-11-14 00:06:01 -05:00
mark_story
dad7963ea4
Moving Dispatcher inside libs directory, as it is part of CakePHP's libs.
2010-11-14 00:00:23 -05:00
mark_story
6073ac5dfa
Fixing errors caused by accessing things that don't exist.
2010-11-13 23:57:01 -05:00
mark_story
c7fed2ecba
Removing duplicate calls to Inflector.
2010-11-13 21:08:26 -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
4c3337598e
Updating version numbers for 1.3.6
2010-11-13 20:01:20 -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
47fa4713b1
Pulling ScaffoldView into a separate file.
2010-11-12 22:54:28 -05:00
mark_story
85e072a64b
Removing reference operators in view class constructors.
2010-11-12 22:51:53 -05:00
mark_story
4e3b62e466
Removing vestigial method in App.
...
Fixing E_STRICT error in Router.
2010-11-10 23:43:48 -05:00
mark_story
6c2b088706
Merge branch '2.0' into 2.0-view
2010-11-10 23:41:44 -05:00
mark_story
76c3e1a112
Adding cache comment stripping to the CacheHelper, it was recently removed from View, and needed to be added here to fix failing tests.
2010-11-09 23:55:30 -05:00
mark_story
6c0dfe9592
Fixing error where params[url] has moved.
2010-11-09 23:44:33 -05:00
mark_story
ee0dc785b2
Removing cache comment stripping, they are harmless in html/xml.
2010-11-09 22:37:02 -05:00
mark_story
7ad4068085
Refactoring to remove some duplication.
2010-11-09 22:27:36 -05:00
mark_story
1cf5e72054
Removing duplicated calls to slug()
...
Extracting getElementFilename() into a method, this should allow developers to more easily replace how elements are found.
Refs #1268
2010-11-09 22:16:45 -05:00
