diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 04cda27b..e5da3f00 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -2,4 +2,4 @@ # It can be a commit, branch or tag of the https://github.com/google/libphonenumber project # # For more information, look at the phing tasks in build.xml -v8.12.25 +v8.12.26 diff --git a/src/AlternateFormatsCountryCodeSet.php b/src/AlternateFormatsCountryCodeSet.php index 1214de03..8727e390 100644 --- a/src/AlternateFormatsCountryCodeSet.php +++ b/src/AlternateFormatsCountryCodeSet.php @@ -33,37 +33,36 @@ class AlternateFormatsCountryCodeSet { 13 => 58, 14 => 61, 15 => 62, - 16 => 63, - 17 => 64, - 18 => 66, - 19 => 81, - 20 => 84, - 21 => 90, - 22 => 91, - 23 => 94, - 24 => 95, - 25 => 255, - 26 => 350, - 27 => 351, - 28 => 352, - 29 => 358, - 30 => 359, - 31 => 372, - 32 => 373, - 33 => 380, - 34 => 381, - 35 => 385, - 36 => 505, - 37 => 506, - 38 => 595, - 39 => 675, - 40 => 676, - 41 => 679, - 42 => 855, - 43 => 856, - 44 => 971, - 45 => 972, - 46 => 995, + 16 => 64, + 17 => 66, + 18 => 81, + 19 => 84, + 20 => 90, + 21 => 91, + 22 => 94, + 23 => 95, + 24 => 255, + 25 => 350, + 26 => 351, + 27 => 352, + 28 => 358, + 29 => 359, + 30 => 372, + 31 => 373, + 32 => 380, + 33 => 381, + 34 => 385, + 35 => 505, + 36 => 506, + 37 => 595, + 38 => 675, + 39 => 676, + 40 => 679, + 41 => 855, + 42 => 856, + 43 => 971, + 44 => 972, + 45 => 995, ); } diff --git a/src/data/PhoneNumberAlternateFormats_63.php b/src/data/PhoneNumberAlternateFormats_63.php deleted file mode 100644 index 0d711402..00000000 --- a/src/data/PhoneNumberAlternateFormats_63.php +++ /dev/null @@ -1,40 +0,0 @@ - '', - 'countryCode' => 63, - 'internationalPrefix' => '', - 'sameMobileAndFixedLinePattern' => false, - 'numberFormat' => - array ( - 0 => - array ( - 'pattern' => '(\\d{4})(\\d{4})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '2', - ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - ), - 'intlNumberFormat' => - array ( - ), - 'mainCountryForCode' => false, - 'leadingZeroPossible' => false, - 'mobileNumberPortableRegion' => false, -); diff --git a/src/data/PhoneNumberMetadata_DZ.php b/src/data/PhoneNumberMetadata_DZ.php index b24df230..3285f656 100644 --- a/src/data/PhoneNumberMetadata_DZ.php +++ b/src/data/PhoneNumberMetadata_DZ.php @@ -37,7 +37,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:5(?:4[0-29]|5\\d|6[01])|6(?:[569]\\d|7[0-6])|7[7-9]\\d)\\d{6}', + 'NationalNumberPattern' => '(?:5(?:4[0-29]|5\\d|6[0-2])|6(?:[569]\\d|7[0-6])|7[7-9]\\d)\\d{6}', 'ExampleNumber' => '551234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php index d9244e35..ee62644a 100644 --- a/src/data/PhoneNumberMetadata_EH.php +++ b/src/data/PhoneNumberMetadata_EH.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:0\\d|10|6[1267]|7[0-57]))\\d{6}', + 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:0\\d|1[0-2]|6[1267]|7[0-57]))\\d{6}', 'ExampleNumber' => '650123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GB.php b/src/data/PhoneNumberMetadata_GB.php index d785ce69..677937bf 100644 --- a/src/data/PhoneNumberMetadata_GB.php +++ b/src/data/PhoneNumberMetadata_GB.php @@ -31,7 +31,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[03])|4(?:[0-5]\\d\\d|69[7-9]|70[059])|(?:5[0-26-9]|6[0-4]|[78][0-49])\\d\\d)|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:[02]\\d|1[278])))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}', + 'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[023])|4(?:[0-5]\\d\\d|69[7-9]|70[059])|(?:5[0-26-9]|[78][0-49])\\d\\d|6(?:[0-4]\\d\\d|50[259]))|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:[02]\\d|1[278])))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}', 'ExampleNumber' => '1212345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php index 3a6fce63..9ce4af35 100644 --- a/src/data/PhoneNumberMetadata_MA.php +++ b/src/data/PhoneNumberMetadata_MA.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '5(?:29(?:[189][05]|2[29]|3[01])|38[89][05])\\d{4}|5(?:2(?:[015-7]\\d|2[02-9]|3[0-578]|4[02-46-8]|8[0235-7]|90)|3(?:[0-47]\\d|5[02-9]|6[02-8]|80|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}', + 'NationalNumberPattern' => '5(?:29(?:[189][05]|2[29]|3[01])|38[89][05])\\d{4}|5(?:2(?:[0-25-7]\\d|3[1-578]|4[02-46-8]|8[0235-7]|90)|3(?:[0-47]\\d|5[02-9]|6[02-8]|80|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}', 'ExampleNumber' => '520123456', 'PossibleLength' => array ( @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:0\\d|10|6[1267]|7[0-57]))\\d{6}', + 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:0\\d|1[0-2]|6[1267]|7[0-57]))\\d{6}', 'ExampleNumber' => '650123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_PH.php b/src/data/PhoneNumberMetadata_PH.php index c6fbcd2f..8fcfc7a2 100644 --- a/src/data/PhoneNumberMetadata_PH.php +++ b/src/data/PhoneNumberMetadata_PH.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '1800\\d{7,9}|(?:2|[89]\\d{4})\\d{5}|[2-8]\\d{8}|[28]\\d{7}', + 'NationalNumberPattern' => '(?:[2-7]|9\\d)\\d{8}|2\\d{5}|(?:1800|8)\\d{7,9}', 'PossibleLength' => array ( 0 => 6, @@ -34,8 +34,8 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:(?:2[3-8]|3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578])\\d{3}|88(?:22\\d\\d|42))\\d{4}|2\\d{5}(?:\\d{2})?|8[2-8]\\d{7}', - 'ExampleNumber' => '21234567', + 'NationalNumberPattern' => '(?:(?:2[3-8]|3[2-68]|4[2-9]|5[2-6]|6[2-58]|7[24578])\\d{3}|88(?:22\\d\\d|42))\\d{4}|(?:2|8[2-8]\\d\\d)\\d{5}', + 'ExampleNumber' => '232345678', 'PossibleLength' => array ( 0 => 6, @@ -177,18 +177,6 @@ 'nationalPrefixOptionalWhenFormatting' => false, ), 1 => - array ( - 'pattern' => '(\\d)(\\d{3})(\\d{4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '2', - ), - 'nationalPrefixFormattingRule' => '(0$1)', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 2 => array ( 'pattern' => '(\\d{4})(\\d{4,6})', 'format' => '$1 $2', @@ -201,7 +189,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 2 => array ( 'pattern' => '(\\d{5})(\\d{4})', 'format' => '$1 $2', @@ -214,7 +202,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 4 => + 3 => array ( 'pattern' => '(\\d)(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', @@ -226,7 +214,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 5 => + 4 => array ( 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -238,7 +226,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 6 => + 5 => array ( 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -250,7 +238,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 7 => + 6 => array ( 'pattern' => '(\\d{4})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -262,7 +250,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 8 => + 7 => array ( 'pattern' => '(\\d{4})(\\d{1,2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3 $4', diff --git a/src/data/PhoneNumberMetadata_QA.php b/src/data/PhoneNumberMetadata_QA.php index da91202b..bec32fea 100644 --- a/src/data/PhoneNumberMetadata_QA.php +++ b/src/data/PhoneNumberMetadata_QA.php @@ -26,7 +26,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:23|4[04])\\d{6}', + 'NationalNumberPattern' => '4141\\d{4}|(?:23|4[04])\\d{6}', 'ExampleNumber' => '44123456', 'PossibleLength' => array ( diff --git a/src/geocoding/data/en/212.php b/src/geocoding/data/en/212.php index 60b7565e..55852dcb 100644 --- a/src/geocoding/data/en/212.php +++ b/src/geocoding/data/en/212.php @@ -13,7 +13,15 @@ return array ( 212520 => 'Casablanca', 212521 => 'Casablanca/Central Morocco', - 212522 => 'Casablanca', + 2125220 => 'Casablanca', + 2125222 => 'Casablanca', + 2125223 => 'Casablanca', + 2125224 => 'Casablanca', + 2125225 => 'Casablanca', + 2125226 => 'Casablanca', + 2125227 => 'Casablanca', + 2125228 => 'Casablanca', + 2125229 => 'Casablanca', 2125232 => 'Mohammedia', 2125233 => 'El Jedida/Mohammedia', 2125234 => 'Settai',