From e0fcbaa7f1560af5dcb60a4b4514e4a55c4e1741 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 2 Sep 2024 11:55:30 +0100 Subject: [PATCH] Upstream metadata changes from Google for v8.13.44 - Updated phone metadata for region code(s): BF, CD, GM, NG, RO, SG, SN, TJ, UY - Updated short number metadata for region code(s): CA --- METADATA-VERSION.php | 2 +- src/data/PhoneNumberMetadata_BF.php | 2 +- src/data/PhoneNumberMetadata_CD.php | 28 +++++++++++++++++++++++-- src/data/PhoneNumberMetadata_GM.php | 2 +- src/data/PhoneNumberMetadata_NG.php | 32 ++++++----------------------- src/data/PhoneNumberMetadata_RO.php | 2 +- src/data/PhoneNumberMetadata_SG.php | 2 +- src/data/PhoneNumberMetadata_SN.php | 2 +- src/data/PhoneNumberMetadata_TJ.php | 2 +- src/data/PhoneNumberMetadata_UY.php | 2 +- src/data/ShortNumberMetadata_CA.php | 8 +++----- 11 files changed, 43 insertions(+), 41 deletions(-) diff --git a/METADATA-VERSION.php b/METADATA-VERSION.php index 03b278e2..61101f11 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.43'; +return 'v8.13.44'; diff --git a/src/data/PhoneNumberMetadata_BF.php b/src/data/PhoneNumberMetadata_BF.php index 39e1a883..7c5a26fe 100644 --- a/src/data/PhoneNumberMetadata_BF.php +++ b/src/data/PhoneNumberMetadata_BF.php @@ -20,7 +20,7 @@ 'example' => '20491234', ], 'mobile' => [ - 'pattern' => '(?:0[1-35-7]|5[0-8]|[67]\\d)\\d{6}', + 'pattern' => '(?:0[1-7]|5[0-8]|[67]\\d)\\d{6}', 'example' => '70123456', ], 'tollFree' => [ diff --git a/src/data/PhoneNumberMetadata_CD.php b/src/data/PhoneNumberMetadata_CD.php index 86777250..a77f1c5c 100644 --- a/src/data/PhoneNumberMetadata_CD.php +++ b/src/data/PhoneNumberMetadata_CD.php @@ -10,19 +10,25 @@ 'id' => 'CD', 'countryCode' => 243, 'generalDesc' => [ - 'pattern' => '[189]\\d{8}|[1-68]\\d{6}', + 'pattern' => '(?:(?:[189]|5\\d)\\d|2)\\d{7}|[1-68]\\d{6}', 'posLength' => [ 7, + 8, 9, + 10, ], ], 'fixedLine' => [ - 'pattern' => '12\\d{7}|[1-6]\\d{6}', + 'pattern' => '(?:(?:12|573)\\d\\d|276)\\d{5}|[1-6]\\d{6}', 'example' => '1234567', ], 'mobile' => [ 'pattern' => '88\\d{5}|(?:8[0-69]|9[017-9])\\d{7}', 'example' => '991234567', + 'posLength' => [ + 7, + 9, + ], ], 'tollFree' => [ 'posLength' => [ @@ -91,6 +97,15 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ], + [ + 'pattern' => '(\\d{2})(\\d{2})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => [ + '2', + ], + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + ], [ 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -109,5 +124,14 @@ 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', ], + [ + 'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3 $4', + 'leadingDigitsPatterns' => [ + '5', + ], + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + ], ], ]; diff --git a/src/data/PhoneNumberMetadata_GM.php b/src/data/PhoneNumberMetadata_GM.php index 2f6c859a..cb17b7be 100644 --- a/src/data/PhoneNumberMetadata_GM.php +++ b/src/data/PhoneNumberMetadata_GM.php @@ -20,7 +20,7 @@ 'example' => '5661234', ], 'mobile' => [ - 'pattern' => '(?:[23679]\\d|5[0-489])\\d{5}', + 'pattern' => '(?:[23679]\\d|4[015]|5[0-489])\\d{5}', 'example' => '3012345', ], 'tollFree' => [ diff --git a/src/data/PhoneNumberMetadata_NG.php b/src/data/PhoneNumberMetadata_NG.php index 9295e341..1b25adac 100644 --- a/src/data/PhoneNumberMetadata_NG.php +++ b/src/data/PhoneNumberMetadata_NG.php @@ -10,9 +10,8 @@ 'id' => 'NG', 'countryCode' => 234, 'generalDesc' => [ - 'pattern' => '2[0-24-9]\\d{8}|[78]\\d{10,13}|[7-9]\\d{9}|[1-9]\\d{7}|[124-7]\\d{6}', + 'pattern' => '38\\d{6}|[78]\\d{9,13}|(?:20|9\\d)\\d{8}', 'posLength' => [ - 7, 8, 10, 11, @@ -21,21 +20,20 @@ 14, ], 'posLengthLocal' => [ - 5, 6, + 7, ], ], 'fixedLine' => [ - 'pattern' => '20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])\\d{6}|(?:(?:[1-356]\\d|4[02-8]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|7(?:0(?:[013-689]\\d|2[0-24-9])\\d{3,4}|[1-79]\\d{6})|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[1-3578])\\d{5}', - 'example' => '18040123', + 'pattern' => '(?:20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])|38)\\d{6}', + 'example' => '2033123456', 'posLength' => [ - 7, 8, 10, ], 'posLengthLocal' => [ - 5, 6, + 7, ], ], 'mobile' => [ @@ -106,29 +104,11 @@ 'nationalPrefix' => '0', 'nationalPrefixForParsing' => '0', 'numberFormat' => [ - [ - 'pattern' => '(\\d{2})(\\d{2})(\\d{3})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => [ - '78', - ], - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - ], - [ - 'pattern' => '(\\d)(\\d{3})(\\d{3,4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => [ - '[12]|9(?:0[3-9]|[1-9])', - ], - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - ], [ 'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => [ - '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]', + '3', ], 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php index 328be661..d40d27fd 100644 --- a/src/data/PhoneNumberMetadata_RO.php +++ b/src/data/PhoneNumberMetadata_RO.php @@ -21,7 +21,7 @@ 'example' => '211234567', ], 'mobile' => [ - 'pattern' => '(?:630|702)0\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', + 'pattern' => '(?:630|702)0\\d{5}|(?:6(?:00|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', 'example' => '712034567', 'posLength' => [ 9, diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index adc0a35d..2cc248ca 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -25,7 +25,7 @@ ], ], 'mobile' => [ - '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}', + '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}', 'example' => '81234567', 'posLength' => [ 8, diff --git a/src/data/PhoneNumberMetadata_SN.php b/src/data/PhoneNumberMetadata_SN.php index 076bad14..b9f6acaf 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(?:01|[19]0|25|[38]3|[4-7]\\d))\\d{5}', + 'pattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', 'example' => '701234567', ], 'tollFree' => [ diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index 5f88c6b8..3d3f99bf 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -32,7 +32,7 @@ ], ], 'mobile' => [ - '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}', + 'pattern' => '(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:[09]\\d|1[017]|2[02]|[34]0|5[05]|7[01578]|8[078])\\d{7}', 'example' => '917123456', ], 'tollFree' => [ diff --git a/src/data/PhoneNumberMetadata_UY.php b/src/data/PhoneNumberMetadata_UY.php index 3cac6098..ffb2b38a 100644 --- a/src/data/PhoneNumberMetadata_UY.php +++ b/src/data/PhoneNumberMetadata_UY.php @@ -23,7 +23,7 @@ ], ], 'fixedLine' => [ - 'pattern' => '(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}', + 'pattern' => '(?:1(?:770|9(?:20|[89]7))|(?:2\\d|4[2-7])\\d\\d)\\d{4}', 'example' => '21231234', 'posLength' => [ 8, diff --git a/src/data/ShortNumberMetadata_CA.php b/src/data/ShortNumberMetadata_CA.php index 23528238..9c2ddc73 100644 --- a/src/data/ShortNumberMetadata_CA.php +++ b/src/data/ShortNumberMetadata_CA.php @@ -10,12 +10,11 @@ 'id' => 'CA', 'countryCode' => 0, 'generalDesc' => [ - 'pattern' => '[1-9]\\d\\d(?:\\d\\d(?:\\d(?:\\d{2})?)?)?', + 'pattern' => '[1-9]\\d\\d(?:\\d{2,3})?', 'posLength' => [ 3, 5, 6, - 8, ], ], 'tollFree' => [ @@ -38,7 +37,7 @@ ], ], 'shortCode' => [ - 'pattern' => '112|30000\\d{3}|[1-35-9]\\d{4,5}|[2-8]11|9(?:11|88)', + 'pattern' => '[1-35-9]\\d{4,5}|112|[2-8]11|9(?:11|88)', 'example' => '112', ], 'standardRate' => [ @@ -54,12 +53,11 @@ ], ], 'smsServices' => [ - 'pattern' => '300\\d{5}|[1-35-9]\\d{4,5}', + 'pattern' => '[1-35-9]\\d{4,5}', 'example' => '10000', 'posLength' => [ 5, 6, - 8, ], ], 'internationalPrefix' => '',