From 0bb70df41c39a05191701e5be467d40c5cbba9a8 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Wed, 25 Sep 2024 09:47:00 +0100 Subject: [PATCH] Upstream metadata changes from Google for v8.13.46 - Updated phone metadata for region code(s): CO, HK, PA, PE, SG, SN, UZ - Updated short number metadata for region code(s): UY --- METADATA-VERSION.php | 2 +- src/data/PhoneNumberMetadata_CO.php | 11 ++++------- src/data/PhoneNumberMetadata_HK.php | 2 +- src/data/PhoneNumberMetadata_PA.php | 2 +- src/data/PhoneNumberMetadata_PE.php | 2 +- src/data/PhoneNumberMetadata_SG.php | 2 +- src/data/PhoneNumberMetadata_SN.php | 2 +- src/data/PhoneNumberMetadata_UZ.php | 4 ++-- src/data/ShortNumberMetadata_UY.php | 5 +++-- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/METADATA-VERSION.php b/METADATA-VERSION.php index e0534fc3..78a21074 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.45'; +return 'v8.13.46'; diff --git a/src/data/PhoneNumberMetadata_CO.php b/src/data/PhoneNumberMetadata_CO.php index 0fc82279..4b8de98e 100644 --- a/src/data/PhoneNumberMetadata_CO.php +++ b/src/data/PhoneNumberMetadata_CO.php @@ -10,7 +10,7 @@ 'id' => 'CO', 'countryCode' => 57, 'generalDesc' => [ - 'pattern' => '(?:60\\d\\d|9101)\\d{6}|(?:1\\d|3)\\d{9}', + 'pattern' => '60\\d{8}|(?:1\\d|[39])\\d{9}', 'posLength' => [ 10, 11, @@ -44,11 +44,8 @@ ], ], 'premiumRate' => [ - 'pattern' => '19(?:0[01]|4[78])\\d{7}', + 'pattern' => '(?:19(?:0[01]|4[78])|901)\\d{7}', 'example' => '19001234567', - 'posLength' => [ - 11, - ], ], 'sharedCost' => [ 'posLength' => [ @@ -93,7 +90,7 @@ 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '6', + '6|90', ], 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', @@ -122,7 +119,7 @@ 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', 'leadingDigitsPatterns' => [ - '6', + '6|90', ], 'nationalPrefixFormattingRule' => '($1)', 'domesticCarrierCodeFormattingRule' => '0$CC $1', diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php index f3b4a40c..d43e6363 100644 --- a/src/data/PhoneNumberMetadata_HK.php +++ b/src/data/PhoneNumberMetadata_HK.php @@ -28,7 +28,7 @@ ], ], 'mobile' => [ - 'pattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[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}', + 'pattern' => '(?: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}', 'example' => '51234567', 'posLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_PA.php b/src/data/PhoneNumberMetadata_PA.php index b7f90dcb..ad0b7e23 100644 --- a/src/data/PhoneNumberMetadata_PA.php +++ b/src/data/PhoneNumberMetadata_PA.php @@ -19,7 +19,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[089]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068]|7[0-8])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}', + 'pattern' => '(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[07-9]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}', 'example' => '2001234', 'posLength' => [ 7, diff --git a/src/data/PhoneNumberMetadata_PE.php b/src/data/PhoneNumberMetadata_PE.php index bb25b45f..8ac9a48b 100644 --- a/src/data/PhoneNumberMetadata_PE.php +++ b/src/data/PhoneNumberMetadata_PE.php @@ -21,7 +21,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:(?:4[34]|5[14])[0-8]\\d|7(?:173|3[0-8]\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}', + 'pattern' => '(?:(?:(?:4[34]|5[14])[0-8]|687)\\d|7(?:173|(?:3[0-8]|55)\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[0569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}', 'example' => '11234567', 'posLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index 2cc248ca..8c2e2bc9 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -25,7 +25,7 @@ ], ], 'mobile' => [ - 'pattern' => '8(?:09[0-689]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', + 'pattern' => '(?:8(?:0(?:[1-8]\\d|9[0-689])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-3]|62))|9[0-8]\\d\\d)\\d{4}', 'example' => '81234567', 'posLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_SN.php b/src/data/PhoneNumberMetadata_SN.php index b9f6acaf..c884a260 100644 --- a/src/data/PhoneNumberMetadata_SN.php +++ b/src/data/PhoneNumberMetadata_SN.php @@ -20,7 +20,7 @@ 'example' => '301012345', ], 'mobile' => [ - 'pattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', + 'pattern' => '7(?:(?:[06-8]\\d|[19]0|21)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', 'example' => '701234567', ], 'tollFree' => [ diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php index 72c25354..2bfad464 100644 --- a/src/data/PhoneNumberMetadata_UZ.php +++ b/src/data/PhoneNumberMetadata_UZ.php @@ -16,11 +16,11 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}', + 'pattern' => '(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|[69]\\d\\d|7(?:[23]\\d|7[69]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}', 'example' => '669050123', ], 'mobile' => [ - 'pattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}', + 'pattern' => '(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079])))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}', 'example' => '912345678', ], 'tollFree' => [ diff --git a/src/data/ShortNumberMetadata_UY.php b/src/data/ShortNumberMetadata_UY.php index 59cc2743..c8475f6c 100644 --- a/src/data/ShortNumberMetadata_UY.php +++ b/src/data/ShortNumberMetadata_UY.php @@ -10,10 +10,11 @@ 'id' => 'UY', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '[19]\\d{2,3}', + 'pattern' => '[129]\\d{2,4}', 'posLength' => [ 3, 4, + 5, ], ], 'tollFree' => [ @@ -36,7 +37,7 @@ ], ], 'shortCode' => [ - 'pattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787)|911', + 'pattern' => '1(?:0[4-9]|1[2368]|2[0-3568]|787|997\\d?)|21997|911', 'example' => '104', ], 'standardRate' => [