Merge branch 'hotfix/#6161-too-long-mobile-phone-numbers-fix' into de…

…velop Close #6161
zendframework · Jul 27, 2014 · db18d96 · db18d96
2 parents bf2d0d3 + bec09b5
commit db18d96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/I18n/Validator/PhoneNumber/FR.php b/library/Zend/I18n/Validator/PhoneNumber/FR.php
@@ -13,7 +13,7 @@
         'national' => array(
             'general' => '/^[124-9]\\d{8}|3\\d{3}(?:\\d{5})?$/',
             'fixed' => '/^[1-5]\\d{8}$/',
-            'mobile' => '/^[6-7]\\d{8}|7[5-9]\\d{7}$/',
+            'mobile' => '/^(?:[6-7]\\d{8}|7[5-9]\\d{7})$/',
             'tollfree' => '/^80\\d{7}$/',
             'premium' => '/^3\\d{3}|89[1-37-9]\\d{6}$/',
             'shared' => '/^8(?:1[019]|2[0156]|84|90)\\d{6}$/',

diff --git a/tests/ZendTest/I18n/Validator/PhoneNumberTest.php b/tests/ZendTest/I18n/Validator/PhoneNumberTest.php
@@ -932,7 +932,7 @@ class PhoneNumberTest extends \PHPUnit_Framework_TestCase
             'patterns' => array(
                 'example' => array(
                     'fixed' => '123456789',
-                    'mobile' => '612345678',
+                    'mobile' => array('612345678', '712345678',),
                     'tollfree' => '801234567',
                     'premium' => '891123456',
                     'shared' => '810123456',