mark_story
e97b3acebb
Merge branch 'master' into 2.4
2013-03-14 20:54:42 -04:00
mark_story
246c09ae40
Allow character classes in attribute patterns.
...
Fixes #3706
2013-03-14 12:55:03 -04:00
Yuya Takeyama
14c81fe052
Fix alphaNumeric validation
2013-03-14 20:10:17 +09:00
Ceeram
f6477d58df
change formatOutput option name to pretty
2013-03-13 15:44:59 +01:00
Ceeram
fc34d9fe7f
Add formatoutput option to Xml::fromArray
2013-03-13 13:07:36 +01:00
euromark
f633241775
fix spacing error
2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6
fix coding standards
2013-03-10 18:11:50 +01:00
euromark
eb874f87a3
Top 6 world currencies and make them utf8 per default
2013-03-06 23:35:18 +01:00
mark_story
00edc594bf
Fix failing test.
2013-02-28 21:31:09 -05:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
Marc Würth
33fbace4c7
Added 'ym'- & 'y'-date validation
...
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
2013-02-15 14:35:20 +01:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
mark_story
974ac44fb4
Use random iv values in rijndael.
...
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
2013-02-09 20:48:27 -05:00
ADmad
431e610317
Fix broken tests
2013-02-08 19:04:41 +05:30
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
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +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
ad0d6644c4
Partially revert default niceShortFormat
...
In 9fa531d6e3
the default niceShortFormat
was changed, which has been interpreted as a regression in #3533 .
This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.
Refs #3533
2013-01-14 21:12:11 -05:00
dogmatic69
bcb3eb89dc
Before this change 0.00 and '0.00' are treated differently. Floats from the database are returned as the string
...
version while doing calculations will normally end up as floats.
This causes output differences on pages like order totals or invoices where there is a mix of calculated values
and database values.
Number::currency(0.00, 'GBP') -> £0.00
Number::currency('0.00', 'GBP') -> 0p
Both versions will return `£0.00` (or whatever 0 is configured to return).
2013-01-11 17:00:06 +00:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Ceeram
92d9b11aee
fix double semicolon
2013-01-11 11:15:15 +01:00
mark_story
7008b812be
Fix string '0' not being exported correctly.
...
Fixes #3518
2013-01-09 23:04:58 -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
José Lorenzo Rodríguez
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
...
2.3 unify object collection
2012-12-22 14:24:26 -08:00
ADmad
a340c19c08
Added support for php.ini style values
2012-12-23 02:25:59 +05:30
dogmatic69
2266292594
fixing bug in Hash where array is not similar to the path required
2012-12-14 22:45:52 +00:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
mark_story
1e49be3472
Fix stack traces not being highlighted correctly.
...
Fixes #3439
2012-12-08 20:48:45 -05:00
dogmatic69
85de93a4a7
fixing issue where merge is renumbering array keys
2012-12-07 01:26:14 +00:00
Jose Lorenzo Rodriguez
0f5fa290ed
Merge remote-tracking branch 'origin/master' into 2.3
2012-12-01 23:19:53 +01:00
mark_story
479aefc438
Update TLD validation to accept gTLD variations
...
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.
Fixes #3414
2012-11-30 22:11:57 -05: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
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
mark_story
fb275c5fa2
Fix warnings from file_get_contents() in Xml::build()
...
Use HttpSocket to get proper exceptions when trying to load XML from
remote servers.
Fixes #3379
2012-11-19 14:46:45 -05: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
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
mark_story
d95ef5d5e8
Fix failing tests.
2012-11-11 21:57:52 -05:00
mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
mark_story
8b7b139353
Fix failing tests using chr(226) instead of unicode codes.
2012-11-09 22:32:29 -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
Ceeram
0196c6f686
code optimizing and simplify _crypt(), see PR #853
2012-11-01 14:15:52 +01:00
mark_story
478461d301
Merge branch 'master' into 2.3
2012-10-28 21:42:48 -04:00