Commit graph

8739 commits

Author SHA1 Message Date
mark_story
fdcfd03340 Fixing typo that prevented html coverage reports from being generated. 2010-11-21 23:02:28 -05:00
mark_story
4c0e69b8fc Removing constant checks, they aren't used anymore. 2010-11-21 15:13:33 -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
cb657b158b Fixing failing test and adding skip for test that will fail in a non-isolated case. 2010-11-21 14:39:07 -05:00
mark_story
a729d29cfd Updating ModelTask test to have fewer skips and collisions with the rest of the testsuite. 2010-11-21 13:39:18 -05:00
mark_story
d7b1f70680 Adding some additional output to bake tasks to make them more consistent. Adding flags for Quiet output so the shells give minimal output. 2010-11-21 12:55:01 -05:00
mark_story
d373dde2ef Fixing notice errors in bake all.
Moving some message printing around.
2010-11-21 12:22:44 -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
b80535573e Adding _mergeVars to Shell. This allows $tasks and $uses to work much
like $uses in Controllers, and provides consistency in the framework.
Adding tests for merging vars.
2010-11-21 00:12:07 -05:00
mark_story
a8554df077 Fixing call to a help method that doesn't exist. 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
a2bc369935 Fixing missing include in HelpFormatter. 2010-11-21 00:12:06 -05:00
mark_story
4f6891705b Moving Shell test to the same path as the shell class. 2010-11-21 00:12:06 -05:00
mark_story
66c9b79c2e Removing App::__overload() it does nothing anymore. 2010-11-21 00:12:06 -05:00
mark_story
0d7ecea6cb Adding AppShell to the ignored shell list in CommandListShell. 2010-11-21 00:12:06 -05:00
mark_story
b914709f32 Moving AppShell to where the other shells live. 2010-11-21 00:12:06 -05:00
mark_story
b0ddfa0755 Added the placeholder class for an 'AppShell'.
Conflicts:

	cake/console/cake.php
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
ef3cb0e50c Adding tests for Set::normalize() 2010-11-20 22:46:55 -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
ba10003ef2 Fixing failing tests when HtmlHelper test was run by itself. 2010-11-16 22:52:49 -05: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
f0ac462775 Updating test cases with failing tests. 2010-11-15 22:53:49 -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
b91566d35f Removing ini_set() in project root.
Fixing notice errors that would happen when mod_rewrite wasn't enabled.
2010-11-14 14:45:09 -05:00
mark_story
27287e4b9f Moving AppTest into a separate file.
Updating test suite.
2010-11-14 13:06:25 -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
8e29595b63 Updating test.php to bootstrap like index.php
Updating skel file to match app one.
2010-11-14 12:50:28 -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
55cc3296ab Making the Debugger tests pass when you have debug = 0 in your config file. Tests are runnable while debug = 0 from CLI. 2010-11-14 00:59:45 -05:00
mark_story
557d797297 Making Dispatcher test cases pass when Dispatcher expects a CakeRequest instead of a string. 2010-11-14 00:29:56 -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
76a80c262e Fixing failing test caused by name() being able to quote things better now. 2010-11-13 12:04:22 -05:00
mark_story
6c8c7ca4a5 Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.
Tests updated.
2010-11-12 23:57:55 -05:00
mark_story
f9b7cbcb96 Making ConsoleOptionParser allow subclasses of the option, argument and subcommand classes to be supplied as arguments to the builder methods. Adding tests. 2010-11-12 23:52:33 -05:00
mark_story
8e1dd9e892 Adding __get() to access protected properties of ConsoleOptionParser components for upcoming changes. 2010-11-12 23:34:52 -05:00
mark_story
e63f81c12a Fixing test case that was missing request access. 2010-11-12 23:23:08 -05:00
mark_story
faa23e8d51 Updating tests to reflect changes in bake templates. 2010-11-12 23:22:48 -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
d044cdd02f Fixing test case that was missing request access. 2010-11-12 22:50:15 -05:00
mark_story
ec2884f17c Making routing suite include RedirectRoute. 2010-11-10 23:50:01 -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
f4b0ec1d20 Updating E_STRICT issues in view test.
Removing dead methods and classes.
2010-11-10 23:40:56 -05:00
Mariano Iglesias
a1467822fb Fixing wrong assertion in test for CakeTestCase::testAction. Fixing testAction issue that would always include layout 2010-11-10 23:03:38 -04:30
mark_story
b297bf633d Updating test to be correct. 2010-11-09 23:55:42 -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
1f5999f388 Adding some tests for element caching. 2010-11-09 22:31:05 -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
José Lorenzo Rodríguez
8c2f9e1d2b Removing E_STRICT errors from router 2010-11-08 22:38:30 -04:30
José Lorenzo Rodríguez
afa5ee6885 Removing E_STRICT errors from connection manager 2010-11-08 22:37:34 -04:30
José Lorenzo Rodríguez
2fa653d2f3 Removing E_STRICT errors from i18n 2010-11-08 22:37:09 -04:30
José Lorenzo Rodríguez
398adbbc7a Removing E_STRICT errors from debugger 2010-11-08 22:36:48 -04:30
José Lorenzo Rodríguez
4cba8a12a0 Removing E_STRICT errors from Configure and App class 2010-11-08 22:36:38 -04:30
José Lorenzo Rodríguez
62017b2e38 Removing E_STRICT errors from ClassRegistry 2010-11-08 22:35:55 -04:30
José Lorenzo Rodríguez
09011d1010 Removing E_STRICT errors from CakeSession 2010-11-08 22:35:31 -04:30
José Lorenzo Rodríguez
44e9783dea Removin E_STRICT errors from dispatcher 2010-11-08 22:35:10 -04:30
mark_story
e8678b38ac Adding specific conditions to model->delete's call to dbo->delete. This
helps fix a race condition where dbo->defaultConditions could cause
additional data loss.  Fixes #250
2010-11-08 21:50:45 -05:00
Juan Basso
b413aa99d9 Removing instance by reference. 2010-11-08 23:51:45 -02:00
mark_story
dfefc2d97b Very initial pass at getting elements cached with Cache. Refs #1268 2010-11-08 00:06:10 -05:00
mark_story
a9a9bc0e2e Removing bogus crud in the test. 2010-11-07 23:48:14 -05:00
Ceeram
bc7770aa83 removing useless calls to mapActions()
Signed-off-by: mark_story <mark@mark-story.com>
2010-11-07 23:16:41 -05:00
mark_story
e431e86aa4 Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added. 2010-11-07 20:53:04 -05:00
Jeremy Harris
c98306727d Merge branch '2.0-redirect' into 2.0 2010-11-07 17:42:04 -08:00
Jeremy Harris
7630580511 Added support for redirection routes. Fixes #1151 2010-11-07 17:33:05 -08:00
Jeremy Harris
060f149a84 Added configurable ellipsis on Paginator::numbers(), Paginator::first(), Paginator::last(). Fixes #1086 2010-11-07 17:08:01 -08:00
Jeremy Harris
b5deb41fb7 Merge remote branch 'upstream/2.0' into 2.0 2010-11-07 15:48:50 -08:00
Jeremy Harris
cad6fc7a17 Force console output tests to output as color 2010-11-07 15:41:40 -08:00
mark_story
5214c56f1b More instructions on how to install phpunit. 2010-11-07 18:02:19 -05:00
mark_story
b8cc605e21 Updating instructions for installing phpunit. 2010-11-07 18:00:22 -05:00
mark_story
3216c902cd Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
Test cases updated.
2010-11-07 13:23:45 -05:00