Commit graph

588 commits

Author SHA1 Message Date
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
c096eea664 Fixing failing tests caused by constants changing. 2010-12-05 23:32:34 -05:00
Jeremy Harris
8a7e2609cd Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-12-05 17:57:44 -08:00
Jeremy Harris
5eab027b84 Removed unnecessary pass by references 2010-12-05 17:28:15 -08:00
Mark Story
40585a34e8 Adding support for userPath in IniAcl.
Test case added.
Fixes #1291
2010-11-28 21:22:10 -05:00
Mark Story
3ddff879b1 Converting IniAcl to use IniFile, this removes one of the classes responsibilities. 2010-11-28 21:06:22 -05:00
Mark Story
1f72e504d5 Fixing incorrect imports that caused test case to fail in CLI when run by itself. 2010-11-28 20:49:42 -05:00
Jeremy Harris
1411e9495e Fixed failing test due to missing CakeRequest class 2010-11-27 12:47:19 -08: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
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
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
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
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
6073ac5dfa Fixing errors caused by accessing things that don't exist. 2010-11-13 23:57:01 -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
b297bf633d Updating test to be correct. 2010-11-09 23:55:42 -05:00
mark_story
6c0dfe9592 Fixing error where params[url] has moved. 2010-11-09 23:44:33 -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
mark_story
22497eb41c Fixing failing tests in controller test. 2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8 Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated. 2010-11-07 13:23:45 -05:00
Mark Story
94f9f7afeb Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest. 2010-10-31 22:42:16 -04:00
Mark Story
c2063f1229 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-31 21:58:38 -04:00
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04: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
a57f8d3851 Adding another test for csrfUseOnce. 2010-10-24 20:57:12 -04:00
mark_story
22239b4481 Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript. 2010-10-24 20:26:31 -04:00
mark_story
4496a0a0bb Reformatting code to use tabs.
Fixing issue with float comparison.
Fixes #219
2010-10-24 19:43:41 -04:00
C. James Callaway
b8f0dda964 Updating to match ticket, using radians() SQL function. 2010-10-24 19:39:18 -04:00
C. James Callaway
a429287c19 Adding testcase for ticket #219 2010-10-24 19:38:23 -04:00
mark_story
1c25e627ad Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100.
Fixes #1205, Fixes #1204
2010-10-18 22:06:12 -04:00
mark_story
0c070f7131 Fixing tests that were failing due to SimpleTest being less sensitive to types than PHPUnit.
Fixing tests that were failing due to XmlHelper being removed in 2.0.
2010-10-13 23:09:55 -04:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
a0a84d1a8d Changing pattern used to read digest auth data. Allows emails to be used as usernames.
This also adds the realm to the return value of SecurityComponent::parseDigestAuth().  Fixes #1181
2010-10-11 22:35:47 -04:00
mark_story
3ab77017ae Fixing OpenTest license mentions to use MIT License
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d Changing the @license tag on test files, as tests can now be MIT like
the rest of CakePHP.
2010-10-03 12:27:27 -04:00
mark_story
d83c51cde9 Fixing expiration conditions on CSRF tokens. 2010-10-02 18:27:39 -04:00
mark_story
7f7c202f35 Removing old CSRF token validation checks.
Removing failing test because the feature moved.
Adding tests for expired and wrong keys.
2010-10-02 17:16:40 -04:00
mark_story
a10f1478ee Adding support for nonce expiry.
Adding simple time based nonce expiration. This does a simple cleanup on
each request, to remove stale tokens.  Tests added.
2010-10-02 00:20:58 -04:00
mark_story
711e736cd3 Adding very minimal and incomplete implementation of csrf consumption.
Tests added for consuming csrf tokens on each request.
2010-10-01 00:13:34 -04:00
mark_story
dc6b33f80e Making tokens persist across 'requests'.
Removing more serialize/unserialize calls.
2010-09-30 00:26:44 -04:00
mark_story
f5ed91137a Adding csrfCheck related properties.
nonces are now being populated into the session.
2010-09-30 00:18:25 -04:00
mark_story
b088daf045 Adding tests for csrf feature separation.
Removing serialize() calls as they didn't really add anything.
2010-09-30 00:06:38 -04:00
mark_story
237b66d193 Adding support for httpOnly cookies to CookieComponent. Fixes #1127 2010-09-25 23:24:37 -04:00
mark_story
2b1bc99eb5 Fixing failing tests in auth and scaffold.
Fixing more tests that had stray buffers.
2010-09-25 22:27:31 -04:00
mark_story
92b57d81ee Moving common setup and teardown functionality in to CakeTestCase.
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
2010-09-25 21:36:49 -04:00