Commit graph

179 commits

Author SHA1 Message Date
Mark Story
6b2154d961 Merge branch '1.2' into mergers
Conflicts:
	cake/libs/inflector.php
	cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
real34
bdfb50e6bb Fixed a bug in Set::extract. Wrong key returned when two arrays are at the extraction level.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-16 18:33:23 -05:00
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
mark_story
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -05:00
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05: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
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
2d2e692b37 Updating doc blocks to improve API parsing. 2009-10-05 21:27:34 -04:00
jperras
a06147272d Removing inheritance of Object in Set, String and in Validation. 2009-09-30 00:04:58 -04:00
jperras
9a2cd886fe Fixing call-time pass by reference. 2009-09-26 17:08:01 -04:00
jperras
03b1089f1d Updating docs for Set library. Deprecating Set::isEqual(). 2009-09-25 15:05:06 -04:00
jperras
f231b59cfb Clarifying some Set documentation. Removing deprecated &get() method. 2009-09-25 14:31:05 -04:00
jperras
b2eb1882a4 Adding convenience method Set::apply(). 2009-09-23 21:03:09 -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
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
mark_story
4f4411126c Fixing empty arrays being dropped with Set::sort(). Fixed #67 2009-09-03 23:09:27 -04:00
mark_story
fb476f17cc Fixing Set::extract run against hasMany records that are the result of a find('first'). Test case added. 2009-09-01 13:18:20 -04:00
mark_story
47d9181313 Adding test case from 'mradosta'.
Fixing issue with non-zero indexed arrays and Set::extract()
Fixes #6
2009-08-21 23:18:27 -04:00
AD7six
a4bc755cc7 whitespace normalization 2009-08-02 16:10:24 -07:00
gwoo
15ed658a27 Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
AD7six
fd0aaefb39 whitespace normalization 2009-07-26 12:46:07 +02:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
c30dd48e2a Updating doc block for Set::combine first parameter - may accept an object as first param, in addition to arrays.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8210 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 22:25:22 +00:00
gwoo
056402efa7 moving checks for Set::extract() so that null will be returned when empty data is passed and classicExtract is expected.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8105 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-15 19:39:35 +00:00
gwoo
198548092b cleaning up some Set::extract, adding tests for empty data and results. Removing some checks from Cache engine.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8097 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-14 19:56:28 +00:00
the_undefined
55e72bb749 Better support for regex matching, fixes #6184
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8086 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-10 20:20:32 +00:00
jperras
f20ccc745c Applying patch from 'phally' to update Set::extract to properly tokenize xpath selectors which contain hyphens (-). Fixes #6140
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8059 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 16:23:13 +00:00
mark_story
082ef2e4b0 Adding patch from 'mattcurry' Fixes Set::extract and parent selectors that with more than one element in the source array. Fixes #6043
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8055 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-24 03:01:06 +00:00
mark_story
27c321190e Applying patch from 'mcurry' Fixes Set::extract with mixed numeric and stringKeys. Tests added. Fixes #6072
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8038 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-17 04:41:30 +00:00
mark_story
628a79aba6 Making direction flag in Set::sort() case insensitive. Test updated. Fixes #5992
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7977 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 04:06:01 +00:00
gwoo
4dbd8e6791 updating to Set::extract() to fix containable test fails, added set cases to match usage in containable.test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7934 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 21:33:11 +00:00
nate
8eade1adb3 Fixing code formatting to wrap at 100 characters, adding fix for ticket #5596, counterCache now decrements properly when foreign key value changes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7927 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 04:13:45 +00:00
gwoo
9d2f59529c fixes #5684, Set::extract() without index 0
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7895 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-26 22:33:21 +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
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
renan.saddam
42241b2b27 Removing if block missed from an older refactoring.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7719 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-09 17:16:39 +00:00
the_undefined
aab1e506a1 Fixes #5225
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7674 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-28 17:41:23 +00:00
john
6ad3cfa0ef Enhancing Set::map() so that it doesn't override manual setting of _name_. Test case enhanced to make sure it does so.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7669 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 21:11:51 +00:00
gwoo
e6b994bcb1 updating handling of required classes, fixes #5480
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7666 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 14:03:16 +00:00
mark_story
62168bfe0f Updating doc blocks to include access and return PHPDOC tags.
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00