From 692ea72b86e607b5a8d37f7d087e005225cddd78 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 29 Jul 2024 08:16:35 +0100 Subject: [PATCH] Upstream metadata changes from Google for v8.13.42 - Updated phone metadata for region code(s): BO, GY, KR, LA, MY, SC, SG, TJ, VI - Updated short number metadata for region code(s): AT, DE --- METADATA-VERSION.php | 2 +- src/data/PhoneNumberMetadata_BO.php | 11 ++++++++--- src/data/PhoneNumberMetadata_GY.php | 2 +- src/data/PhoneNumberMetadata_KR.php | 6 +++--- src/data/PhoneNumberMetadata_LA.php | 5 ++--- src/data/PhoneNumberMetadata_MY.php | 2 +- src/data/PhoneNumberMetadata_SC.php | 7 +++---- src/data/PhoneNumberMetadata_SG.php | 2 +- src/data/PhoneNumberMetadata_TJ.php | 4 ++-- src/data/PhoneNumberMetadata_VI.php | 4 ++-- src/data/ShortNumberMetadata_AT.php | 10 +++------- src/data/ShortNumberMetadata_DE.php | 9 ++++++--- 12 files changed, 33 insertions(+), 31 deletions(-) diff --git a/METADATA-VERSION.php b/METADATA-VERSION.php index 700d306b..c51943af 100644 --- a/METADATA-VERSION.php +++ b/METADATA-VERSION.php @@ -5,4 +5,4 @@ * For more information, look at the phing tasks in build.xml * @internal */ -return 'v8.13.41'; +return 'v8.13.42'; diff --git a/src/data/PhoneNumberMetadata_BO.php b/src/data/PhoneNumberMetadata_BO.php index 02a96a2f..b1740338 100644 --- a/src/data/PhoneNumberMetadata_BO.php +++ b/src/data/PhoneNumberMetadata_BO.php @@ -10,7 +10,7 @@ 'id' => 'BO', 'countryCode' => 591, 'generalDesc' => [ - 'pattern' => '(?:[2-467]\\d\\d|8001)\\d{5}', + 'pattern' => '8001\\d{5}|(?:[2-467]\\d|50)\\d{6}', 'posLength' => [ 8, 9, @@ -59,8 +59,13 @@ ], ], 'voip' => [ + 'pattern' => '50\\d{6}', + 'example' => '50123456', 'posLength' => [ - -1, + 8, + ], + 'posLengthLocal' => [ + 7, ], ], 'pager' => [ @@ -92,7 +97,7 @@ 'pattern' => '(\\d)(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '[23]|4[46]', + '[235]|4[46]', ], 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '0$CC $1', diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php index 82f3a70f..91141f25 100644 --- a/src/data/PhoneNumberMetadata_GY.php +++ b/src/data/PhoneNumberMetadata_GY.php @@ -20,7 +20,7 @@ 'example' => '2201234', ], 'mobile' => [ - 'pattern' => '(?:510|6\\d\\d|7(?:[0135]\\d|2[0-8]|4[0-24-9]))\\d{4}', + 'pattern' => '510\\d{4}|(?:6\\d|7[0-5])\\d{5}', 'example' => '6091234', ], 'tollFree' => [ diff --git a/src/data/PhoneNumberMetadata_KR.php b/src/data/PhoneNumberMetadata_KR.php index a6d5b316..925e9631 100644 --- a/src/data/PhoneNumberMetadata_KR.php +++ b/src/data/PhoneNumberMetadata_KR.php @@ -53,7 +53,7 @@ ], ], 'tollFree' => [ - 'pattern' => '00(?:308\\d{6,7}|798\\d{7,9})|(?:00368|80)\\d{7}', + 'pattern' => '00(?:308\\d{6,7}|798\\d{7,9})|(?:00368|[38]0)\\d{7}', 'example' => '801234567', 'posLength' => [ 9, @@ -165,7 +165,7 @@ 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => [ - '60|8', + '[36]0|8', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '0$CC-$1', @@ -258,7 +258,7 @@ 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1-$2-$3', 'leadingDigitsPatterns' => [ - '60|8', + '[36]0|8', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '0$CC-$1', diff --git a/src/data/PhoneNumberMetadata_LA.php b/src/data/PhoneNumberMetadata_LA.php index 951044d1..cfff4f92 100644 --- a/src/data/PhoneNumberMetadata_LA.php +++ b/src/data/PhoneNumberMetadata_LA.php @@ -31,10 +31,9 @@ ], ], 'mobile' => [ - 'pattern' => '(?:20(?:[23579]\\d|88)|30(?:2\\d|4))\\d{6}', + 'pattern' => '208[78]\\d{6}|(?:20[23579]|30[24])\\d{7}', 'example' => '2023123456', 'posLength' => [ - 9, 10, ], ], @@ -102,7 +101,7 @@ 'pattern' => '(\\d{2})(\\d{2})(\\d{2})(\\d{3})', 'format' => '$1 $2 $3 $4', 'leadingDigitsPatterns' => [ - '30[013-9]', + '30[0135-9]', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_MY.php b/src/data/PhoneNumberMetadata_MY.php index 4e3ee28c..f54fcef8 100644 --- a/src/data/PhoneNumberMetadata_MY.php +++ b/src/data/PhoneNumberMetadata_MY.php @@ -22,7 +22,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:3(?:2[0-36-9]|3[0-368]|4[0-278]|5[0-24-8]|6[0-467]|7[1246-9]|8\\d|9[0-57])\\d|4(?:2[0-689]|[3-79]\\d|8[1-35689])|5(?:2[0-589]|[3468]\\d|5[0-489]|7[1-9]|9[23])|6(?:2[2-9]|3[1357-9]|[46]\\d|5[0-6]|7[0-35-9]|85|9[015-8])|7(?:[2579]\\d|3[03-68]|4[0-8]|6[5-9]|8[0-35-9])|8(?:[24][2-8]|3[2-5]|5[2-7]|6[2-589]|7[2-578]|[89][2-9])|9(?:0[57]|13|[25-7]\\d|[3489][0-8]))\\d{5}', + 'pattern' => '4270\\d{4}|(?:3(?:2[0-36-9]|3[0-368]|4[0-278]|5[0-24-8]|6[0-467]|7[1246-9]|8\\d|9[0-57])\\d|4(?:2[0-689]|[3-79]\\d|8[1-35689])|5(?:2[0-589]|[3468]\\d|5[0-489]|7[1-9]|9[23])|6(?:2[2-9]|3[1357-9]|[46]\\d|5[0-6]|7[0-35-9]|85|9[015-8])|7(?:[2579]\\d|3[03-68]|4[0-8]|6[5-9]|8[0-35-9])|8(?:[24][2-8]|3[2-5]|5[2-7]|6[2-589]|7[2-578]|[89][2-9])|9(?:0[57]|13|[25-7]\\d|[3489][0-8]))\\d{5}', 'example' => '323856789', 'posLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_SC.php b/src/data/PhoneNumberMetadata_SC.php index 4bb3f849..3fd45420 100644 --- a/src/data/PhoneNumberMetadata_SC.php +++ b/src/data/PhoneNumberMetadata_SC.php @@ -10,7 +10,7 @@ 'id' => 'SC', 'countryCode' => 248, 'generalDesc' => [ - 'pattern' => '800\\d{4}|(?:[249]\\d|64)\\d{5}', + 'pattern' => '(?:[2489]\\d|64)\\d{5}', 'posLength' => [ 7, ], @@ -28,9 +28,8 @@ 'example' => '8000000', ], 'premiumRate' => [ - 'posLength' => [ - -1, - ], + 'pattern' => '85\\d{5}', + 'example' => '8512345', ], 'sharedCost' => [ 'posLength' => [ diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index cdfeae50..adc0a35d 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -25,7 +25,7 @@ ], ], 'mobile' => [ - 'pattern' => '8(?:09[0-6]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', + 'pattern' => '8(?:09[0-68]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', 'example' => '81234567', 'posLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index 9ae74d2c..5f88c6b8 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -32,7 +32,7 @@ ], ], 'mobile' => [ - 'pattern' => '(?:4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[01578]|8[078]|9\\d)\\d{7}', + 'pattern' => '(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[01578]|8[078]|9\\d)\\d{7}', 'example' => '917123456', ], 'tollFree' => [ @@ -106,7 +106,7 @@ 'pattern' => '(\\d{4})(\\d)(\\d{4})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => [ - '3[1-5]', + '3(?:[1245]|3[12])', ], 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_VI.php b/src/data/PhoneNumberMetadata_VI.php index 9b9ca5fc..fbdb75a7 100644 --- a/src/data/PhoneNumberMetadata_VI.php +++ b/src/data/PhoneNumberMetadata_VI.php @@ -19,14 +19,14 @@ ], ], 'fixedLine' => [ - 'pattern' => '340(?:2(?:0\\d|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}', + 'pattern' => '340(?:2(?:0\\d|10|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}', 'example' => '3406421234', 'posLengthLocal' => [ 7, ], ], 'mobile' => [ - 'pattern' => '340(?:2(?:0\\d|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}', + 'pattern' => '340(?:2(?:0\\d|10|2[06-8]|4[49]|77)|3(?:32|44)|4(?:2[23]|44|7[34]|89)|5(?:1[34]|55)|6(?:2[56]|4[23]|77|9[023])|7(?:1[2-57-9]|2[57]|7\\d)|884|998)\\d{4}', 'example' => '3406421234', 'posLengthLocal' => [ 7, diff --git a/src/data/ShortNumberMetadata_AT.php b/src/data/ShortNumberMetadata_AT.php index aa1d7473..925f836d 100644 --- a/src/data/ShortNumberMetadata_AT.php +++ b/src/data/ShortNumberMetadata_AT.php @@ -10,7 +10,7 @@ 'id' => 'AT', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '[168]\\d\\d(?:\\d(?:\\d{2})?)?', + 'pattern' => '[1268]\\d\\d(?:\\d(?:\\d{2})?)?', 'posLength' => [ 3, 4, @@ -34,7 +34,7 @@ ], ], 'shortCode' => [ - 'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:17|23)))|2[0238]|3[03]|4(?:[0-247]|5[05]|84))|(?:61|8108[1-3])0', + 'pattern' => '1(?:1(?:2|6(?:00[06]|1(?:17|23)))|2[0238]|3[03]|4(?:[0-247]|5[05]|84))|(?:220|61|8108[1-3])0', 'example' => '112', ], 'standardRate' => [ @@ -43,12 +43,8 @@ ], ], 'carrierSpecific' => [ - 'pattern' => '610|810\\d{3}', + 'pattern' => '(?:220|810\\d\\d)\\d|610', 'example' => '610', - 'posLength' => [ - 3, - 6, - ], ], 'smsServices' => [ 'posLength' => [ diff --git a/src/data/ShortNumberMetadata_DE.php b/src/data/ShortNumberMetadata_DE.php index 5e6bbba8..ea241cda 100644 --- a/src/data/ShortNumberMetadata_DE.php +++ b/src/data/ShortNumberMetadata_DE.php @@ -10,9 +10,10 @@ 'id' => 'DE', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '1\\d\\d(?:\\d{2,3})?', + 'pattern' => '[13]\\d{2,5}', 'posLength' => [ 3, + 4, 5, 6, ], @@ -38,7 +39,7 @@ ], ], 'shortCode' => [ - 'pattern' => '11(?:[025]|6(?:00[06]|1(?:1[167]|23))|800\\d)|118\\d\\d', + 'pattern' => '11(?:[025]|6(?:00[06]|1(?:1[167]|23))|800\\d)|3311|118\\d\\d', 'example' => '110', ], 'standardRate' => [ @@ -47,8 +48,10 @@ ], ], 'carrierSpecific' => [ + 'pattern' => '331\\d', + 'example' => '3310', 'posLength' => [ - -1, + 4, ], ], 'smsServices' => [