Commit graph

405 commits

Author SHA1 Message Date
Mark Story
1ecc921e13 Merge pull request #1412 from wernerhp/master
Inflector pluralize and singularize update
2013-07-10 08:59:03 -07:00
Werner Pieterson
3d83c628eb Added more words to InflectorTest 2013-07-10 17:49:18 +02:00
Werner Pieterson
a27499d88a Updated Inflector's 'pluralize and singularize to correctly handle addisional words.
Updated InflectorTest to test new words.
2013-07-10 17:46:01 +02:00
euromark
af455b4121 correct return types in doc blocks 2013-07-05 17:19:22 +02:00
euromark
ba02678693 doc block corrections 2013-07-05 16:17:23 +02:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
euromark
4518624187 more whitespace coding standard corrections 2013-06-09 17:39:48 +02:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +02:00
Aymeric Derbois
0cfdb87cdf Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an array to XML object.
2013-06-09 00:52:06 +02:00
mark_story
e527eab5aa Add missing call to parent::setUp() 2013-06-08 09:47:46 -04:00
Mark Story
5cdd11cb38 Merge pull request #1336 from djbobke/caketimetest-locale
Fix locale for CakeTimeTest when configured different locale in app
2013-06-08 06:45:20 -07:00
Rik van der Heijden
0946a7799a Fix locale for CakeTimeTest when configured different locale in app 2013-06-08 10:25:28 +02:00
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29: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
Marc Würth
2bbd391972 Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
mark_story
7334643b55 Fix issues with getting Xml as SimpleXmlElement and invalid Xml.
Fixes #3855
2013-05-27 13:22:14 -04:00
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
Mark Story
94ff1b20e2 Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem
Fix bug in Xml::_toArray Method
2013-05-07 19:03:18 -07:00
Derbois Aymeric
ca6612bc8b Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an XML object to an array.
2013-05-08 00:56:17 +02:00
mark_story
2b0e10eebb Exclude domain names starting with -
Related to 479aefc438

Refs #3414
2013-04-29 21:31:30 -04:00
spiliot
dbe90cae71 removed duplicate test case
```$this->assertFalse(Validation::money('text'));```
is now tested only once
2013-04-29 00:20:35 +03:00
spiliot
2d7f6fc707 Added tests 2013-04-22 03:42:19 +03:00
ADmad
ba56fb7064 Fixed issue where incorrect cached filesize was reported when appending to file. 2013-04-13 19:45:20 +05:30
mark_story
8bd1980dd4 DateTime::getTimestamp() is PHP5.3+ 2013-04-11 13:39:05 -04:00
mark_story
0e646a2a4d Fix incorrect timestamp values when using fromString()
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.

Fixes #3743
2013-04-09 21:30:20 -04:00
euromark
3a1ff36d5e correct coding standards 2013-03-25 13:06:38 +01:00
mark_story
5d6a6fa203 Fix error when generating Xml.
Fix warnings/un-escaped entities with deeply nested elements.

Fixes #3718
2013-03-21 21:12:21 -04:00
mark_story
83de70efcf Tighten Canadian postal code validation.
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.

Fixes #3708
2013-03-17 18:14:56 -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
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') -> &#163;0.00
	Number::currency('0.00', 'GBP') -> 0p

Both versions will return `&#163;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