Merge pull request #658 from giggsey/upstream-8.13.47

Upstream metadata changes from Google for v8.13.47
giggsey · Oct 8, 2024 · 717d328 · 717d328
2 parents 8a146ce + 65b6f1f
commit 717d328
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 23 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -8,7 +8,7 @@
 $config = new PhpCsFixer\Config();
 return $config->setRules(
     [
-        '@PER-CS' => true,
+        '@PER-CS2.0' => true,
         '@PHP74Migration' => true,
         'single_quote' => true,
         'no_unused_imports' => true,

diff --git 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.46
+v8.13.47
diff --git a/src/carrier/data/en/256.php b/src/carrier/data/en/256.php
@@ -16,6 +16,7 @@
     256720 => 'Smile',
     256724 => 'Hamilton Telecom',
     256726 => 'Tangerine',
+    256727 => 'Tangerine',
     256728 => 'Talkio',
     25673 => 'Hamilton Telecom',
     25674 => 'Airtel',

diff --git a/src/carrier/data/en/380.php b/src/carrier/data/en/380.php
@@ -20,6 +20,7 @@
     38073 => 'lifecell',
     38075 => 'Vodafone',
     38077 => 'Kyivstar',
+    38079 => 'J&Y',
     38091 => 'TriMob',
     38092 => 'PEOPLEnet',
     38093 => 'lifecell',

diff --git a/src/carrier/data/en/852.php b/src/carrier/data/en/852.php
@@ -74,6 +74,7 @@
     8524699 => 'South China Telecommunications',
     852470 => 'Hutchison Telecom',
     852474 => 'China Mobile',
+    852475 => 'Hutchison Telecom',
     852510 => 'China Mobile',
     852511 => 'HKT',
     852512 => 'China Mobile',
@@ -293,6 +294,7 @@
     852701 => 'China Mobile',
     852702 => 'Hutchison Telecom',
     852703 => 'Hutchison Telecom',
+    852704 => 'Hutchison Telecom',
     8527071 => 'SmarTone',
     8527072 => 'SmarTone',
     8527073 => 'SmarTone',

diff --git a/src/carrier/data/en/995.php b/src/carrier/data/en/995.php
@@ -49,7 +49,12 @@
     9955112 => 'MagtiCom',
     9955113 => 'MagtiCom',
     9955114 => 'MagtiCom',
-    9955115 => 'Silknet',
+    99551151 => 'Silknet',
+    99551152 => 'MagtiCom',
+    99551153 => 'MagtiCom',
+    99551154 => 'MagtiCom',
+    99551155 => 'MagtiCom',
+    99551156 => 'MagtiCom',
     9955117 => 'MagtiCom',
     995514 => 'Silknet',
     995515 => 'MagtiCom',

diff --git a/src/carrier/data/zh/852.php b/src/carrier/data/zh/852.php
@@ -73,6 +73,7 @@
     8524699 => '中國南方電信(香港)有限公司',
     852470 => '和記電話有限公司',
     852474 => '中国移动',
+    852475 => '和記電話有限公司',
     852510 => '中国移动',
     852511 => '香港移动通讯',
     852512 => '中国移动',
@@ -257,6 +258,7 @@
     852701 => '中国移动',
     852702 => '和記電話有限公司',
     852703 => '和記電話有限公司',
+    852704 => '和記電話有限公司',
     8527071 => '数码通',
     8527072 => '数码通',
     8527073 => '数码通',

diff --git a/src/data/PhoneNumberMetadata_GE.php b/src/data/PhoneNumberMetadata_GE.php
@@ -27,7 +27,7 @@
         ],
     ],
     'mobile' => [
-        'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
+        'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d|5[2-6]|7[0-4])|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}',
         'ExampleNumber' => '555123456',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [],

diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php
@@ -28,7 +28,7 @@
         'PossibleLengthLocalOnly' => [],
     ],
     'mobile' => [
-        'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|74[0-2])|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|70)|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-39]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+        'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|74[0-2])|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[05])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-49]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
         'ExampleNumber' => '51234567',
         'PossibleLength' => [
             8,

diff --git 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[35]|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[245])\\d{5}',
         'ExampleNumber' => '202123456',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [

diff --git a/src/data/PhoneNumberMetadata_MM.php b/src/data/PhoneNumberMetadata_MM.php
@@ -21,7 +21,7 @@
         ],
     ],
     'fixedLine' => [
-        'NationalNumberPattern' => '(?:1(?:(?:2\\d|3[56]|[89][0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5470)|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:(?:3\\d|8[01459])\\d|4[67]0)))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|[35]2\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}',
+        'NationalNumberPattern' => '(?:1(?:(?:12|[28]\\d|3[56]|7[3-6]|9[0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5(?:2\\d|470))|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:3\\d\\d|4[67]0|8(?:[01459]\\d|8))))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|(?:[35]2|64)\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}',
         'ExampleNumber' => '1234567',
         'PossibleLength' => [
             6,
@@ -123,7 +123,7 @@
             'pattern' => '(\\d{2})(\\d{2})(\\d{3})',
             'format' => '$1 $2 $3',
             'leadingDigitsPatterns' => [
-                '[45]|6(?:0[23]|[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-6]',
+                '4(?:[2-46]|5[3-5])|5|6(?:[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-5]|(?:60|86)[23]',
             ],
             'nationalPrefixFormattingRule' => '0$1',
             'domesticCarrierCodeFormattingRule' => '',
@@ -133,7 +133,8 @@
             'pattern' => '(\\d)(\\d{3})(\\d{3,4})',
             'format' => '$1 $2 $3',
             'leadingDigitsPatterns' => [
-                '[12]',
+                '[12]|452|678|86',
+                '[12]|452|6788|86',
             ],
             'nationalPrefixFormattingRule' => '0$1',
             'domesticCarrierCodeFormattingRule' => '',

diff --git a/src/data/PhoneNumberMetadata_NO.php b/src/data/PhoneNumberMetadata_NO.php
@@ -78,7 +78,7 @@
         'PossibleLengthLocalOnly' => [],
     ],
     'uan' => [
-        'NationalNumberPattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
+        'NationalNumberPattern' => '(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
         'ExampleNumber' => '02000',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [],

diff --git a/src/data/PhoneNumberMetadata_SJ.php b/src/data/PhoneNumberMetadata_SJ.php
@@ -78,7 +78,7 @@
         'PossibleLengthLocalOnly' => [],
     ],
     'uan' => [
-        'NationalNumberPattern' => '(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
+        'NationalNumberPattern' => '(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}',
         'ExampleNumber' => '02000',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [],

diff --git a/src/data/PhoneNumberMetadata_UA.php b/src/data/PhoneNumberMetadata_UA.php
@@ -32,7 +32,7 @@
         ],
     ],
     'mobile' => [
-        'NationalNumberPattern' => '(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}',
+        'NationalNumberPattern' => '790\\d{6}|(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}',
         'ExampleNumber' => '501234567',
         'PossibleLength' => [
             9,

diff --git a/src/data/PhoneNumberMetadata_UG.php b/src/data/PhoneNumberMetadata_UG.php
@@ -29,7 +29,7 @@
         ],
     ],
     'mobile' => [
-        'NationalNumberPattern' => '72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}',
+        'NationalNumberPattern' => '72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-5]|9[89])\\d{6}',
         'ExampleNumber' => '712345678',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [],

diff --git a/src/data/ShortNumberMetadata_NO.php b/src/data/ShortNumberMetadata_NO.php
@@ -8,10 +8,11 @@
 
 return [
     'generalDesc' => [
-        'NationalNumberPattern' => '1\\d\\d(?:\\d(?:\\d{2})?)?',
+        'NationalNumberPattern' => '[01]\\d{2,5}',
         'PossibleLength' => [
             3,
             4,
+            5,
             6,
         ],
         'PossibleLengthLocalOnly' => [],
@@ -40,7 +41,7 @@
         'PossibleLengthLocalOnly' => [],
     ],
     'shortCode' => [
-        'NationalNumberPattern' => '1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)',
+        'NationalNumberPattern' => '04\\d{3}|1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)',
         'ExampleNumber' => '110',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [],
@@ -58,8 +59,10 @@
         'PossibleLengthLocalOnly' => [],
     ],
     'smsServices' => [
+        'NationalNumberPattern' => '04\\d{3}',
+        'ExampleNumber' => '04000',
         'PossibleLength' => [
-            -1,
+            5,
         ],
         'PossibleLengthLocalOnly' => [],
     ],

diff --git a/src/data/ShortNumberMetadata_SJ.php b/src/data/ShortNumberMetadata_SJ.php
@@ -8,16 +8,19 @@
 
 return [
     'generalDesc' => [
-        'NationalNumberPattern' => '1\\d\\d',
+        'NationalNumberPattern' => '[01]\\d\\d(?:\\d{2})?',
         'PossibleLength' => [
             3,
+            5,
         ],
         'PossibleLengthLocalOnly' => [],
     ],
     'tollFree' => [
         'NationalNumberPattern' => '11[023]',
         'ExampleNumber' => '110',
-        'PossibleLength' => [],
+        'PossibleLength' => [
+            3,
+        ],
         'PossibleLengthLocalOnly' => [],
     ],
     'premiumRate' => [
@@ -29,11 +32,13 @@
     'emergency' => [
         'NationalNumberPattern' => '11[023]',
         'ExampleNumber' => '110',
-        'PossibleLength' => [],
+        'PossibleLength' => [
+            3,
+        ],
         'PossibleLengthLocalOnly' => [],
     ],
     'shortCode' => [
-        'NationalNumberPattern' => '11[023]',
+        'NationalNumberPattern' => '04\\d{3}|11[023]',
         'ExampleNumber' => '110',
         'PossibleLength' => [],
         'PossibleLengthLocalOnly' => [],
@@ -51,8 +56,10 @@
         'PossibleLengthLocalOnly' => [],
     ],
     'smsServices' => [
+        'NationalNumberPattern' => '04\\d{3}',
+        'ExampleNumber' => '04000',
         'PossibleLength' => [
-            -1,
+            5,
         ],
         'PossibleLengthLocalOnly' => [],
     ],

diff --git a/src/geocoding/data/en/261.php b/src/geocoding/data/en/261.php
@@ -25,6 +25,7 @@
     26120729 => 'Mananjary',
     2612073 => 'Farafangana',
     2612075 => 'Fianarantsoa',
+    2612076 => 'Antananarivo',
     2612082 => 'Antsiranana',
     2612086 => 'Nosy Be',
     2612088 => 'Sambava',

diff --git a/src/geocoding/data/en/380.php b/src/geocoding/data/en/380.php
@@ -290,7 +290,7 @@
     3804741 => 'Shpola, Cherkasy',
     3804742 => 'Katerinopil, Cherkasy',
     3804744 => 'Uman, Cherkasy',
-    3804745 => 'Khrystynivka, Cherkasy',
+    3804745 => 'Monastyrysche, Cherkasy',
     3804746 => 'Monastyrysche, Cherkasy',
     3804747 => 'Zhashkiv, Cherkasy',
     3804748 => 'Mankivka, Cherkasy',

diff --git a/src/geocoding/data/en/95.php b/src/geocoding/data/en/95.php
@@ -11,6 +11,7 @@
  */
 
 return  [
+    9511 => 'Yangon',
     951422 => 'Yangon',
     951423 => 'Yangon',
     951424 => 'Yangon',

diff --git a/src/geocoding/data/uk/380.php b/src/geocoding/data/uk/380.php
@@ -290,7 +290,7 @@
     3804741 => 'Шпола, Черкаси',
     3804742 => 'Катеринопіль, Черкаси',
     3804744 => 'Умань, Черкаси',
-    3804745 => 'Христинівка, Черкаси',
+    3804745 => 'Монастирище, Черкаси',
     3804746 => 'Монастирище, Черкаси',
     3804747 => 'Жашків, Черкаси',
     3804748 => 'Маньківка, Черкаси',