Skip to content
Permalink
Browse files

Making built-in Canadian postal code validation accept postal codes w…

…ith no spaces. Fixes #289
  • Loading branch information...
markstory committed Feb 6, 2010
1 parent 2c1e6de commit 104da15a737a13283f827d049beb1d0bea5344d5
Showing with 2 additions and 1 deletion.
  1. +1 −1 cake/libs/validation.php
  2. +1 −0 cake/tests/cases/libs/validation.test.php
@@ -713,7 +713,7 @@ function postal($check, $regex = null, $country = null) {
$_this->regex = '/\\A\\b[A-Z]{1,2}[0-9][A-Z0-9]? [0-9][ABD-HJLNP-UW-Z]{2}\\b\\z/i';
break;
case 'ca':
$_this->regex = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] [0-9][A-Z][0-9]\\b\\z/i';
$_this->regex = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] ?[0-9][A-Z][0-9]\\b\\z/i';
break;
case 'it':
case 'de':
@@ -1928,6 +1928,7 @@ function testPostal() {
$this->assertFalse(Validation::postal('B2A 2AB', null, 'ca'));
$this->assertTrue(Validation::postal('X0A 0A2', null, 'ca'));
$this->assertTrue(Validation::postal('G4V 4C3', null, 'ca'));
$this->assertTrue(Validation::postal('L4J8D6', null, 'ca'));
$this->assertFalse(Validation::postal('111', null, 'us'));
$this->assertFalse(Validation::postal('1111', null, 'us'));

0 comments on commit 104da15

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.