euromark
a6f065e7a2
coding standards whitespace and single quote
2013-06-09 17:20:08 +02:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
euromark
97c2cb367d
CS fixes
2013-05-17 10:36:17 +02:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
Jose Lorenzo Rodriguez
0f5fa290ed
Merge remote-tracking branch 'origin/master' into 2.3
2012-12-01 23:19:53 +01:00
mark_story
889c1ebc09
Fix sorting empty data with Hash & Set.
...
Fixes #3420
2012-11-30 13:05:14 -05:00
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
mark_story
6b4afb989e
Fix Set::merge() failing to merge correctly.
...
When merging 3 values, and the 2nd was empty, the resulting
merge was incorrect.
Fixes #3384
2012-11-19 14:03:03 -05:00
Ber Clausen
8b2b077119
Set::flatten() fails to generate keys when 'tip' value is an empty
...
array.
2012-11-02 19:23:55 -03:00
Ber Clausen
a7d9422c09
Test all empty array with assertSame() because assertEquals() does not check the type.
2012-10-26 19:21:51 -03:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700
Allow Set::extract() to match null.
...
Fixes #2926
2012-05-30 21:19:46 -04:00
mark_story
4b8c469004
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
mark_story
5270721ade
Remove bonus intval()
...
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.
Fixes #2897
2012-05-22 22:33:46 -04:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
mark_story
f677bfea7d
Remove duplicated test code.
2012-04-10 22:26:33 -04:00
mark_story
6b045318d8
Merge branch '2.1' into 2.2
2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82
Fix Set::insert() not overwriting values.
...
Set::insert() failed to overwrite values that were previously
defined as strings. Remove test in SessionComponentTest that was
ensuring this bug stuck around.
Fixes #2722
2012-03-26 21:50:53 -04:00
Ceeram
d748fc7451
Merge branch '2.1' into 2.2
2012-03-23 16:32:04 +01:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
mark_story
edd54e4ddf
Ignore the remaining errors.
...
They are just part of the test to compare objects + arrays.
No need to cause standards errors.
2012-03-19 21:38:51 -04:00
mark_story
67698248ca
Fix some coding standards errors.
2012-03-18 21:48:50 -04:00
Rachman Chavik
079ae8265c
Set::expand as implemented by jeremyharris
2012-03-15 20:07:49 +07:00
Rachman Chavik
beb0474d67
tests for regression in Set::sort(), re: #2673
2012-03-13 12:44:11 +07:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
Ceeram
68eeee80d8
Set::sort() now correctly sorts when using {s}.path, fixes #2673
2012-03-12 21:58:24 +01:00
AD7six
f1f1ce0db4
allow specifying an explicit root
2012-01-18 13:05:44 +01:00
AD7six
941d503726
documentation clarification
2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3
whitespace
2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51
add a test for what happens when you nest on a field that doesn't exist
2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603
add tests for set nest method
2012-01-10 10:18:59 +01:00
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
Kyle Robinson Young
d794084d38
More code standards formatting
2011-12-15 23:00:07 -08:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Kyle Robinson Young
98f03dc6df
Replacing test case compatibility functions
2011-11-16 21:07:08 -05:00
mark_story
9f80004920
Remove unused parameter.
2011-10-20 20:14:30 -04:00
mark_story
788d38ccef
Merge branch '1.3' into 1.3-merge
...
Conflicts:
cake/console/cake.php
cake/console/libs/shell.php
cake/tests/cases/console/libs/shell.test.php
2011-10-10 09:37:06 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/security.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
lib/Cake/Test/Case/Utility/SetTest.php
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
ADmad
b781762903
Fixing regression in Set::extract(). Refs #1895 , #1816 , #1692 .
2011-08-14 03:11:55 +05:30
Jose Lorenzo Rodriguez
1726bad396
Adding ability to Set class to iterate on ArrayObjects, or any object implementing ArrayAccess and Traversable
2011-08-11 13:26:06 -04:30
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
