Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

correct and unify country codes for validation #1191

Merged
merged 2 commits into from Mar 24, 2013
Merged

correct and unify country codes for validation #1191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47f388a
correct and unify country codes for validation
Mar 23, 2013
f633e59
keep the deprecated three-letter-code
Mar 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/Cake/Utility/Validation.php
View file
Open in desktop
Expand Up @@ -617,8 +617,10 @@ public static function phone($check, $regex = null, $country = 'all') {
if (is_null($regex)) { if (is_null($regex)) {
switch ($country) { switch ($country) {
case 'us': case 'us':
case 'all': case 'ca':
// deprecated three-letter-code
case 'can': case 'can':
case 'all':
// includes all NANPA members. // includes all NANPA members.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original 3 letter version should be left behind so compatibility is maintained. However all the docs/examples should use the new form.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migration guide itself is not enough? Can be mark it as "deprecated" in the code somehow?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since it is just one line in a case statement, I don't know why we'd break things.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All right, I'll fix it up.

// see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories // see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories
$regex = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/'; $regex = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/';
Expand Down