diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 3e4813f5..7e11cf02 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.13.48 +v8.13.49 diff --git a/src/carrier/data/en/372.php b/src/carrier/data/en/372.php index d5839b24..49c24a99 100644 --- a/src/carrier/data/en/372.php +++ b/src/carrier/data/en/372.php @@ -70,6 +70,7 @@ 3728285 => 'Tele 2', 3728286 => 'Tele 2', 3728287 => 'Tele 2', + 372829 => 'Tele 2', 37283 => 'Tele 2', 37284 => 'Tele 2', 37284510 => 'Telia Eesti AS', diff --git a/src/carrier/data/en/596.php b/src/carrier/data/en/596.php index d47d98de..5f44b4ca 100644 --- a/src/carrier/data/en/596.php +++ b/src/carrier/data/en/596.php @@ -45,5 +45,5 @@ 59669689 => 'SFR/Rife', 5966969 => 'Digicel', 59669699 => 'Orange', - 596697 => 'Digicel', + 59669727 => 'Digicel', ]; diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php index afefe80d..39bb9134 100644 --- a/src/carrier/data/en/65.php +++ b/src/carrier/data/en/65.php @@ -387,10 +387,10 @@ 658947 => 'Simba', 658948 => 'Simba', 658949 => 'M1', + 65895 => 'Simba', 658950 => 'M1', 658951 => 'M1', 658952 => 'M1', - 658953 => 'Simba', 65896 => 'Simba', 659001 => 'StarHub', 659002 => 'StarHub', diff --git a/src/carrier/data/en/992.php b/src/carrier/data/en/992.php index efe0fa3d..29def4dd 100644 --- a/src/carrier/data/en/992.php +++ b/src/carrier/data/en/992.php @@ -19,6 +19,7 @@ 99210 => 'O-Mobile', 99211 => 'Tcell', 99217 => 'Babilon-M', + 99218 => 'ZET-MOBILE', 9922 => 'O-Mobile', 99230 => 'O-Mobile', 992330 => 'ZET-MOBILE', diff --git a/src/data/PhoneNumberMetadata_CO.php b/src/data/PhoneNumberMetadata_CO.php index dd5b03bf..73b3c03a 100644 --- a/src/data/PhoneNumberMetadata_CO.php +++ b/src/data/PhoneNumberMetadata_CO.php @@ -8,22 +8,26 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '60\\d{8}|(?:1\\d|[39])\\d{9}', + 'NationalNumberPattern' => '(?:46|60\\d\\d)\\d{6}|(?:1\\d|[39])\\d{9}', 'PossibleLength' => [ + 8, 10, 11, ], 'PossibleLengthLocalOnly' => [ + 4, 7, ], ], 'fixedLine' => [ - 'NationalNumberPattern' => '601055(?:[0-4]\\d|50)\\d\\d|6010(?:[0-4]\\d|5[0-4])\\d{4}|60(?:[124-7][2-9]|8[1-9])\\d{6}', + 'NationalNumberPattern' => '601055(?:[0-4]\\d|50)\\d\\d|6010(?:[0-4]\\d|5[0-4])\\d{4}|(?:46|60(?:[124-7][2-9]|8[1-9]))\\d{6}', 'ExampleNumber' => '6012345678', 'PossibleLength' => [ + 8, 10, ], 'PossibleLengthLocalOnly' => [ + 4, 7, ], ], @@ -46,7 +50,10 @@ 'premiumRate' => [ 'NationalNumberPattern' => '(?:19(?:0[01]|4[78])|901)\\d{7}', 'ExampleNumber' => '19001234567', - 'PossibleLength' => [], + 'PossibleLength' => [ + 10, + 11, + ], 'PossibleLengthLocalOnly' => [], ], 'sharedCost' => [ @@ -98,6 +105,16 @@ 'nationalPrefixForParsing' => '0([3579]|4(?:[14]4|56))?', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => [ + [ + 'pattern' => '(\\d{4})(\\d{4})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => [ + '46', + ], + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ], [ 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', @@ -130,6 +147,16 @@ ], ], 'intlNumberFormat' => [ + [ + 'pattern' => '(\\d{4})(\\d{4})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => [ + '46', + ], + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ], [ 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', diff --git a/src/data/PhoneNumberMetadata_EE.php b/src/data/PhoneNumberMetadata_EE.php index b83eb4af..4a400d47 100644 --- a/src/data/PhoneNumberMetadata_EE.php +++ b/src/data/PhoneNumberMetadata_EE.php @@ -25,7 +25,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}', + 'NationalNumberPattern' => '(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[2-6]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-69]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}', 'ExampleNumber' => '51234567', 'PossibleLength' => [ 7, diff --git a/src/data/PhoneNumberMetadata_MG.php b/src/data/PhoneNumberMetadata_MG.php index 30f4ec97..340cf4e4 100644 --- a/src/data/PhoneNumberMetadata_MG.php +++ b/src/data/PhoneNumberMetadata_MG.php @@ -17,7 +17,7 @@ ], ], 'fixedLine' => [ - 'NationalNumberPattern' => '2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[356]|8[268]|9[245])\\d{5}', + 'NationalNumberPattern' => '2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[356]|8[268]|9[2457])\\d{5}', 'ExampleNumber' => '202123456', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [ diff --git a/src/data/PhoneNumberMetadata_MQ.php b/src/data/PhoneNumberMetadata_MQ.php index 18f39730..3cee6217 100644 --- a/src/data/PhoneNumberMetadata_MQ.php +++ b/src/data/PhoneNumberMetadata_MQ.php @@ -8,20 +8,20 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '596\\d{6}|(?:69|80|9\\d)\\d{7}', + 'NationalNumberPattern' => '596\\d{6}|(?:69|[89]\\d)\\d{7}', 'PossibleLength' => [ 9, ], 'PossibleLengthLocalOnly' => [], ], 'fixedLine' => [ - 'NationalNumberPattern' => '596(?:[03-7]\\d|1[05]|2[7-9]|8[0-39]|9[04-9])\\d{4}', + 'NationalNumberPattern' => '(?:596(?:[03-7]\\d|1[05]|2[7-9]|8[0-39]|9[04-9])|80[6-9]\\d\\d|9(?:477[6-9]|767[4589]))\\d{4}', 'ExampleNumber' => '596301234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '69(?:6(?:[0-46-9]\\d|5[0-6])|727)\\d{4}', + 'NationalNumberPattern' => '69[67]\\d{6}', 'ExampleNumber' => '696201234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], @@ -33,9 +33,9 @@ 'PossibleLengthLocalOnly' => [], ], 'premiumRate' => [ - 'PossibleLength' => [ - -1, - ], + 'NationalNumberPattern' => '8[129]\\d{7}', + 'ExampleNumber' => '810123456', + 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'sharedCost' => [ @@ -91,7 +91,7 @@ 'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => [ - '[569]', + '[569]|8(?:0[6-9]|[36])', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_MV.php b/src/data/PhoneNumberMetadata_MV.php index 94bc483c..d6ba357c 100644 --- a/src/data/PhoneNumberMetadata_MV.php +++ b/src/data/PhoneNumberMetadata_MV.php @@ -16,7 +16,7 @@ 'PossibleLengthLocalOnly' => [], ], 'fixedLine' => [ - 'NationalNumberPattern' => '(?:3(?:0[0-3]|3[0-59])|6(?:[58][024689]|6[024-68]|7[02468]))\\d{4}', + 'NationalNumberPattern' => '(?:3(?:0[0-4]|3[0-59])|6(?:[58][024689]|6[024-68]|7[02468]))\\d{4}', 'ExampleNumber' => '6701234', 'PossibleLength' => [ 7, diff --git a/src/data/PhoneNumberMetadata_PM.php b/src/data/PhoneNumberMetadata_PM.php index cb29370b..5ba7029b 100644 --- a/src/data/PhoneNumberMetadata_PM.php +++ b/src/data/PhoneNumberMetadata_PM.php @@ -8,7 +8,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '[45]\\d{5}|(?:708|80\\d)\\d{6}', + 'NationalNumberPattern' => '[45]\\d{5}|(?:708|8\\d\\d)\\d{6}', 'PossibleLength' => [ 6, 9, @@ -16,15 +16,13 @@ 'PossibleLengthLocalOnly' => [], ], 'fixedLine' => [ - 'NationalNumberPattern' => '(?:4[1-35-7]|5[01])\\d{4}', + 'NationalNumberPattern' => '(?:4[1-35-9]|5[0-47-9]|80[6-9]\\d\\d)\\d{4}', 'ExampleNumber' => '430123', - 'PossibleLength' => [ - 6, - ], + 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '(?:4[02-4]|5[056]|708[45][0-5])\\d{4}', + 'NationalNumberPattern' => '(?:4[02-489]|5[02-9]|708[45][0-5])\\d{4}', 'ExampleNumber' => '551234', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], @@ -38,8 +36,10 @@ 'PossibleLengthLocalOnly' => [], ], 'premiumRate' => [ + 'NationalNumberPattern' => '8[129]\\d{7}', + 'ExampleNumber' => '810123456', 'PossibleLength' => [ - -1, + 9, ], 'PossibleLengthLocalOnly' => [], ], diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index 8f47509b..40b8da20 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -25,7 +25,7 @@ 'PossibleLengthLocalOnly' => [], ], 'mobile' => [ - 'NationalNumberPattern' => '(?:8(?:0(?:[1-8]\\d|9[0-689])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-3]|6[0-2]))|9[0-8]\\d\\d)\\d{4}', + 'NationalNumberPattern' => '8(?:09[0-689]|96[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-5])|9[0-8]\\d)\\d{5}', 'ExampleNumber' => '81234567', 'PossibleLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index c86a7e66..5498eaaf 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -31,7 +31,7 @@ ], ], 'mobile' => [ - 'NationalNumberPattern' => '(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:[09]\\d|1[017]|2[02]|[34]0|5[05]|7[01578]|8[078])\\d{7}', + 'NationalNumberPattern' => '(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:[09]\\d|1[0178]|2[02]|[34]0|5[05]|7[01578]|8[078])\\d{7}', 'ExampleNumber' => '917123456', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], diff --git a/src/data/ShortNumberMetadata_MQ.php b/src/data/ShortNumberMetadata_MQ.php index 3b62a8b8..c73ebc1e 100644 --- a/src/data/ShortNumberMetadata_MQ.php +++ b/src/data/ShortNumberMetadata_MQ.php @@ -8,40 +8,53 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '1\\d\\d?', + 'NationalNumberPattern' => '[13]\\d(?:\\d(?:\\d(?:\\d{2})?)?)?', 'PossibleLength' => [ 2, 3, + 4, + 6, ], 'PossibleLengthLocalOnly' => [], ], 'tollFree' => [ - 'NationalNumberPattern' => '1(?:12|[578])', + 'NationalNumberPattern' => '1(?:12|[578])|3[01]\\d\\d', 'ExampleNumber' => '15', - 'PossibleLength' => [], + 'PossibleLength' => [ + 2, + 3, + 4, + ], 'PossibleLengthLocalOnly' => [], ], 'premiumRate' => [ + 'NationalNumberPattern' => '3[2469]\\d\\d', + 'ExampleNumber' => '3200', 'PossibleLength' => [ - -1, + 4, ], 'PossibleLengthLocalOnly' => [], ], 'emergency' => [ 'NationalNumberPattern' => '1(?:12|[578])', 'ExampleNumber' => '15', - 'PossibleLength' => [], + 'PossibleLength' => [ + 2, + 3, + ], 'PossibleLengthLocalOnly' => [], ], 'shortCode' => [ - 'NationalNumberPattern' => '1(?:12|[578])', + 'NationalNumberPattern' => '1(?:12|[578])|(?:118[02-9]|3[0-2469])\\d\\d', 'ExampleNumber' => '15', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'standardRate' => [ + 'NationalNumberPattern' => '118\\d{3}', + 'ExampleNumber' => '118000', 'PossibleLength' => [ - -1, + 6, ], 'PossibleLengthLocalOnly' => [], ], diff --git a/src/data/ShortNumberMetadata_PM.php b/src/data/ShortNumberMetadata_PM.php index 28fed54b..757bec7b 100644 --- a/src/data/ShortNumberMetadata_PM.php +++ b/src/data/ShortNumberMetadata_PM.php @@ -8,24 +8,28 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '[13]\\d(?:\\d{2})?', + 'NationalNumberPattern' => '[13]\\d(?:\\d\\d(?:\\d{2})?)?', 'PossibleLength' => [ 2, 4, + 6, ], 'PossibleLengthLocalOnly' => [], ], 'tollFree' => [ - 'NationalNumberPattern' => '1[578]', + 'NationalNumberPattern' => '1[578]|3(?:0\\d|1[689])\\d', 'ExampleNumber' => '15', 'PossibleLength' => [ 2, + 4, ], 'PossibleLengthLocalOnly' => [], ], 'premiumRate' => [ + 'NationalNumberPattern' => '3[2469]\\d\\d', + 'ExampleNumber' => '3200', 'PossibleLength' => [ - -1, + 4, ], 'PossibleLengthLocalOnly' => [], ], @@ -38,14 +42,16 @@ 'PossibleLengthLocalOnly' => [], ], 'shortCode' => [ - 'NationalNumberPattern' => '1[578]|3103', + 'NationalNumberPattern' => '1[578]|31(?:03|[689]\\d)|(?:118[02-9]|3[02469])\\d\\d', 'ExampleNumber' => '15', 'PossibleLength' => [], 'PossibleLengthLocalOnly' => [], ], 'standardRate' => [ + 'NationalNumberPattern' => '118\\d{3}', + 'ExampleNumber' => '118000', 'PossibleLength' => [ - -1, + 6, ], 'PossibleLengthLocalOnly' => [], ], diff --git a/src/geocoding/data/en/960.php b/src/geocoding/data/en/960.php index cc486239..e4c81797 100644 --- a/src/geocoding/data/en/960.php +++ b/src/geocoding/data/en/960.php @@ -15,6 +15,7 @@ 960301 => 'Malé/Hulhulé/Aarah', 960302 => 'Malé Region', 960303 => 'Malé Region', + 960304 => 'Malé Region', 960330 => 'Malé/Hulhulé/Aarah', 960331 => 'Malé/Hulhulé/Aarah', 960332 => 'Malé/Hulhulé/Aarah',