Phally
|
524aaf3449
|
Makes PHPCS pass again.
|
2013-08-18 16:12:23 +02:00 |
|
mark_story
|
a140b30435
|
Add a test for Hash::sort()
Closes #3956
|
2013-08-17 17:16:33 -04:00 |
|
euromark
|
6a14f37b74
|
a few more orders in test case corrected
|
2013-08-16 20:55:17 +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 |
|
mark_story
|
246c09ae40
|
Allow character classes in attribute patterns.
Fixes #3706
|
2013-03-14 12:55:03 -04: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 |
|
mark_story
|
4af6039107
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
|
2013-01-26 21:16:26 -05:00 |
|
Majna
|
5250c92635
|
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
|
2013-01-25 01:07:45 +01:00 |
|
mark_story
|
0cdef75060
|
Fix failing tests.
I have no idea why the updated session test was expected to fail as the
data was written to the session.
Refs #3551
|
2013-01-21 21:13:35 -05:00 |
|
mark_story
|
75495705a6
|
Fix Hash::get($data, '0')
Fixes #3555
|
2013-01-21 20:50:46 -05:00 |
|
mark_story
|
735517ade1
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/VERSION.txt
|
2013-01-08 22:27:17 -05:00 |
|
mark_story
|
e3692225ff
|
Fix lint errors.
|
2013-01-08 22:26:43 -05:00 |
|
mark_story
|
d0d13acaf4
|
Merge branch 'master' into 2.3
|
2013-01-08 20:15:46 -05:00 |
|
mark_story
|
c2e087dc9b
|
Add test for recursion issues in Hash::expand().
Refs #3080
|
2013-01-08 19:42:12 -05:00 |
|
dogmatic69
|
2266292594
|
fixing bug in Hash where array is not similar to the path required
|
2012-12-14 22:45:52 +00:00 |
|
dogmatic69
|
85de93a4a7
|
fixing issue where merge is renumbering array keys
|
2012-12-07 01:26:14 +00:00 |
|
mark_story
|
889c1ebc09
|
Fix sorting empty data with Hash & Set.
Fixes #3420
|
2012-11-30 13:05:14 -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 |
|
mark_story
|
01b3135a63
|
You should be able to regex match null/''
Fixes #2926
|
2012-05-30 21:28:18 -04:00 |
|
Jelle Henkens
|
97ebbc8e23
|
Fixing coding conventions
|
2012-05-19 16:08:40 +01:00 |
|
euromark
|
8a52a77cbc
|
correct argument order for phpunit asserts
|
2012-04-21 15:19:57 +02:00 |
|
euromark
|
bc2cd00123
|
cake 2.2 test case fixes (assert corrections, correct class names)
|
2012-04-21 15:02:35 +02:00 |
|
mark_story
|
a4f0399f74
|
Fix coding standards warnings.
|
2012-04-10 22:16:14 -04:00 |
|
mark_story
|
15c94dee4d
|
Fix whitespace and remove duplicate method calls.
|
2012-04-07 14:42:25 -04:00 |
|
Ceeram
|
7700a0261b
|
only use and test SORT_NATURAL on PHP 5.4
|
2012-04-04 18:21:52 +02:00 |
|
mark_story
|
e5ca80b711
|
Add additional sort flag support.
Add natural, numeric, and string sorting to Hash.
Fixes #1700
|
2012-04-01 23:09:15 -04:00 |
|
mark_story
|
a463033ee9
|
Set -> Hash
|
2012-03-31 08:49:04 -04:00 |
|
mark_story
|
95d4549c9b
|
Docs + coding standards.
|
2012-03-26 22:57:50 -04:00 |
|
mark_story
|
c087576f20
|
Port changes done to Set into Hash
See #2722
|
2012-03-26 22:39:13 -04:00 |
|
mark_story
|
66eabe462a
|
Copy Set::expand into Hash class.
|
2012-03-26 22:32:58 -04:00 |
|
mark_story
|
9015d78017
|
Port most recent changes in Set to Hash.
See [68eeee80d8 ] and
[af575027da ]
|
2012-03-26 22:32:56 -04:00 |
|
mark_story
|
0ef9adba93
|
Move and rename pushDiff onto Hash.
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
|
2012-03-26 22:32:54 -04:00 |
|
mark_story
|
8becc4c985
|
Fix misnamed method calls.
|
2012-03-26 22:25:40 -04:00 |
|
mark_story
|
2231087ba3
|
Rename Set2 -> Hash.
|
2012-03-26 22:25:40 -04:00 |
|