mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
Juan Basso
71df8dbbba
Replace function sizeof (alias) by count.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
mark_story
6b5c247162
Merge commit 'origin/1.2' into mergers
...
Conflicts:
cake/bootstrap.php
cake/console/cake.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
6db91b0f49
Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253
2009-11-07 17:43:18 -05:00
ceeram
dd0c4a64c5
Test to prove ticket #253
2009-11-07 11:02:43 -05:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
a3bb77c4f3
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/acl.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/model.php
cake/console/libs/templates/skel/views/layouts/xml/default.ctp
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/validation.php
cake/libs/view/helpers/form.php
cake/tests/cases/basics.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/cake_test_case.test.php
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/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/groups/controller.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
0e23fdfbb3
Fixing infinitely nesting stack frames when TreeBehavior::reorder() is called and the models $cacheQueries = true and there are a sizable number of records being manipulated.
...
Test cases added.
Fixes #188
2009-10-21 00:22:36 -04:00
mark_story
d5376e64aa
Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261
2009-09-19 01:17:20 -04:00
mark_story
5717e3b59c
Merge branch '1.2' into 1.2-merger
...
Conflicts:
app/webroot/test.php
cake/VERSION.txt
cake/bootstrap.php
cake/config/config.php
cake/console/cake.php
cake/console/libs/schema.php
cake/console/templates/skel/webroot/test.php
cake/libs/configure.php
cake/tests/cases/console/libs/schema.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
jperras
c48d9794f6
Fixing incorrect optional parameters passed to TreeBehavior::children() in TreeBehavior test case. Fixes errors & test failures when running under PHP 5.3.
2009-09-09 21:15:22 -04:00
mark_story
3dc12cb6da
Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases.
2009-08-31 23:40:47 -04:00
gwoo
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07:00
renan.saddam
76e50ef625
Adding support for Model.* syntax, which translates to a list of fields from Model.
...
Fixing buildColumn for null values.
Fixing small containable merge, it was duplicating values, tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8265 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 02:08:20 +00:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
f0752feeec
Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
...
Test cases and fixtures added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
mariano.iglesias
364fe18208
Adding test to disprove issue. Closes #4693
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8124 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-22 13:09:50 +00:00
davidpersson
3c3b852099
Changing package of tests from "cake.tests" to "cake".
...
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
mariano.iglesias
f1d25bcc20
Removing need to explicitly set IDs for Containable test, added in r6989
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8098 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-14 22:24:42 +00:00
nate
92cc331341
Updating docblocks and code formatting in XML classes, adding test change to previous commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8089 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 04:09:35 +00:00
renan.saddam
52f4cd42db
Fixing issue when Model::$translateTable is set
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8050 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-19 13:45:51 +00:00
renan.saddam
dcf1c1e154
Added tests to disprove TreeBehavior can generate warning. Closes #5975 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8007 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-21 01:17:51 +00:00
renan.saddam
157ee1efbf
Removing VALID_NUMBER and VALID_NOT_EMPTY from tests, applying patch from 'jperras'. Fixes #5901
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7999 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 01:55:31 +00:00
AD7six
b9ea171429
fixes #6003 tree behavior fails with uuids
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7997 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 00:50:01 +00:00
AD7six
5af1835722
adding tests for #6003
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7995 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:40:47 +00:00
AD7six
2391071597
cleaning up from last commit, removing commented calls to (now removed) setparent,
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7881 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 14:03:41 +00:00
AD7six
2f51ccca04
fixes #5772 .
...
Sql errors when using reserved words for a field name with the tree behavior.
Test Case restructured to allow thorough testing of the various permutations inwhich the tree behavior can be used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7880 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 13:57:44 +00:00
renan.saddam
400fadd091
Fixing TranslateBehavior bug when $query['recursive'] is set. Fixes #5593 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7869 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-12 19:45:30 +00:00
renan.saddam
f2823e85d7
Fluxing the objects after each test.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7822 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-04 01:35:09 +00:00
renan.saddam
171fa62b94
Added tests to cover bug with recursive = -1. Refs #5593 .
...
Did a refactoring to TranslateBehavior and moved all tests from translate.test.php to models.test.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7821 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-03 23:58:44 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
phpnut
a6f19c8240
Adding fix for Model::afterFind(); not having access to $this->data when using TreeBehavior
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7586 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 18:42:18 +00:00
nate
927950e81c
Adding TranslateBehavior tests to disprove #3805
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7551 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 02:04:44 +00:00
renan.saddam
f817cb9a07
Added more tests to resetBindings at ContainableBehavior. Closes #4988 , #4934 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7532 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-29 02:13:55 +00:00
AD7six
460223b61a
fixes #5203 - removeFromTree should return after deleting a node with no children.
...
Also modified removeFromTree to set the parent_id to null if removeFromTree is called on a node with no children and
delete is set to false
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7453 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 15:54:54 +00:00
gwoo
76f7d6dc43
making changes to all the model group to run. Currently I get 8/8 test cases complete: 1486 passes, 22 fails and 3 exceptions.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7439 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-07 15:36:26 +00:00
AD7six
99e3b11a61
correcting name variable of AclPerson model used in acl tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7438 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-06 14:13:01 +00:00
mark_story
f97a3f27b0
Quick update to AclBehavior test. Expanded coverage on deletion of dependant Nodes.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7392 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 03:35:26 +00:00
mark_story
3402f40061
Adding test case for AclBehavior. Modified AclBehavior to use $model->name for configuration and operation. Closes #5163
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7391 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 03:26:15 +00:00