Jeremy Harris
10bf41a4df
Merge commit '42a5ebf47b73bbdf200f0238e30e6d4893695f80' into 2.0
2010-12-14 19:00:26 -08:00
Jeremy Harris
9fa1bec0cb
Move Controller::paginate() into PaginatorComponent
2010-12-14 18:21:39 -08:00
mark_story
dc7ff8911d
Fixing tests in ComponentCollection and HelperCollection as return of trigger now depends on the triggered objects.
...
Removing annoying test that broke anytime something changed in Model.
2010-12-12 18:02:45 -05:00
mark_story
d14d148948
Making scaffold form view names consistent with those used in bake.
...
Renaming test_app files.
Fixes #501
2010-12-12 13:18:28 -05:00
mark_story
11df32148f
Updating scaffold templates to use post forms for delete buttons. Updating test case.
2010-12-12 13:13:00 -05:00
mark_story
44c080d5ad
Making all core classes throw CakeException subclasses, this allows developers to catch framework exceptions with one catch.
...
Adding package specific exceptions.
Replacing generic exceptions in the codebase with CakeException + package exceptions.
2010-12-11 19:26:10 -05:00
mark_story
ceca179184
Fixing more tests that were failing post merge.
2010-12-10 23:17:42 -05:00
mark_story
1e108748e9
Fixing validation methods + features lost in [ f51ce734] due to a bad
...
merge.
Fixing additional tests to reflect changes in 2.0
2010-12-10 22:52:22 -05:00
mark_story
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
mark_story
d7e62b88bc
Adding test cases for using helpers in nested elements from email
...
templates. Closes #1355
2010-12-09 22:34:20 -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
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
ADmad
70ae66edf7
Fixing test cases for EmailComponent
2010-11-27 01:21:19 +05:30
mark_story
4214242efd
Adding test for correct merge order for $uses.
...
Fixing incorrect merge ordering for $uses, so it matches historical behaviour.
Fixes #1309
2010-11-24 22:44:12 -05:00
mark_story
0e29567f8d
Adding an array cast to fix issues where users could modify cookie
...
values causing iteration errors. Fixes #1309
2010-11-24 22:09:08 -05:00
mark_story
d5fb0b25cb
Fixing issue where Date header would be missing from Emails sent by
...
EmailComponent.
Adding user configurable field for date.
Test cases added. Fixes #1304
2010-11-22 22:08:46 -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
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
ae7855692d
Removing unserialize() as its dangerous. Instead using | delimited fields for locked fields. This totally avoids issues with serialize(). Removing str_rot13, as its only child proof.
...
Tests updated.
2010-11-20 23:42:54 -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
