Merge pull request #738 from giggsey/upstream-9.0.23

giggsey · web-flow · commit c415b68b44f8 · 2026-01-30T13:34:38.000Z
Upstream metadata changes from Google for v9.0.23
diff --git a/METADATA-VERSION.php b/METADATA-VERSION.php
@@ -8,4 +8,4 @@
  * For more information, look at the phing tasks in build.xml
  * @internal
  */
-return 'v9.0.22';
+return 'v9.0.23';
diff --git a/src/carrier/data/en/En_1.php b/src/carrier/data/en/En_1.php
@@ -91,6 +91,11 @@ class En_1
         164923 => 'C&W',
         164924 => 'Cable & Wireless',
         164943 => 'Islandcom',
+        165820 => 'Flow',
+        165821 => 'Flow',
+        165822 => 'Flow',
+        165823 => 'Flow',
+        165824 => 'Flow',
         166434 => 'Cable & Wireless',
         166439 => 'Digicel',
         167174 => 'PTI PACIFICA',
@@ -296,7 +301,7 @@ class En_1
         1473402 => 'Affordable Island Communications',
         1473449 => 'C&W',
         1473456 => 'C&W',
-        1658295 => 'Cable & Wireless',
+        1658295 => 'Flow',
         1659200 => 'Onvoy',
         1659222 => 'Onvoy',
         1659300 => 'Onvoy',
diff --git a/src/carrier/data/en/En_243.php b/src/carrier/data/en/En_243.php
@@ -28,6 +28,7 @@ class En_243
         24389 => 'Orange',
         24390 => 'Africell',
         24391 => 'Africell',
+        24396 => 'Airtel',
         24397 => 'Airtel',
         24398 => 'Airtel',
         24399 => 'Airtel',
diff --git a/src/carrier/data/en/En_357.php b/src/carrier/data/en/En_357.php
@@ -18,10 +18,16 @@ class En_357
 {
     public const DATA = [
         35791 => 'Cytamobile-Vodafone',
-        35794 => 'Lemontel',
         35795 => 'PrimeTel',
         35796 => 'MTN',
         35797 => 'Cytamobile-Vodafone',
         35799 => 'Cytamobile-Vodafone',
+        357940 => 'Cablenet',
+        357941 => 'Cablenet',
+        357942 => 'Epic',
+        357943 => 'Epic',
+        357944 => 'Cablenet',
+        357945 => 'Cablenet',
+        357946 => 'Epic',
     ];
 }
diff --git a/src/carrier/data/en/En_966.php b/src/carrier/data/en/En_966.php
@@ -34,7 +34,7 @@ class En_966
         966576 => 'Lebara',
         966577 => 'Lebara',
         966578 => 'Lebara',
-        966579 => 'Lebara',
+        966579 => 'STC',
         9665150 => 'Virgin',
         9665151 => 'Virgin',
         9665152 => 'Virgin',
@@ -49,5 +49,7 @@ class En_966
         9665736 => 'STC',
         9665737 => 'STC',
         9665738 => 'STC',
+        9665790 => 'Lebara',
+        9665791 => 'Lebara',
     ];
 }
diff --git a/src/carrier/data/en/En_98.php b/src/carrier/data/en/En_98.php
@@ -35,6 +35,7 @@ class En_98
         989982 => 'Shatel Mobile',
         989990 => 'IR-MCI',
         989991 => 'Irancell',
+        989993 => 'Aptel',
         989995 => 'IR-MCI',
         989996 => 'IR-MCI',
         989998 => 'Rightel',
diff --git a/src/carrier/data/fa/Fa_98.php b/src/carrier/data/fa/Fa_98.php
@@ -35,6 +35,7 @@ class Fa_98
         989982 => 'شاتل موبایل',
         989990 => 'همراه اول',
         989991 => 'ایرانسل',
+        989993 => 'آپتل',
         989995 => 'همراه اول',
         989996 => 'همراه اول',
         989998 => 'رایتل',
diff --git a/src/data/PhoneNumberAlternateFormats_595.php b/src/data/PhoneNumberAlternateFormats_595.php
@@ -30,7 +30,7 @@ public function __construct()
             (new NumberFormat())
                 ->setPattern('(\d{2})(\d{2})(\d{3})')
                 ->setFormat('$1 $2 $3')
-                ->setLeadingDigitsPattern(['[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]'])
+                ->setLeadingDigitsPattern(['3[289]|4|61|7[1-3]|8[1-36]'])
                 ->setNationalPrefixOptionalWhenFormatting(false),
             (new NumberFormat())
                 ->setPattern('(\d{2})(\d{6,7})')
diff --git a/src/data/PhoneNumberMetadata_AS.php b/src/data/PhoneNumberMetadata_AS.php
@@ -35,14 +35,14 @@ public function __construct()
             ->setPossibleLengthLocalOnly([7])
             ->setPossibleLength([10]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('684(?:2(?:48|5[2468]|7[26])|7(?:3[13]|70|82))\d{4}')
+            ->setNationalNumberPattern('684(?:2(?:48|5[2468]|7[246])|7(?:3[13]|70|82))\d{4}')
             ->setExampleNumber('6847331234')
             ->setPossibleLengthLocalOnly([7]);
         $this->premiumRate = (new PhoneNumberDesc())
             ->setNationalNumberPattern('900[2-9]\d{6}')
             ->setExampleNumber('9002123456');
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('6846(?:22|33|44|55|77|88|9[19])\d{4}')
+            ->setNationalNumberPattern('684(?:274|6(?:22|33|44|55|77|88|9[19]))\d{4}')
             ->setExampleNumber('6846221234')
             ->setPossibleLengthLocalOnly([7]);
         $this->tollFree = (new PhoneNumberDesc())
diff --git a/src/data/PhoneNumberMetadata_BE.php b/src/data/PhoneNumberMetadata_BE.php
@@ -35,7 +35,7 @@ public function __construct()
             ->setPossibleLength([8, 9]);
         $this->mobile = (new PhoneNumberDesc())
             ->setNationalNumberPattern('4[5-9]\d{7}')
-            ->setExampleNumber('470123456')
+            ->setExampleNumber('450001234')
             ->setPossibleLength([9]);
         $this->premiumRate = (new PhoneNumberDesc())
             ->setNationalNumberPattern('(?:70(?:2[0-57]|3[04-7]|44|6[04-69]|7[0579])|90\d\d)\d{4}')
diff --git a/src/data/PhoneNumberMetadata_CD.php b/src/data/PhoneNumberMetadata_CD.php
@@ -33,7 +33,7 @@ public function __construct()
             ->setNationalNumberPattern('(?:(?:[189]|5\d)\d|2)\d{7}|[1-68]\d{6}')
             ->setPossibleLength([7, 8, 9, 10]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('88\d{5}|(?:8[0-69]|9[017-9])\d{7}')
+            ->setNationalNumberPattern('88\d{5}|(?:8[0-69]|9[016-9])\d{7}')
             ->setExampleNumber('991234567')
             ->setPossibleLength([7, 9]);
         $this->premiumRate = PhoneNumberDesc::empty();
diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php
@@ -21,7 +21,6 @@ class PhoneNumberMetadata_EH extends PhoneMetadata
 {
     protected const ID = 'EH';
     protected const COUNTRY_CODE = 212;
-    protected const LEADING_DIGITS = '528[89]';
     protected const NATIONAL_PREFIX = '0';
 
     protected ?string $nationalPrefixForParsing = '0';
diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php
@@ -31,7 +31,7 @@ public function __construct()
             ->setNationalNumberPattern('(?:[2-8]\d{3}|9008)\d{3}')
             ->setPossibleLength([7]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:51[01]|6\d\d|7(?:[0-5]\d|6[0-59]|70))\d{4}')
+            ->setNationalNumberPattern('(?:51[01]|6\d\d|7(?:[0-5]\d|6[0-69]|70))\d{4}')
             ->setExampleNumber('6091234');
         $this->premiumRate = (new PhoneNumberDesc())
             ->setNationalNumberPattern('9008\d{3}')
diff --git a/src/data/PhoneNumberMetadata_IR.php b/src/data/PhoneNumberMetadata_IR.php
@@ -35,12 +35,12 @@ public function __construct()
             ->setPossibleLengthLocalOnly([8])
             ->setPossibleLength([4, 5, 6, 7, 10]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('9(?:(?:0[0-5]|[13]\d|2[0-3])\d\d|9(?:[0-46]\d\d|5(?:10|5\d)|8(?:[12]\d|88)|9(?:[0159]\d|21|69|77|8[7-9])))\d{5}')
+            ->setNationalNumberPattern('9(?:(?:0[0-5]|[13]\d|2[0-3])\d\d|9(?:[0-46]\d\d|5(?:10|5\d)|8(?:[12]\d|88)|9(?:[01359]\d|21|69|77|8[7-9])))\d{5}')
             ->setExampleNumber('9123456789')
             ->setPossibleLength([10]);
         $this->premiumRate = PhoneNumberDesc::empty();
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\d{7}|[16]\d{3}(?:\d{4})?|[289]\d{3}(?:\d(?:\d{3})?)?)|94(?:000[09]|(?:12\d|30[0-2])\d|2(?:121|[2689]0\d)|4(?:111|40\d))\d{4}')
+            ->setNationalNumberPattern('(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\d{7}|[16]\d{3}(?:\d{4})?|[289]\d{3}(?:\d(?:\d{3})?)?)|94(?:000[09]|(?:12\d|30[0-2])\d|2(?:[02689]0\d|121)|4(?:111|40\d))\d{4}')
             ->setExampleNumber('2123456789')
             ->setPossibleLengthLocalOnly([4, 5, 8])
             ->setPossibleLength([6, 7, 10]);
diff --git a/src/data/PhoneNumberMetadata_JM.php b/src/data/PhoneNumberMetadata_JM.php
@@ -35,14 +35,14 @@ public function __construct()
             ->setPossibleLengthLocalOnly([7])
             ->setPossibleLength([10]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:658295|876(?:2(?:0[1-9]|[13-9]\d|2[013-9])|[348]\d\d|5(?:0[1-9]|[1-9]\d)|6(?:4[89]|6[67])|7(?:0[07]|7\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\d{4}')
+            ->setNationalNumberPattern('(?:6582(?:[0-4]\d|95)|876(?:2(?:0[1-9]|[13-9]\d|2[013-9])|[348]\d\d|5(?:0[1-9]|[1-9]\d)|6(?:4[89]|6[67])|7(?:0[07]|7\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\d{4}')
             ->setExampleNumber('8762101234')
             ->setPossibleLengthLocalOnly([7]);
         $this->premiumRate = (new PhoneNumberDesc())
             ->setNationalNumberPattern('900[2-9]\d{6}')
             ->setExampleNumber('9002123456');
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('8766060\d{3}|(?:658(?:2(?:[0-8]\d|9[0-46-9])|[3-9]\d\d)|876(?:52[35]|6(?:0[1-3579]|1[0235-9]|[23]\d|40|5[06]|6[2-589]|7[0-25-9]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\d|9[2-468])))\d{4}')
+            ->setNationalNumberPattern('8766060\d{3}|(?:658(?:2(?:[5-8]\d|9[0-46-9])|[3-9]\d\d)|876(?:52[35]|6(?:0[1-3579]|1[0235-9]|[23]\d|40|5[06]|6[2-589]|7[0-25-9]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\d|9[2-468])))\d{4}')
             ->setExampleNumber('8765230123')
             ->setPossibleLengthLocalOnly([7]);
         $this->tollFree = (new PhoneNumberDesc())
diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php
@@ -22,6 +22,7 @@ class PhoneNumberMetadata_MA extends PhoneMetadata
 {
     protected const ID = 'MA';
     protected const COUNTRY_CODE = 212;
+    protected const LEADING_DIGITS = '[5-8]';
     protected const NATIONAL_PREFIX = '0';
 
     protected ?string $nationalPrefixForParsing = '0';
@@ -41,7 +42,7 @@ public function __construct()
             ->setNationalNumberPattern('89\d{7}')
             ->setExampleNumber('891234567');
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('5(?:(?:18|4[0679]|5[03])\d|2(?:[0-25-79]\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\d|5[02-9]|6[02-8]|8[014-9]|9[3-9]))\d{5}')
+            ->setNationalNumberPattern('5(?:(?:18|4[0679]|5[03])\d|2(?:[0-25-79]\d|3[1-578]|4[02-46-8]|8[0235-9])|3(?:[0-47]\d|5[02-9]|6[02-8]|8[014-9]|9[3-9]))\d{5}')
             ->setExampleNumber('520123456');
         $this->numberFormat = [
             (new NumberFormat())
diff --git a/src/data/PhoneNumberMetadata_MU.php b/src/data/PhoneNumberMetadata_MU.php
@@ -40,7 +40,7 @@ public function __construct()
             ->setExampleNumber('3012345')
             ->setPossibleLength([7]);
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:2(?:[0346-8]\d|1[0-8])|4(?:[013568]\d|2[4-8]|71|90)|54(?:[3-5]\d|71)|6\d\d|8(?:14|3[129]))\d{4}')
+            ->setNationalNumberPattern('(?:2(?:[0346-8]\d|1[0-8])|4(?:[013568]\d|2[0-24-8]|71|90)|54(?:[3-5]\d|71)|6\d\d|8(?:14|3[129]))\d{4}')
             ->setExampleNumber('54480123')
             ->setPossibleLength([7, 8]);
         $this->numberFormat = [
diff --git a/src/data/PhoneNumberMetadata_PY.php b/src/data/PhoneNumberMetadata_PY.php
@@ -31,7 +31,7 @@ class PhoneNumberMetadata_PY extends PhoneMetadata
     public function __construct()
     {
         $this->generalDesc = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('59\d{4,6}|9\d{5,10}|(?:[2-46-8]\d|5[0-8])\d{4,7}')
+            ->setNationalNumberPattern('[36-8]\d{5,8}|4\d{6,8}|59\d{6}|9\d{5,10}|(?:2\d|5[0-8])\d{6,7}')
             ->setPossibleLengthLocalOnly([5])
             ->setPossibleLength([6, 7, 8, 9, 10, 11]);
         $this->mobile = (new PhoneNumberDesc())
@@ -40,26 +40,26 @@ public function __construct()
             ->setPossibleLength([9]);
         $this->premiumRate = PhoneNumberDesc::empty();
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36])\d{5,7}|(?:2(?:2[4-68]|[4-68]\d|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\d)|4(?:3[12]|5[13]|9[1-47])|5(?:[1-4]\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\d|6[1-578]|75|8[0-8])|858)\d{5,6}')
+            ->setNationalNumberPattern('(?:3[289]|4[246-8]|61|7[1-3]|8[1-36])\d{5,7}|(?:2(?:[14-68]\d|2[4-68]|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\d)|4(?:1\d|3[12]|5[13]|9[1-47])|5(?:[1-4]\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\d|6[1-578]|75|8[0-8])|858)\d{5,6}')
             ->setExampleNumber('212345678')
             ->setPossibleLengthLocalOnly([5, 6])
             ->setPossibleLength([7, 8, 9]);
         $this->numberFormat = [
+            (new NumberFormat())
+                ->setPattern('(\d{6,7})')
+                ->setFormat('$1')
+                ->setLeadingDigitsPattern(['[125]|4[01]'])
+                ->setNationalPrefixOptionalWhenFormatting(false),
             (new NumberFormat())
                 ->setPattern('(\d{3})(\d{3,6})')
                 ->setFormat('$1 $2')
                 ->setLeadingDigitsPattern(['[2-9]0'])
                 ->setNationalPrefixFormattingRule('0$1')
                 ->setNationalPrefixOptionalWhenFormatting(false),
-            (new NumberFormat())
-                ->setPattern('(\d{7})')
-                ->setFormat('$1')
-                ->setLeadingDigitsPattern(['[15]'])
-                ->setNationalPrefixOptionalWhenFormatting(false),
             (new NumberFormat())
                 ->setPattern('(\d{2})(\d{5})')
                 ->setFormat('$1 $2')
-                ->setLeadingDigitsPattern(['[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]'])
+                ->setLeadingDigitsPattern(['3[289]|4[246-8]|61|7[1-3]|8[1-36]'])
                 ->setNationalPrefixFormattingRule('(0$1)')
                 ->setNationalPrefixOptionalWhenFormatting(false),
             (new NumberFormat())
@@ -109,7 +109,7 @@ public function __construct()
             ->setPossibleLength([9]);
         $this->pager = PhoneNumberDesc::empty();
         $this->uan = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('[2-9]0\d{4,7}')
+            ->setNationalNumberPattern('[245]0\d{6,7}|[36-9]0\d{4,7}')
             ->setExampleNumber('201234567')
             ->setPossibleLength([6, 7, 8, 9]);
         $this->voicemail = PhoneNumberDesc::empty();
@@ -124,7 +124,7 @@ public function __construct()
             (new NumberFormat())
                 ->setPattern('(\d{2})(\d{5})')
                 ->setFormat('$1 $2')
-                ->setLeadingDigitsPattern(['[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]'])
+                ->setLeadingDigitsPattern(['3[289]|4[246-8]|61|7[1-3]|8[1-36]'])
                 ->setNationalPrefixFormattingRule('(0$1)')
                 ->setNationalPrefixOptionalWhenFormatting(false),
             (new NumberFormat())
diff --git a/src/data/PhoneNumberMetadata_SA.php b/src/data/PhoneNumberMetadata_SA.php
@@ -35,7 +35,7 @@ public function __construct()
             ->setPossibleLengthLocalOnly([7])
             ->setPossibleLength([9, 10]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('579[01]\d{5}|5(?:[013-689]\d|7[0-8])\d{6}')
+            ->setNationalNumberPattern('579[0-8]\d{5}|5(?:[013-689]\d|7[0-8])\d{6}')
             ->setExampleNumber('512345678')
             ->setPossibleLength([9]);
         $this->premiumRate = (new PhoneNumberDesc())
diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php
@@ -37,14 +37,14 @@ public function __construct()
             ->setPossibleLengthLocalOnly([7])
             ->setPossibleLength([10]);
         $this->mobile = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:2742|(?:472|983)[2-47-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013-79]|3[0-24679]|4[167]|5[0-3]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-269])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}')
+            ->setNationalNumberPattern('(?:274[27]|(?:472|983)[2-47-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013-79]|3[0-24679]|4[167]|5[0-3]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-269])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}')
             ->setExampleNumber('2015550123')
             ->setPossibleLengthLocalOnly([7]);
         $this->premiumRate = (new PhoneNumberDesc())
             ->setNationalNumberPattern('900[2-9]\d{6}')
             ->setExampleNumber('9002345678');
         $this->fixedLine = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:2742|(?:472|983)[2-47-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013-79]|3[0-24679]|4[167]|5[0-3]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-269])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}')
+            ->setNationalNumberPattern('(?:274[27]|(?:472|983)[2-47-9])\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013-79]|3[0-24679]|4[167]|5[0-3]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-269])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[0378]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-3589]|8[04-69]))[2-9]\d{6}')
             ->setExampleNumber('2015550123')
             ->setPossibleLengthLocalOnly([7]);
         $this->numberFormat = [
diff --git a/src/data/ShortNumberMetadata_PY.php b/src/data/ShortNumberMetadata_PY.php
@@ -27,8 +27,8 @@ class ShortNumberMetadata_PY extends PhoneMetadata
     public function __construct()
     {
         $this->generalDesc = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('[159]\d\d(?:\d{4})?')
-            ->setPossibleLength([3, 7]);
+            ->setNationalNumberPattern('[12459]\d\d(?:\d{3,4})?')
+            ->setPossibleLength([3, 6, 7]);
         $this->premiumRate = PhoneNumberDesc::empty();
         $this->tollFree = (new PhoneNumberDesc())
             ->setNationalNumberPattern('128|911')
@@ -39,16 +39,16 @@ public function __construct()
             ->setExampleNumber('128')
             ->setPossibleLength([3]);
         $this->short_code = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:1[01]|51)\d{5}|911|1[1-9]\d')
+            ->setNationalNumberPattern('[1245][01]\d{5}|(?:1[1-9]|[245]0\d{3})\d|911')
             ->setExampleNumber('110');
         $this->standard_rate = PhoneNumberDesc::empty();
         $this->carrierSpecific = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:1[01]|51)\d{5}')
-            ->setExampleNumber('1000000')
-            ->setPossibleLength([7]);
+            ->setNationalNumberPattern('[1245][01]\d{5}|[245]0\d{4}')
+            ->setExampleNumber('200000')
+            ->setPossibleLength([6, 7]);
         $this->smsServices = (new PhoneNumberDesc())
-            ->setNationalNumberPattern('(?:1[01]|51)\d{5}')
-            ->setExampleNumber('1000000')
-            ->setPossibleLength([7]);
+            ->setNationalNumberPattern('[1245][01]\d{5}|[245]0\d{4}')
+            ->setExampleNumber('200000')
+            ->setPossibleLength([6, 7]);
     }
 }
diff --git a/tests/Issues/LocaleTest.php b/tests/Issues/LocaleTest.php
@@ -53,7 +53,7 @@ public function testLocales(string $regionCode, string $countryName): void
         self::assertContains($regionCode, $regions);
 
 
-        self::assertSame($regionCode, $this->phoneUtil->getRegionCodeForNumber($phoneNumber));
+        self::assertSame($regionCode, $this->phoneUtil->getRegionCodeForNumber($phoneNumber), "Checking {$phoneNumber} is part of {$regionCode}");
 
         self::assertSame($countryName, $this->geocoder->getDescriptionForValidNumber($phoneNumber, 'en', 'ZZ'), "Checking {$phoneNumber} is part of {$countryName}");
     }
@@ -310,7 +310,6 @@ private static function getCountryCodes(): array
             'VG' => 'British Virgin Islands',
             'VI' => 'U.S. Virgin Islands',
             'WF' => 'Wallis & Futuna',
-            'EH' => 'Western Sahara',
             'YE' => 'Yemen',
             'ZM' => 'Zambia',
             'ZW' => 'Zimbabwe',
