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
euromark
959988cfa1
Remove last yoda conditions as per coding standards guidelines.
2013-09-06 18:36:57 +02:00
Schlaefer
82da8d9d07
performance improvements in CakeTime::timeAgoInWords Edit
...
- rearranges code to move return statements before otherwise dead code
- only do translation if translated string is actually used
2013-09-05 12:22:28 +02: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
José Lorenzo Rodríguez
fec646b69f
Merge pull request #1588 from kimegede/caketime-docblock-update
...
Added @link CakeTime.
2013-08-31 21:59:11 -07:00
Kim Egede Jakobsen
539040aa07
Added @link CakeTime.
2013-08-31 21:56:15 -07:00
Kim Egede Jakobsen
fcf9f34392
Added @link to CakeNumber's docblock
2013-08-31 17:32:48 -07:00
Kim Egede Jakobsen
46d3d8e48e
Added @link to all public functions there have documentation.
...
And correct a small 'typo'.
2013-08-31 17:12:29 -07:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02: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
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +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
97aaa89b3f
Refactored the fix
2013-08-15 17:13:31 +02:00
Floris
85313e84af
Minor Sanitize::escape() update
...
If the Datasource is not going to be used, do access it.
2013-08-15 12:15:09 +02: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
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
mark_story
1c1701813b
Fix failing test from merge with 2.3
...
Fix a failed test from bad merge and remove nested conditions.
2013-08-12 14:47:43 -04: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
Christian Winther
af1c2a1c51
Merge pull request #1511 from ankr/caketime_accuracy_about
...
Making CakeTime display 'about X ago' when time passed is lower than acc...
2013-08-12 09:23:46 -07: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
euromark
7c856e6ab7
missing whitespace
2013-08-12 16:00:24 +02:00
Marc Würth
7d4f229310
Fixed statement about Security:hash's salt parameter
...
Just nitpicking, but it prepends the salt, not appends it:
https://github.com/cakephp/cakephp/blob/master/lib/Cake/Utility/Security.php#L120
2013-08-12 12:52:34 +02:00
euromark
b09dc7213a
deprecate Controller::flash() and adjust some other deprecation messages.
2013-08-12 12:51:12 +02: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
ADmad
1d809e9807
Deprecated Sanitize class
2013-08-10 00:10:05 +05:30
euromark
1339a9dfe1
coding standards according to new sniffer rules
2013-08-08 01:03:21 +02:00
euromark
e1365336e2
avoid notice in mime()
2013-08-07 23:35:19 +02:00
Mark Story
dc15c78710
Merge pull request #1483 from tigrang/debugger-fix
...
Added case for `unknown` type.
Fixes #3966
2013-08-06 19:39:13 -07:00
Tigran Gabrielyan
2150e8dce5
Added case for unknown
type. Fixes #3966
2013-08-06 18:30:00 -07:00
Tigran Gabrielyan
84dcd30730
Loop instead of duplicate code
2013-08-06 15:50:58 -07:00
euromark
ad6fcd43d7
Fix currency output for fraction values using fractionExponent option.
2013-08-07 00:36:37 +02:00
mark_story
7b5122adb1
Fix pluralization of Objective.
...
Fixes #3921
2013-07-17 10:04:29 -04:00
euromark
304b54fe7d
wording
2013-07-16 15:18:14 +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
64ff9ad387
Fixed indenting
2013-07-10 17:51:42 +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
Charles Burgess
ec1e75fe53
I split out the regex to make it more readable as requested.
2013-07-10 08:28:42 -06: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
Marc Würth
d9882fcc08
Fixed three @param data types
2013-07-06 16:49:21 +02:00
euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
euromark
c989624f80
whitespace coding standards
2013-07-05 14:15:18 +02:00
mark_story
c597855fe4
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
euromark
f389435bae
coding standards and else block simplification
2013-07-03 19:27:17 +02:00
euromark
a90cb29c0f
simplify else cases
2013-07-03 01:14:41 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +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
f6aedea271
coding standards elseif
2013-06-09 17:12:46 +02:00
ADmad
636cc8c103
Merge branch 'master' into 2.4
2013-06-09 18:08:32 +05:30
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
e26a05ce04
Merge pull request #1235 from ADmad/2.3-caketime
...
Fix datetime comparison in relative datetime functions.
2013-06-05 06:12:50 -07:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
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
cce9e84907
Merge branch 'master' into 2.4
2013-05-28 22:40:32 -04:00
Ceeram
49aded5399
fix coding standard error
2013-05-28 18:39:38 +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
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
mark_story
b533c1b3ba
Make named capture groups compatible with older PCRE versions.
...
CentOS is terrible and generally contains very old versions of PCRE.
Update patterns to use more backwards compatible named capture groups.
Fixes #3821
2013-05-09 12:18:26 -04:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04: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
06e7ba66c9
Update docs for Security::cipher()
...
This method is not cryptographically strong. Note that, and the
issues related to suhosin.
Related to #GH-1100
2013-05-06 23:03:20 -04:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
mark_story
2b0e10eebb
Exclude domain names starting with -
...
Related to 479aefc438
Refs #3414
2013-04-29 21:31:30 -04:00
Mark Story
619f66178b
Merge pull request #1233 from spiliot/patch-1
...
Money validation should accept one decimal place.
2013-04-28 18:06:49 -07:00
ADmad
19f8274a95
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
euromark
dbc2a7a9e4
correct spelling mistake
2013-04-23 12:34:59 +02:00
Simon Males
880c70cc8c
No use of type key in ClassRegistry::init()
2013-04-22 13:55:28 +08:00
spiliot
2d7f6fc707
Added tests
2013-04-22 03:42:19 +03:00
ADmad
ae8386c48a
Fix datetime comparison in relative datetime functions.
...
Closes #2987,#3514
2013-04-20 13:10:06 +05:30
spiliot
50e3307f00
Money validation accepts one decimal place
2013-04-19 01:58:08 +03:00
mark_story
aee8b50507
Merge branch 'master' into 2.4
2013-04-15 21:48:26 -04:00
mark_story
8eb56960d8
Remove remaining reference operators.
...
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
mark_story
247d836174
Remove useless reference operator.
2013-04-14 21:29:04 -04:00
ADmad
79ad8ab95a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/File.php
2013-04-14 00:05:18 +05:30
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
dogmatic69
7b0e5d9375
Moved stat cache clearing into a method for consitent usage.
...
Fixes issue where incorrect cached filesize was reported when appending to file.
Thanks dogmatic69 for the patch.
2013-04-11 11:16:10 +05:30
mark_story
5c83bc177d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-04-09 22:09:56 -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
ADmad
d809b1480e
Fix CS errors
2013-04-01 02:16:52 +05:30
mark_story
d28c2f8e72
Fix code & tests for isPast() and isFuture()
...
The methods and tests now follow coding standards and work.
2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d
Adds two new time testing methods: 'isFuture' and 'isPast'
...
TestCases included
2013-03-30 22:24:08 -04:00
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
bcrowe
70d9ae9a03
Fix docblock typo of ObjectCollection class
2013-03-28 20:14:41 -04:00
ADmad
733116d15d
Avoid unnecessary calls to ConnectionManager::enumConnectionObjects() in ClassRegistry::init().
...
Closes #3724
2013-03-27 15:44:48 +05:30
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
euromark
f633e59091
keep the deprecated three-letter-code
2013-03-24 11:08:40 +01:00
euromark
47f388a4c0
correct and unify country codes for validation
2013-03-23 22:27:40 +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