mark_story
5aa8a458b1
Update UUID pattern to accept the 'nil' UUID.
...
Fixes #4133
2013-10-10 21:11:55 -04:00
euromark
7b57df5554
Correct method names and missing parent calls.
2013-10-07 20:24:28 +02:00
Renan Gonçalves
a73e926467
Make String::wrap() unicode aware. Solves #3981 .
2013-10-01 22:35:11 +02:00
Bryan Crowe
3e05ab897c
Missed a couple instanceOf asserations
2013-09-24 22:12:51 -04:00
Bryan Crowe
9a1170cd2b
Replaced true asserations with instanceOf asserations in test cases
2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18
Replaced all is_a() calls with instanceof operator
2013-09-24 21:08:06 -04:00
mark_story
a30f861f2c
Use array_key_exists instead of isset()
...
This allows contains() to work with null values.
Fixes #4083
2013-09-19 21:44:09 -04:00
euromark
17bd465cae
simplify tests
2013-09-19 00:17:21 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
7379d32b59
Simplify & fix phone number validation.
...
The changes made in fa3d4a0bb5
tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.
Fixes #4066
2013-09-13 23:05:40 -04:00
Rob McVey
7f44cc01b5
Plural of breif is breifs not breives
2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada
Reorder inflection rules.
...
Place rules for words like 'archives' and 'relatives' before words like
'knives'.
Fixes #4040
2013-09-03 12:50:02 -04:00
mark_story
b8320fdbb7
Load helpers at View construction.
...
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.
This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.
Refs #4030
2013-08-28 12:27:07 -04:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
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
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
ADmad
8428928fd6
Merge pull request #1528 from mvdriel/caketime-fix
...
Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
2013-08-15 10:55:03 -07:00
Mark van Driel
1595287290
Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system
2013-08-15 08:58:05 +02:00
Frank de Graaf
33f7de0072
Merge pull request #1520 from mvdriel/cakenumber-fix
...
Cakenumber fix
2013-08-14 13:41:53 -07:00
Mark van Driel
559fb5805b
Fix formatting with locales using , as decimal separator
...
No double number formatting for readable size
Fixed testPrecisionLocalized for travis (when locale is missing?)
Switched locale to nl_NL and fixed test
Skip test when locale is not available
2013-08-14 22:19:38 +02:00
Phally
6f74e1958b
Makes the locale test not always pass, be verbose when it is skipped.
2013-08-14 21:00:31 +02:00
mark_story
26769edd04
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
ankr
1cb41294b8
Making CakeTime display 'about X ago' when time passed is lower than accuracy
...
Removing unnecessary else
Also support 'about' times for future times
Make 'about' times translateable in all languages
2013-08-12 10:01:38 -04:00
José Lorenzo Rodríguez
789400ac44
Merge pull request #1409 from cdburgess/phone-validation-update
...
Phone validation update
2013-08-11 14:37:05 -07:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
euromark
e7e5f46916
prevent rtrim to remove whitespace from test
2013-08-08 01:14:31 +02:00
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
Tigran Gabrielyan
2150e8dce5
Added case for unknown
type. Fixes #3966
2013-08-06 18:30:00 -07:00
Mark Story
33af7e2e52
Merge pull request #1426 from dereuromark/2.4-currency-fraction
...
Fix currency output for fraction values.
Fixes #1329
2013-08-06 18:19:01 -07:00
euromark
ad6fcd43d7
Fix currency output for fraction values using fractionExponent option.
2013-08-07 00:36:37 +02:00
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
Marc Würth
1cac1846a3
Added missing calls to setUp & tearDown in tests
2013-07-29 01:52:39 +02:00
mark_story
7b5122adb1
Fix pluralization of Objective.
...
Fixes #3921
2013-07-17 10:04:29 -04:00
euromark
22d6625872
fix test
2013-07-17 12:18:06 +02:00
euromark
13ee5b7338
ability to provide custom strings for timeAgoInWords()
2013-07-16 15:16:30 +02:00
Christian Winther
532b2099e5
Merge pull request #1410 from Phally/2.x-3814
...
LH#3814 CakeNumber::toPercentage() should return percentage
2013-07-15 10:44:41 -07:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
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
Phally
e35bd80dfb
Adds option to multiply decimal percentages. Fixes #3814
2013-07-10 14:37:57 +02:00
Charles Burgess
fa3d4a0bb5
Updating the phone validation routine.
...
According to NANPA, there are area codes and exchanges that are invalid or reserved and not available for assignment. This would make those phone numbers invalid. For example:
- area-codes: 555, N11, N9X, 37X, 96X
- exchanges: N11
- numbers: 555-0100 thru 555-0199
You could also say 555-1212 is invalid as it is assigned as information for the US.
I changed the tests where 555 as an area code was being used as the assertion will give it a false on the area code and not the exchange as intended.
2013-07-09 09:54:18 -06:00
ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
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
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04: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