Merge pull request #158 from 2ndGAB/issue-154

Improve French phone number validation (#154)

Author: antograssiot

src/Validation/FrValidation.php

@@ -29,7 +29,7 @@ class FrValidation extends LocalizedValidation
      */
     public static function phone($check)
     {
-        $pattern = '/^0[1-9]{1}(([0-9]{8})|((\s[0-9]{2}){4})|((-[0-9]{2}){4})|((\.[0-9]{2}){4}))$/';
+        $pattern = '/(^0|\+33)(0?[1-9]{1}|\s0?[1-9]{1}|-0?[1-9]{1}|\.0?[1-9]{1})(([0-9]{8})|((\s[0-9]{2}){4})|((-[0-9]{2}){4})|((\.[0-9]{2}){4}))$|(^0(508|596|590|594|262))(([0-9]{6})|((\s[0-9]{2}){3})|((-[0-9]{2}){3})|((\.[0-9]{2}){3}))$|(^\+(?\'intl\'508|596|590|594|262))((\k\'intl\'[0-9]{6})|(\s\k\'intl\'(\s[0-9]{2}){3})|(-\k\'intl\'(-[0-9]{2}){3})|(\.\k\'intl\'(\.[0-9]{2}){3}))$/';
 
         return (bool)preg_match($pattern, $check);
     }

tests/TestCase/Validation/FrValidationTest.php

@@ -40,6 +40,45 @@ public function testPhone()
         $this->assertFalse(FrValidation::phone('04 76 96 12 33 '));
         $this->assertFalse(FrValidation::phone('047696123323'));
         $this->assertFalse(FrValidation::phone('07 43 90 33'));
+
+        /*
+         * Test cases for French metropolitan international number formats
+         */
+        $this->assertTrue(FrValidation::phone('+33476961232'));
+        $this->assertTrue(FrValidation::phone('+330476961232'));
+        $this->assertTrue(FrValidation::phone('+33 4 76 96 12 32'));
+        $this->assertTrue(FrValidation::phone('+33 04 76 96 12 32'));
+        $this->assertTrue(FrValidation::phone('+33-04-76-96-12-32'));
+        $this->assertTrue(FrValidation::phone('+33.04.76.96.12.32'));
+
+        $this->assertFalse(FrValidation::phone('+331476961232'));
+        $this->assertFalse(FrValidation::phone('+33.14.76.96.12.32'));
+        $this->assertFalse(FrValidation::phone('+33.04.76.96.12'));
+
+        /*
+         * Test cases for DOM/TOM national number formats
+         */
+        $this->assertTrue(FrValidation::phone('0590123456'));
+        $this->assertTrue(FrValidation::phone('0596 12 34 56'));
+        $this->assertTrue(FrValidation::phone('0594-12-34-56'));
+        $this->assertTrue(FrValidation::phone('0262.12.34.56'));
+        $this->assertTrue(FrValidation::phone('0508.12.34.56'));
+
+        $this->assertFalse(FrValidation::phone('0262.12.34.56.78'));
+        $this->assertFalse(FrValidation::phone('0262-12-34-5'));
+
+        /*
+         * Test cases for DOM/TOM international number formats
+         */
+        $this->assertTrue(FrValidation::phone('+590590123456'));
+        $this->assertTrue(FrValidation::phone('+596 596 12 34 56'));
+        $this->assertTrue(FrValidation::phone('+594-594-12-34-56'));
+        $this->assertTrue(FrValidation::phone('+262.262.12.34.56'));
+        $this->assertTrue(FrValidation::phone('+508.508.12.34.56'));
+
+        $this->assertFalse(FrValidation::phone('+590123456'));
+        $this->assertFalse(FrValidation::phone('+590 12 34 56'));
+        $this->assertFalse(FrValidation::phone('+596 594 12 34 56'));
     }
 
     /**