diff --git a/Tests/libphonenumber/Tests/Issues/LocaleTest.php b/Tests/libphonenumber/Tests/Issues/LocaleTest.php index 9ada2c835..ce766ba7d 100644 --- a/Tests/libphonenumber/Tests/Issues/LocaleTest.php +++ b/Tests/libphonenumber/Tests/Issues/LocaleTest.php @@ -172,7 +172,6 @@ private function getCountryCodes() 'GW' => 'Guinea-Bissau', 'GY' => 'Guyana', 'HT' => 'Haiti', - 'VA' => 'Vatican City', 'HN' => 'Honduras', 'HK' => 'Hong Kong SAR China', 'HU' => 'Hungary', diff --git a/src/libphonenumber/CountryCodeToRegionCodeMap.php b/src/libphonenumber/CountryCodeToRegionCodeMap.php index a23620d80..552839278 100644 --- a/src/libphonenumber/CountryCodeToRegionCodeMap.php +++ b/src/libphonenumber/CountryCodeToRegionCodeMap.php @@ -82,6 +82,7 @@ class CountryCodeToRegionCodeMap { 39 => array ( 0 => 'IT', + 1 => 'VA', ), 40 => array ( @@ -545,10 +546,6 @@ class CountryCodeToRegionCodeMap { array ( 0 => 'SM', ), - 379 => - array ( - 0 => 'VA', - ), 380 => array ( 0 => 'UA', diff --git a/src/libphonenumber/carrier/data/en/212.php b/src/libphonenumber/carrier/data/en/212.php index 15b08b517..790228288 100644 --- a/src/libphonenumber/carrier/data/en/212.php +++ b/src/libphonenumber/carrier/data/en/212.php @@ -86,6 +86,7 @@ 212679 => 'Méditel', 212680 => 'Inwi', 212681 => 'Inwi', + 212687 => 'Inwi', 212690 => 'Inwi', 212691 => 'Inwi', 212692 => 'GlobalStar', diff --git a/src/libphonenumber/carrier/data/en/232.php b/src/libphonenumber/carrier/data/en/232.php index af841a538..3c760890c 100644 --- a/src/libphonenumber/carrier/data/en/232.php +++ b/src/libphonenumber/carrier/data/en/232.php @@ -10,10 +10,12 @@ 23230 => 'Africell', 23233 => 'Comium', 23234 => 'Comium', + 23235 => 'IPTEL', 23240 => 'Datatel/Cellcom', 23244 => 'Intergroup', 23250 => 'Datatel/Cellcom', - 23255 => 'Ambitel', + 23255 => 'AFCOM', + 23266 => 'Onlime', 23276 => 'Airtel', 23277 => 'Africell', 23278 => 'Airtel', diff --git a/src/libphonenumber/carrier/data/en/267.php b/src/libphonenumber/carrier/data/en/267.php index c3a247e7c..31b27a6be 100644 --- a/src/libphonenumber/carrier/data/en/267.php +++ b/src/libphonenumber/carrier/data/en/267.php @@ -16,6 +16,8 @@ 267745 => 'Mascom', 267746 => 'Mascom', 267747 => 'Mascom', + 267748 => 'Orange', + 267749 => 'BTC Mobile', 267750 => 'Orange', 267751 => 'Orange', 267752 => 'Orange', @@ -42,4 +44,5 @@ 267775 => 'Orange', 267776 => 'Mascom', 267777 => 'Mascom', + 267778 => 'Mascom', ); diff --git a/src/libphonenumber/carrier/data/en/380.php b/src/libphonenumber/carrier/data/en/380.php index 56f99b7ca..70a092f93 100644 --- a/src/libphonenumber/carrier/data/en/380.php +++ b/src/libphonenumber/carrier/data/en/380.php @@ -5,5 +5,16 @@ */ return array ( - 38094 => 'IT', + 38050 => 'MTS', + 38063 => 'Life', + 38066 => 'MTS', + 38067 => 'Kyivstar', + 38068 => 'Kyivstar', + 38073 => 'Life', + 38092 => 'PEOPLEnet', + 38093 => 'Life', + 38096 => 'Kyivstar', + 38097 => 'Kyivstar', + 38098 => 'Kyivstar', + 38099 => 'MTS', ); diff --git a/src/libphonenumber/carrier/data/en/385.php b/src/libphonenumber/carrier/data/en/385.php index 26624a0b8..116f7c611 100644 --- a/src/libphonenumber/carrier/data/en/385.php +++ b/src/libphonenumber/carrier/data/en/385.php @@ -8,6 +8,9 @@ 38591 => 'Vip', 38592 => 'Vip', 38595 => 'Tele2', + 385976 => 'Bonbon', + 385977 => 'Bonbon', + 385979 => 'MultiPlus', 38598 => 'T-Mobile', 38599 => 'T-Mobile', ); diff --git a/src/libphonenumber/carrier/data/en/49.php b/src/libphonenumber/carrier/data/en/49.php index d1b2e13b9..b1edbb553 100644 --- a/src/libphonenumber/carrier/data/en/49.php +++ b/src/libphonenumber/carrier/data/en/49.php @@ -5,6 +5,9 @@ */ return array ( + 491502 => 'Interactive digital media', + 491505 => 'NAKA AG', + 491508 => 'Easy World', 49151 => 'T-Mobile', 491520 => 'Vodafone', 491521 => 'Vodafone/Lycamobile', @@ -12,12 +15,15 @@ 491523 => 'Vodafone', 491525 => 'Vodafone', 491529 => 'Vodafone/Truphone', + 491555 => 'Tismi BV', + 491567 => 'Argon Networks', 491570 => 'Eplus/Telogic', 491573 => 'Eplus', 491575 => 'Eplus', 491577 => 'Eplus', 491578 => 'Eplus', 491579 => 'Eplus/Sipgate', + 491588 => 'TelcoVillage', 491590 => 'O2', 49160 => 'T-Mobile', 49162 => 'Vodafone', diff --git a/src/libphonenumber/carrier/data/en/962.php b/src/libphonenumber/carrier/data/en/962.php index 7f6fc9740..19abc6a2f 100644 --- a/src/libphonenumber/carrier/data/en/962.php +++ b/src/libphonenumber/carrier/data/en/962.php @@ -5,7 +5,8 @@ */ return array ( - 96274 => 'XPress JO', + 96274 => 'Mirsal', + 96275 => 'Friendi', 96277 => 'Orange', 96278 => 'Umniah', 96279 => 'Zain JO', diff --git a/src/libphonenumber/carrier/data/en/972.php b/src/libphonenumber/carrier/data/en/972.php index 8d6ca2de6..9bb661b50 100644 --- a/src/libphonenumber/carrier/data/en/972.php +++ b/src/libphonenumber/carrier/data/en/972.php @@ -19,6 +19,7 @@ 9725587 => 'Alon', 9725588 => 'Alon', 9725589 => 'Alon', + 9725596 => 'Azi Communications', 9725597 => 'Azi Communications', 9725598 => 'Azi Communications', 9725599 => 'Azi Communications', diff --git a/src/libphonenumber/carrier/data/en/977.php b/src/libphonenumber/carrier/data/en/977.php index 09535127e..2c70d7ceb 100644 --- a/src/libphonenumber/carrier/data/en/977.php +++ b/src/libphonenumber/carrier/data/en/977.php @@ -13,6 +13,7 @@ 977975 => 'NDCL', 977980 => 'NCell', 977981 => 'NCell', + 977982 => 'NCell', 977984 => 'Nepal Telecom', 977985 => 'Nepal Telecom', 977986 => 'Nepal Telecom', diff --git a/src/libphonenumber/carrier/data/en/993.php b/src/libphonenumber/carrier/data/en/993.php index a08a0d6aa..0132460a3 100644 --- a/src/libphonenumber/carrier/data/en/993.php +++ b/src/libphonenumber/carrier/data/en/993.php @@ -8,4 +8,5 @@ 99365 => 'TM-Cell', 99366 => 'MTS (BARASH Communication)', 99367 => 'MTS (BARASH Communication)', + 99369 => 'MTS (BARASH Communication)', ); diff --git a/src/libphonenumber/data/PhoneNumberMetadata_AC.php b/src/libphonenumber/data/PhoneNumberMetadata_AC.php index 6191d97ea..f6ca65d05 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_AC.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_AC.php @@ -10,22 +10,16 @@ array ( 'NationalNumberPattern' => ' [46]\\d{4}| - [2-467]\\d{3}| [01589]\\d{5} ', - 'PossibleNumberPattern' => '\\d{4,6}', + 'PossibleNumberPattern' => '\\d{5,6}', ), 'fixedLine' => array ( 'NationalNumberPattern' => ' - 6[2-467]\\d{3}| - (?: - [267]\\d| - 3[0-5]| - 4[4-69] - )\\d{2} + 6[2-467]\\d{3} ', - 'PossibleNumberPattern' => '\\d{4,5}', + 'PossibleNumberPattern' => '\\d{5}', 'ExampleNumber' => '62889', ), 'mobile' => diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BS.php b/src/libphonenumber/data/PhoneNumberMetadata_BS.php index 7fda4fe6d..30dc7f79b 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_BS.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_BS.php @@ -33,7 +33,10 @@ 8[78]| 9[89] )| - 702 + 7(?: + 02| + 88 + ) )\\d{4} ', 'PossibleNumberPattern' => '\\d{7}(?:\\d{3})?', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BW.php b/src/libphonenumber/data/PhoneNumberMetadata_BW.php index c8f60f7aa..0255d6c8c 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_BW.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_BW.php @@ -53,9 +53,8 @@ array ( 'NationalNumberPattern' => ' 7(?: - [1-356]\\d| - 4[0-7]| - 7[014-7] + [1-6]\\d| + 7[014-8] )\\d{5} ', 'PossibleNumberPattern' => '\\d{8}', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CL.php b/src/libphonenumber/data/PhoneNumberMetadata_CL.php index c4609947d..33e76ceb1 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_CL.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_CL.php @@ -22,6 +22,10 @@ 'NationalNumberPattern' => ' 2(?: 2\\d{7}| + 3(?: + 20| + 22 + )\\d{5}| 1962\\d{4} )| (?: @@ -126,7 +130,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '22', + 0 => '2[23]', ), 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '$CC ($1)', @@ -235,7 +239,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '22', + 0 => '2[23]', ), 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '$CC ($1)', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_DE.php b/src/libphonenumber/data/PhoneNumberMetadata_DE.php index 4418a6221..11f54cb5f 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_DE.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_DE.php @@ -62,7 +62,7 @@ array ( 'NationalNumberPattern' => ' 1(?: - 5[0-2579]\\d{8}| + 5[0-25-9]\\d{8}| 6[023]\\d{7,8}| 7(?: [0-57-9]\\d?| @@ -189,6 +189,17 @@ 'domesticCarrierCodeFormattingRule' => '', ), 1 => + array ( + 'pattern' => '(15\\d{3})(\\d{6})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '15[0568]', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + ), + 2 => array ( 'pattern' => '(1\\d{3})(\\d{7})', 'format' => '$1 $2', @@ -199,7 +210,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 2 => + 3 => array ( 'pattern' => '(\\d{2})(\\d{3,11})', 'format' => '$1 $2', @@ -214,7 +225,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 3 => + 4 => array ( 'pattern' => '(\\d{3})(\\d{3,11})', 'format' => '$1 $2', @@ -242,7 +253,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 4 => + 5 => array ( 'pattern' => '(\\d{4})(\\d{2,11})', 'format' => '$1 $2', @@ -336,7 +347,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 5 => + 6 => array ( 'pattern' => '(3\\d{4})(\\d{1,10})', 'format' => '$1 $2', @@ -347,7 +358,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 6 => + 7 => array ( 'pattern' => '(800)(\\d{7,12})', 'format' => '$1 $2', @@ -358,7 +369,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 7 => + 8 => array ( 'pattern' => '(177)(99)(\\d{7,8})', 'format' => '$1 $2 $3', @@ -371,7 +382,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 8 => + 9 => array ( 'pattern' => '(\\d{3})(\\d)(\\d{4,10})', 'format' => '$1 $2 $3', @@ -395,7 +406,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 9 => + 10 => array ( 'pattern' => '(1\\d{2})(\\d{5,11})', 'format' => '$1 $2', @@ -406,7 +417,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 10 => + 11 => array ( 'pattern' => '(18\\d{3})(\\d{6})', 'format' => '$1 $2', @@ -419,7 +430,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 11 => + 12 => array ( 'pattern' => '(18\\d{2})(\\d{7})', 'format' => '$1 $2', @@ -430,7 +441,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 12 => + 13 => array ( 'pattern' => '(18\\d)(\\d{8})', 'format' => '$1 $2', @@ -441,7 +452,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 13 => + 14 => array ( 'pattern' => '(700)(\\d{4})(\\d{4})', 'format' => '$1 $2 $3', @@ -452,7 +463,7 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), - 14 => + 15 => array ( 'pattern' => '(138)(\\d{4})', 'format' => '$1 $2', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_DZ.php b/src/libphonenumber/data/PhoneNumberMetadata_DZ.php index 29a9e3ec4..2ca3a5ba8 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_DZ.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_DZ.php @@ -39,7 +39,7 @@ )\\d{7}| 6(?: [569]\\d| - 7[0-4] + 7[0-6] )\\d{6} ', 'PossibleNumberPattern' => '\\d{9}', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_HN.php b/src/libphonenumber/data/PhoneNumberMetadata_HN.php index c8b88fe1b..623917455 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_HN.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_HN.php @@ -39,6 +39,7 @@ )| 6(?: [056]\\d| + 34| 4[0-378]| [78][0-8]| 9[01] diff --git a/src/libphonenumber/data/PhoneNumberMetadata_HR.php b/src/libphonenumber/data/PhoneNumberMetadata_HR.php index 87d3d74d8..e14e4a321 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_HR.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_HR.php @@ -23,14 +23,19 @@ 3[1-5]| 4[02-47-9]| 5[1-3] - )\\d{6} + )\\d{6,7} ', - 'PossibleNumberPattern' => '\\d{6,8}', + 'PossibleNumberPattern' => '\\d{6,9}', 'ExampleNumber' => '12345678', ), 'mobile' => array ( - 'NationalNumberPattern' => '9[1257-9]\\d{6,10}', + 'NationalNumberPattern' => ' + 9(?: + [1-9]\\d{6,10}| + 01\\d{6,9} + ) + ', 'PossibleNumberPattern' => '\\d{8,12}', 'ExampleNumber' => '912345678', ), @@ -43,10 +48,9 @@ 'premiumRate' => array ( 'NationalNumberPattern' => ' - 6(?: - [09]\\d{7}| - [145]\\d{4,7} - ) + 6(?: + [01459]\\d{4,7} + ) ', 'PossibleNumberPattern' => '\\d{6,9}', 'ExampleNumber' => '611234', @@ -74,7 +78,7 @@ ), 'uan' => array ( - 'NationalNumberPattern' => '62\\d{6,7}', + 'NationalNumberPattern' => '[76]2\\d{6,7}', 'PossibleNumberPattern' => '\\d{8,9}', 'ExampleNumber' => '62123456', ), @@ -140,18 +144,18 @@ ), 2 => array ( - 'pattern' => '(62)(\\d{3})(\\d{3,4})', + 'pattern' => '([67]2)(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '62', + 0 => '[67]2', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ), 3 => array ( - 'pattern' => '([2-5]\\d)(\\d{3})(\\d{3})', + 'pattern' => '([2-5]\\d)(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -200,7 +204,7 @@ 'leadingDigitsPatterns' => array ( 0 => ' - 6[145]| + 6[0145]| 7 ', ), @@ -214,7 +218,7 @@ 'leadingDigitsPatterns' => array ( 0 => ' - 6[145]| + 6[0145]| 7 ', ), diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IL.php b/src/libphonenumber/data/PhoneNumberMetadata_IL.php index 75d3cf4da..eab9c27a8 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_IL.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_IL.php @@ -34,7 +34,7 @@ 5[5689]| 6[67]| 7[0178]| - [89][7-9] + [89][6-9] )| 6[2-9]\\d )\\d{5} diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IN.php b/src/libphonenumber/data/PhoneNumberMetadata_IN.php index c2d8ff19a..e7ef40a89 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_IN.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_IN.php @@ -202,7 +202,7 @@ 9[0-8] )| 2(?: - 0[04-9]| + 0[024-9]| 19| 2[012]| 5[09]| @@ -421,7 +421,7 @@ 9[0-8] )| 2(?: - 0[04-9]| + 0[024-9]| 19| 2[012]| 5[09]| diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IT.php b/src/libphonenumber/data/PhoneNumberMetadata_IT.php index 384ac0dfe..f11065ead 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_IT.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_IT.php @@ -360,7 +360,7 @@ 'intlNumberFormat' => array ( ), - 'mainCountryForCode' => false, + 'mainCountryForCode' => true, 'leadingZeroPossible' => true, 'mobileNumberPortableRegion' => true, ); diff --git a/src/libphonenumber/data/PhoneNumberMetadata_JO.php b/src/libphonenumber/data/PhoneNumberMetadata_JO.php index 050b2b676..836678225 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_JO.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_JO.php @@ -96,7 +96,7 @@ 'NationalNumberPattern' => ' 7(?: 55| - 7[25-9]| + 7[025-9]| 8[05-9]| 9[0-25-9] )\\d{6} diff --git a/src/libphonenumber/data/PhoneNumberMetadata_KY.php b/src/libphonenumber/data/PhoneNumberMetadata_KY.php index 853c4196c..102e03f79 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_KY.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_KY.php @@ -58,7 +58,7 @@ )| 9(?: 1[67]| - 2[3-9]| + 2[2-9]| 3[689] ) )\\d{4} diff --git a/src/libphonenumber/data/PhoneNumberMetadata_MA.php b/src/libphonenumber/data/PhoneNumberMetadata_MA.php index 5569829be..932fb52c0 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_MA.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_MA.php @@ -51,7 +51,7 @@ 6(?: 0[0-8]| [12-79]\\d| - 8[01] + 8[017] )\\d{6} ', 'PossibleNumberPattern' => '\\d{9}', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_NP.php b/src/libphonenumber/data/PhoneNumberMetadata_NP.php index 55d5edc5f..2f1a63852 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_NP.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_NP.php @@ -42,7 +42,7 @@ 9(?: 6[013]| 7[245]| - 8[01456] + 8[0-24-6] )\\d{7} ', 'PossibleNumberPattern' => '\\d{10}', diff --git a/src/libphonenumber/data/PhoneNumberMetadata_PL.php b/src/libphonenumber/data/PhoneNumberMetadata_PL.php index 01f91f4a9..b085b92bc 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_PL.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_PL.php @@ -20,7 +20,7 @@ 'NationalNumberPattern' => ' (?: 1[2-8]| - 2[2-59]| + 2[2-69]| 3[2-4]| 4[1-468]| 5[24-689]| @@ -30,7 +30,6 @@ 9[145] )\\d{7}| [12]2\\d{5}| - 261\\d{6} ', 'PossibleNumberPattern' => '\\d{6,9}', 'ExampleNumber' => '123456789', @@ -162,7 +161,7 @@ 'leadingDigitsPatterns' => array ( 0 => ' - 261| + 26| 39| 5[0137]| 6[0469]| diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SH.php b/src/libphonenumber/data/PhoneNumberMetadata_SH.php index b48fa1859..f9f9721cd 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_SH.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_SH.php @@ -8,7 +8,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[25]\\d{4}', + 'NationalNumberPattern' => '[256]\\d{4}', 'PossibleNumberPattern' => '\\d{4,5}', ), 'fixedLine' => @@ -24,8 +24,8 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5\\d{4}', - 'PossibleNumberPattern' => '\\d{4,5}', + 'NationalNumberPattern' => '[56]\\d{4}', + 'PossibleNumberPattern' => '\\d{5}', ), 'tollFree' => array ( @@ -49,8 +49,8 @@ ), 'voip' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => '262\\d{2}', + 'PossibleNumberPattern' => '\\d{5}', ), 'pager' => array ( diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SL.php b/src/libphonenumber/data/PhoneNumberMetadata_SL.php index fa6b4ecde..8ab68ce6e 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_SL.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_SL.php @@ -8,7 +8,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[2-57-9]\\d{7}', + 'NationalNumberPattern' => '[2-9]\\d{7}', 'PossibleNumberPattern' => '\\d{6,8}', ), 'fixedLine' => @@ -22,9 +22,10 @@ 'NationalNumberPattern' => ' (?: 2[15]| - 3[034]| + 3[03-5]| 4[04]| 5[05]| + 66| 7[6-9]| 88| 99 diff --git a/src/libphonenumber/data/PhoneNumberMetadata_TM.php b/src/libphonenumber/data/PhoneNumberMetadata_TM.php index c40f39600..c73f4d717 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_TM.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_TM.php @@ -45,7 +45,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '6[2-8]\\d{6}', + 'NationalNumberPattern' => '6[2-9]\\d{6}', 'PossibleNumberPattern' => '\\d{8}', 'ExampleNumber' => '66123456', ), diff --git a/src/libphonenumber/data/PhoneNumberMetadata_UA.php b/src/libphonenumber/data/PhoneNumberMetadata_UA.php index 758d0927e..d485d3154 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_UA.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_UA.php @@ -8,7 +8,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[3-689]\\d{8}', + 'NationalNumberPattern' => '[3-9]\\d{8}', 'PossibleNumberPattern' => '\\d{5,9}', ), 'fixedLine' => @@ -31,6 +31,7 @@ 39| 50| 6[36-8]| + 73| 9[1-9] )\\d{7} ', @@ -116,7 +117,7 @@ array ( 0 => array ( - 'pattern' => '([3-689]\\d)(\\d{3})(\\d{4})', + 'pattern' => '([3-9]\\d)(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( @@ -132,6 +133,7 @@ 7[37] )| 6[36-8]| + 73| 9[1-9] ', 1 => ' @@ -149,6 +151,7 @@ 7[37] )| 6[36-8]| + 73| 9[1-9] ', ), diff --git a/src/libphonenumber/data/PhoneNumberMetadata_VA.php b/src/libphonenumber/data/PhoneNumberMetadata_VA.php index 7b99615ce..5f2da5a0b 100644 --- a/src/libphonenumber/data/PhoneNumberMetadata_VA.php +++ b/src/libphonenumber/data/PhoneNumberMetadata_VA.php @@ -8,8 +8,20 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '06\\d{8}', - 'PossibleNumberPattern' => '\\d{10}', + 'NationalNumberPattern' => ' + (?: + 0(?: + 878\\d{5}| + 6698\\d{5} + )| + [1589]\\d{5,10}| + 3(?: + [12457-9]\\d{8}| + [36]\\d{7,9} + ) + ) + ', + 'PossibleNumberPattern' => '\\d{6,11}', ), 'fixedLine' => array ( @@ -19,33 +31,78 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => ' + 3(?: + [12457-9]\\d{8}| + 6\\d{7,8}| + 3\\d{7,9} + ) + ', + 'PossibleNumberPattern' => '\\d{9,11}', + 'ExampleNumber' => '3123456789', ), 'tollFree' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => ' + 80(?: + 0\\d{6}| + 3\\d{3} + ) + ', + 'PossibleNumberPattern' => '\\d{6,9}', + 'ExampleNumber' => '800123456', ), 'premiumRate' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => ' + 0878\\d{5}| + 1(?: + 44| + 6[346] + )\\d{6}| + 89(?: + 2\\d{3}| + 4(?: + [0-4]\\d{2}| + [5-9]\\d{4} + )| + 5(?: + [0-4]\\d{2}| + [5-9]\\d{6} + )| + 9\\d{6} + ) + ', + 'PossibleNumberPattern' => '\\d{6,10}', + 'ExampleNumber' => '899123456', ), 'sharedCost' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => ' + 84(?: + [08]\\d{6}| + [17]\\d{3} + ) + ', + 'PossibleNumberPattern' => '\\d{6,9}', + 'ExampleNumber' => '848123456', ), 'personalNumber' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => ' + 1(?: + 78\\d| + 99 + )\\d{6} + ', + 'PossibleNumberPattern' => '\\d{9,10}', + 'ExampleNumber' => '1781234567', ), 'voip' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => '55\\d{8}', + 'PossibleNumberPattern' => '\\d{10}', + 'ExampleNumber' => '5512345678', ), 'pager' => array ( @@ -84,30 +141,21 @@ ), 'noInternationalDialling' => array ( - 'NationalNumberPattern' => 'NA', - 'PossibleNumberPattern' => 'NA', + 'NationalNumberPattern' => '848\\d{6}', + 'PossibleNumberPattern' => '\\d{9}', + 'ExampleNumber' => '848123456', ), 'id' => 'VA', - 'countryCode' => 379, + 'countryCode' => 39, 'internationalPrefix' => '00', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( - 0 => - array ( - 'pattern' => '(06)(\\d{4})(\\d{4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - ), - 'nationalPrefixFormattingRule' => '', - 'domesticCarrierCodeFormattingRule' => '', - ), ), 'intlNumberFormat' => array ( ), 'mainCountryForCode' => false, 'leadingZeroPossible' => true, - 'mobileNumberPortableRegion' => false, + 'mobileNumberPortableRegion' => true, ); diff --git a/src/libphonenumber/data/ShortNumberMetadata_HR.php b/src/libphonenumber/data/ShortNumberMetadata_HR.php index de5bb811b..5dc29b282 100644 --- a/src/libphonenumber/data/ShortNumberMetadata_HR.php +++ b/src/libphonenumber/data/ShortNumberMetadata_HR.php @@ -8,18 +8,18 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[19]\\d{1,2}', - 'PossibleNumberPattern' => '\\d{2,3}', + 'NationalNumberPattern' => '[19]\\d{1,5}', + 'PossibleNumberPattern' => '\\d{2,6}', ), 'fixedLine' => array ( - 'NationalNumberPattern' => '[19]\\d{1,2}', - 'PossibleNumberPattern' => '\\d{2,3}', + 'NationalNumberPattern' => '[19]\\d{1,5}', + 'PossibleNumberPattern' => '\\d{2,6}', ), 'mobile' => array ( - 'NationalNumberPattern' => '[19]\\d{1,2}', - 'PossibleNumberPattern' => '\\d{2,3}', + 'NationalNumberPattern' => '[19]\\d{1,5}', + 'PossibleNumberPattern' => '\\d{2,6}', ), 'tollFree' => array ( @@ -61,11 +61,11 @@ 'NationalNumberPattern' => ' 1(?: 12| - 92 + 9[2-4] )| 9[34] ', - 'PossibleNumberPattern' => '\\d{2,3}', + 'PossibleNumberPattern' => '\\d{2,6}', 'ExampleNumber' => '112', ), 'voicemail' => @@ -76,13 +76,15 @@ 'shortCode' => array ( 'NationalNumberPattern' => ' - 1(?: - 12| - 92 + 1(?: + 1[28]| + 16\\d{3}| + 987| + 9[2-5] )| 9[34] ', - 'PossibleNumberPattern' => '\\d{2,3}', + 'PossibleNumberPattern' => '\\d{2,6}', 'ExampleNumber' => '112', ), 'standardRate' => diff --git a/src/libphonenumber/geocoding/data/en/56.php b/src/libphonenumber/geocoding/data/en/56.php index 3b69aac28..e4e13bd16 100644 --- a/src/libphonenumber/geocoding/data/en/56.php +++ b/src/libphonenumber/geocoding/data/en/56.php @@ -6,6 +6,7 @@ return array ( 5622 => 'Santiago, Metropolitan Region', + 56232 => 'Santiago, Metropolitan Region', 5632 => 'Valparaíso', 5633 => 'Quillota, Valparaíso', 5634 => 'San Felipe, Valparaíso', diff --git a/src/libphonenumber/geocoding/data/es/56.php b/src/libphonenumber/geocoding/data/es/56.php index 16c97c997..60156bc62 100644 --- a/src/libphonenumber/geocoding/data/es/56.php +++ b/src/libphonenumber/geocoding/data/es/56.php @@ -6,6 +6,7 @@ return array ( 5622 => 'Santiago, Región Metropolitana', + 56232 => 'Santiago, Región Metropolitana', 5658 => 'Arica, Arica y Parinacota', 5661 => 'Punta Arenas, Magallanes', 5667 => 'Coihaique, Aysén',