Commit graph

11390 commits

Author SHA1 Message Date
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
Juan Basso
3056fbf680 Changing authentication classes to use suffix Authentication instead of Method. 2010-11-20 17:47:35 -02: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
José Lorenzo Rodríguez
40418de218 Freeing up some memory in dbos after the result set has been completly fetched.
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
mark_story
ba10003ef2 Fixing failing tests when HtmlHelper test was run by itself. 2010-11-16 22:52:49 -05:00
José Lorenzo Rodríguez
c0f10437ea Adding a few transactions to speed up a little tests involving fixtures 2010-11-16 23:14:48 -04:30
José Lorenzo Rodríguez
1326707c9d Implementing transaction nesting, this will allow to open multiple transactions that will only be commited if all transactions succesfully calls commit() 2010-11-16 22:56:23 -04:30
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
José Lorenzo Rodríguez
f2b707ac0b Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
2010-11-16 21:54:42 -04:30
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
José Lorenzo Rodríguez
a335891eba mapping lastNumRows to lastAffectedRows as it is not possible to do the first one using PDO 2010-11-16 02:02:08 -04:30
José Lorenzo Rodríguez
5a881c461e Fixing acl testcase so it runs smoothly on postgres 2010-11-16 01:22:29 -04:30
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
Juan Basso
7e0d34903e Removed use of reference in params of http methods. 2010-11-15 00:09:52 -02:00
Juan Basso
7bea5d9410 Added the http directory to AllSocket tests. 2010-11-14 23:56:12 -02: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
cb4dfc4ee0 Changing import() to require, as its a fraction faster. 2010-11-14 11:34:10 -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
Juan Basso
974161cf3a Changed the name of header to use in Digest method. 2010-11-13 21:47:25 -02:00
Juan Basso
85607a9963 Removed interference in the name of the headers. 2010-11-13 21:44:11 -02:00
Juan Basso
44629bd673 Support to digest method in HttpSocket. Thanks to jmcneese and Adrien Gibrat. 2010-11-13 20:51:09 -02:00
Juan Basso
1d56625f3a If method is false, dont send the authentication. Fixed throw message. 2010-11-13 17:22:16 -02: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
Juan Basso
1dfd3ce0b1 Changing the auth value only if auth not is setted. 2010-11-13 13:40:00 -02:00