Merge pull request cakephp#48 from cdburgess/phone-validation-update

According to NANPA, there are area codes and exchanges that are invalid ...

Author: predominant

Test/Case/Validation/UsValidationTest.php

@@ -43,8 +43,28 @@ public function testPhone() {
 		$this->assertFalse(UsValidation::phone('(055) 999-9999'));
 		$this->assertFalse(UsValidation::phone('(155) 999-9999'));
 		$this->assertFalse(UsValidation::phone('(595) 999-9999'));
-		$this->assertFalse(UsValidation::phone('(555) 099-9999'));
-		$this->assertFalse(UsValidation::phone('(555) 199-9999'));
+		$this->assertFalse(UsValidation::phone('(213) 099-9999'));
+		$this->assertFalse(UsValidation::phone('(213) 199-9999'));
+
+		// invalid area-codes
+		$this->assertFalse(UsValidation::phone('1-(511)-999-9999'));
+		$this->assertFalse(UsValidation::phone('1-(379)-999-9999'));
+		$this->assertFalse(UsValidation::phone('1-(962)-999-9999'));
+		$this->assertFalse(UsValidation::phone('1-(295)-999-9999'));
+		$this->assertFalse(UsValidation::phone('1-(555)-999-9999'));
+
+		// invalid exhange
+		$this->assertFalse(UsValidation::phone('1-(222)-511-9999'));
+
+		// invalid phone number
+		$this->assertFalse(UsValidation::phone('1-(222)-555-0199'));
+		$this->assertFalse(UsValidation::phone('1-(222)-555-0122'));
+
+		// valid phone numbers
+		$this->assertTrue(UsValidation::phone('1-(369)-333-4444'));
+		$this->assertTrue(UsValidation::phone('1-(973)-333-4444'));
+		$this->assertTrue(UsValidation::phone('1-(313)-555-9999'));
+		$this->assertTrue(UsValidation::phone('1-(222)-555-0299'));
 
 		$this->assertTrue(UsValidation::phone('1 (222) 333 4444'));
 		$this->assertTrue(UsValidation::phone('+1 (222) 333 4444'));

Validation/UsValidation.php

@@ -31,7 +31,13 @@ class UsValidation {
  * @return boolean
  */
 	public static function phone($check) {
-		$pattern = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/';
+		$pattern = '/^(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:\(\s*([2-9]1[02-9]|[2-9][02-8]1|3[02-689][0-9]|9[02-57-9][0-9]|[246-8][02-46-8][02-46-9])\s*\)';
+		$pattern .= '|(55[0-46-9]|5[0-46-9][5]|[0-46-9]55|[2-9]1[02-9]|[2-9][02-8]1|[2-46-9][02-46-8][02-46-9]))\s*(?:[.-]\s*)?)';
+		$pattern .= '(?!(555(?:\s*(?:[.|\-|\s]\s*))(01([0-9][0-9])|1212)))';
+		$pattern .= '(?!(555(01([0-9][0-9])|1212)))';
+		$pattern .= '([2-9]1[02-9]|[2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)';
+		$pattern .= '?([0-9]{4})';
+		$pattern .= '(?:\s*(?:#|x\.?|ext\.?|extension)\s*(\d+))?$/';
 		return (bool)preg_match($pattern, $check);
 	}