From 36ed5f87ce9c21d02e8ca0f6fad8c0af8b30cebe Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Fri, 3 Mar 2023 14:12:08 +0000 Subject: [PATCH] Upstream metadata changes from Google for v8.13.7 - Updated phone metadata for region code(s): AG, AI, AS, AU, BB, BM, BS, CC, CN, CX, DM, FR, GD, GG, GU, IM, JE, KN, KY, LC, LI, MG, MK, MP, MQ, MS, RE, RO, SX, TC, TG, TT, US, VC, VG, VI, YT --- METADATA-VERSION.txt | 2 +- src/data/PhoneNumberMetadata_AG.php | 2 +- src/data/PhoneNumberMetadata_AI.php | 2 +- src/data/PhoneNumberMetadata_AS.php | 2 +- src/data/PhoneNumberMetadata_AU.php | 2 +- src/data/PhoneNumberMetadata_BB.php | 2 +- src/data/PhoneNumberMetadata_BM.php | 2 +- src/data/PhoneNumberMetadata_BS.php | 2 +- src/data/PhoneNumberMetadata_CC.php | 2 +- src/data/PhoneNumberMetadata_CN.php | 2 +- src/data/PhoneNumberMetadata_CX.php | 2 +- src/data/PhoneNumberMetadata_DM.php | 2 +- src/data/PhoneNumberMetadata_FR.php | 2 +- src/data/PhoneNumberMetadata_GD.php | 2 +- src/data/PhoneNumberMetadata_GG.php | 2 +- src/data/PhoneNumberMetadata_GU.php | 2 +- src/data/PhoneNumberMetadata_IM.php | 2 +- src/data/PhoneNumberMetadata_JE.php | 2 +- src/data/PhoneNumberMetadata_KN.php | 2 +- src/data/PhoneNumberMetadata_KY.php | 2 +- src/data/PhoneNumberMetadata_LC.php | 2 +- src/data/PhoneNumberMetadata_LI.php | 2 +- src/data/PhoneNumberMetadata_MG.php | 2 +- src/data/PhoneNumberMetadata_MK.php | 2 +- src/data/PhoneNumberMetadata_MP.php | 2 +- src/data/PhoneNumberMetadata_MQ.php | 4 ++-- src/data/PhoneNumberMetadata_MS.php | 2 +- src/data/PhoneNumberMetadata_RE.php | 7 +++---- src/data/PhoneNumberMetadata_RO.php | 2 +- src/data/PhoneNumberMetadata_SX.php | 2 +- src/data/PhoneNumberMetadata_TC.php | 2 +- src/data/PhoneNumberMetadata_TG.php | 2 +- src/data/PhoneNumberMetadata_TT.php | 2 +- src/data/PhoneNumberMetadata_US.php | 4 ++-- src/data/PhoneNumberMetadata_VC.php | 2 +- src/data/PhoneNumberMetadata_VG.php | 6 +++--- src/data/PhoneNumberMetadata_VI.php | 2 +- src/data/PhoneNumberMetadata_YT.php | 8 ++++---- 38 files changed, 47 insertions(+), 48 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index b98bf38d..6eeb2dac 100644 --- 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.6 +v8.13.7 diff --git a/src/data/PhoneNumberMetadata_AG.php b/src/data/PhoneNumberMetadata_AG.php index b08c52d9..7e415476 100644 --- a/src/data/PhoneNumberMetadata_AG.php +++ b/src/data/PhoneNumberMetadata_AG.php @@ -102,7 +102,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([457]\\d{6})$', + 'nationalPrefixForParsing' => '([457]\\d{6})$|1', 'nationalPrefixTransformRule' => '268$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_AI.php b/src/data/PhoneNumberMetadata_AI.php index f532531b..87900872 100644 --- a/src/data/PhoneNumberMetadata_AI.php +++ b/src/data/PhoneNumberMetadata_AI.php @@ -100,7 +100,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2457]\\d{6})$', + 'nationalPrefixForParsing' => '([2457]\\d{6})$|1', 'nationalPrefixTransformRule' => '264$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_AS.php b/src/data/PhoneNumberMetadata_AS.php index 383caf45..a27fce09 100644 --- a/src/data/PhoneNumberMetadata_AS.php +++ b/src/data/PhoneNumberMetadata_AS.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([267]\\d{6})$', + 'nationalPrefixForParsing' => '([267]\\d{6})$|1', 'nationalPrefixTransformRule' => '684$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_AU.php b/src/data/PhoneNumberMetadata_AU.php index b0179d11..1687d31d 100644 --- a/src/data/PhoneNumberMetadata_AU.php +++ b/src/data/PhoneNumberMetadata_AU.php @@ -134,7 +134,7 @@ 'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011', 'preferredInternationalPrefix' => '0011', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|(183[12])', + 'nationalPrefixForParsing' => '(183[12])|0', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => [ diff --git a/src/data/PhoneNumberMetadata_BB.php b/src/data/PhoneNumberMetadata_BB.php index 7eaea8aa..cfee933d 100644 --- a/src/data/PhoneNumberMetadata_BB.php +++ b/src/data/PhoneNumberMetadata_BB.php @@ -106,7 +106,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-9]\\d{6})$', + 'nationalPrefixForParsing' => '([2-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '246$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_BM.php b/src/data/PhoneNumberMetadata_BM.php index 3fa9a585..28605a6d 100644 --- a/src/data/PhoneNumberMetadata_BM.php +++ b/src/data/PhoneNumberMetadata_BM.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-9]\\d{6})$', + 'nationalPrefixForParsing' => '([2-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '441$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_BS.php b/src/data/PhoneNumberMetadata_BS.php index 169920ff..f1f4fe6e 100644 --- a/src/data/PhoneNumberMetadata_BS.php +++ b/src/data/PhoneNumberMetadata_BS.php @@ -100,7 +100,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([3-8]\\d{6})$', + 'nationalPrefixForParsing' => '([3-8]\\d{6})$|1', 'nationalPrefixTransformRule' => '242$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_CC.php b/src/data/PhoneNumberMetadata_CC.php index 460486c4..17361deb 100644 --- a/src/data/PhoneNumberMetadata_CC.php +++ b/src/data/PhoneNumberMetadata_CC.php @@ -122,7 +122,7 @@ 'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011', 'preferredInternationalPrefix' => '0011', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|([59]\\d{7})$', + 'nationalPrefixForParsing' => '([59]\\d{7})$|0', 'nationalPrefixTransformRule' => '8$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_CN.php b/src/data/PhoneNumberMetadata_CN.php index 1c4ff94c..14886c0a 100644 --- a/src/data/PhoneNumberMetadata_CN.php +++ b/src/data/PhoneNumberMetadata_CN.php @@ -139,7 +139,7 @@ 'internationalPrefix' => '00|1(?:[12]\\d|79)\\d\\d00', 'preferredInternationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|(1(?:[12]\\d|79)\\d\\d)', + 'nationalPrefixForParsing' => '(1(?:[12]\\d|79)\\d\\d)|0', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => [ diff --git a/src/data/PhoneNumberMetadata_CX.php b/src/data/PhoneNumberMetadata_CX.php index 3c338185..49354329 100644 --- a/src/data/PhoneNumberMetadata_CX.php +++ b/src/data/PhoneNumberMetadata_CX.php @@ -122,7 +122,7 @@ 'internationalPrefix' => '001[14-689]|14(?:1[14]|34|4[17]|[56]6|7[47]|88)0011', 'preferredInternationalPrefix' => '0011', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|([59]\\d{7})$', + 'nationalPrefixForParsing' => '([59]\\d{7})$|0', 'nationalPrefixTransformRule' => '8$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_DM.php b/src/data/PhoneNumberMetadata_DM.php index 57eadf0d..d37d4900 100644 --- a/src/data/PhoneNumberMetadata_DM.php +++ b/src/data/PhoneNumberMetadata_DM.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-7]\\d{6})$', + 'nationalPrefixForParsing' => '([2-7]\\d{6})$|1', 'nationalPrefixTransformRule' => '767$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_FR.php b/src/data/PhoneNumberMetadata_FR.php index a362700a..48b9d609 100644 --- a/src/data/PhoneNumberMetadata_FR.php +++ b/src/data/PhoneNumberMetadata_FR.php @@ -22,7 +22,7 @@ ], 'mobile' => [ - 'NationalNumberPattern' => '(?:6(?:[0-24-8]\\d|3[0-8]|9[589])|7(?:00|[3-9]\\d))\\d{6}', + 'NationalNumberPattern' => '(?:6(?:[0-24-8]\\d|3[0-8]|9[589])|7[3-9]\\d)\\d{6}', 'ExampleNumber' => '612345678', ], 'tollFree' => diff --git a/src/data/PhoneNumberMetadata_GD.php b/src/data/PhoneNumberMetadata_GD.php index 15173014..2c598336 100644 --- a/src/data/PhoneNumberMetadata_GD.php +++ b/src/data/PhoneNumberMetadata_GD.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-9]\\d{6})$', + 'nationalPrefixForParsing' => '([2-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '473$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_GG.php b/src/data/PhoneNumberMetadata_GG.php index 2cb9eb53..5b18a333 100644 --- a/src/data/PhoneNumberMetadata_GG.php +++ b/src/data/PhoneNumberMetadata_GG.php @@ -119,7 +119,7 @@ 'countryCode' => 44, 'internationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|([25-9]\\d{5})$', + 'nationalPrefixForParsing' => '([25-9]\\d{5})$|0', 'nationalPrefixTransformRule' => '1481$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_GU.php b/src/data/PhoneNumberMetadata_GU.php index d06806e4..5463cb41 100644 --- a/src/data/PhoneNumberMetadata_GU.php +++ b/src/data/PhoneNumberMetadata_GU.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([3-9]\\d{6})$', + 'nationalPrefixForParsing' => '([3-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '671$1', 'sameMobileAndFixedLinePattern' => true, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_IM.php b/src/data/PhoneNumberMetadata_IM.php index d2c00f89..52c97743 100644 --- a/src/data/PhoneNumberMetadata_IM.php +++ b/src/data/PhoneNumberMetadata_IM.php @@ -90,7 +90,7 @@ 'countryCode' => 44, 'internationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|([25-8]\\d{5})$', + 'nationalPrefixForParsing' => '([25-8]\\d{5})$|0', 'nationalPrefixTransformRule' => '1624$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_JE.php b/src/data/PhoneNumberMetadata_JE.php index df42053b..5b25247a 100644 --- a/src/data/PhoneNumberMetadata_JE.php +++ b/src/data/PhoneNumberMetadata_JE.php @@ -88,7 +88,7 @@ 'countryCode' => 44, 'internationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|([0-24-8]\\d{5})$', + 'nationalPrefixForParsing' => '([0-24-8]\\d{5})$|0', 'nationalPrefixTransformRule' => '1534$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_KN.php b/src/data/PhoneNumberMetadata_KN.php index d55a89b2..8a7511f6 100644 --- a/src/data/PhoneNumberMetadata_KN.php +++ b/src/data/PhoneNumberMetadata_KN.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-7]\\d{6})$', + 'nationalPrefixForParsing' => '([2-7]\\d{6})$|1', 'nationalPrefixTransformRule' => '869$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_KY.php b/src/data/PhoneNumberMetadata_KY.php index 52a35f3e..81e85a73 100644 --- a/src/data/PhoneNumberMetadata_KY.php +++ b/src/data/PhoneNumberMetadata_KY.php @@ -96,7 +96,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-9]\\d{6})$', + 'nationalPrefixForParsing' => '([2-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '345$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_LC.php b/src/data/PhoneNumberMetadata_LC.php index 8a331322..c7ac17d8 100644 --- a/src/data/PhoneNumberMetadata_LC.php +++ b/src/data/PhoneNumberMetadata_LC.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-8]\\d{6})$', + 'nationalPrefixForParsing' => '([2-8]\\d{6})$|1', 'nationalPrefixTransformRule' => '758$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_LI.php b/src/data/PhoneNumberMetadata_LI.php index e80afaec..ee378c06 100644 --- a/src/data/PhoneNumberMetadata_LI.php +++ b/src/data/PhoneNumberMetadata_LI.php @@ -101,7 +101,7 @@ 'countryCode' => 423, 'internationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|(1001)', + 'nationalPrefixForParsing' => '(1001)|0', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => [ diff --git a/src/data/PhoneNumberMetadata_MG.php b/src/data/PhoneNumberMetadata_MG.php index fd378dd1..22953374 100644 --- a/src/data/PhoneNumberMetadata_MG.php +++ b/src/data/PhoneNumberMetadata_MG.php @@ -98,7 +98,7 @@ 'countryCode' => 261, 'internationalPrefix' => '00', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0|([24-9]\\d{6})$', + 'nationalPrefixForParsing' => '([24-9]\\d{6})$|0', 'nationalPrefixTransformRule' => '20$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_MK.php b/src/data/PhoneNumberMetadata_MK.php index 68c53ba3..20f7d0e0 100644 --- a/src/data/PhoneNumberMetadata_MK.php +++ b/src/data/PhoneNumberMetadata_MK.php @@ -32,7 +32,7 @@ ], 'mobile' => [ - 'NationalNumberPattern' => '7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|7[015]))\\d{4}', + 'NationalNumberPattern' => '7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}', 'ExampleNumber' => '72345678', ], 'tollFree' => diff --git a/src/data/PhoneNumberMetadata_MP.php b/src/data/PhoneNumberMetadata_MP.php index 0fe91f56..4a9ceca0 100644 --- a/src/data/PhoneNumberMetadata_MP.php +++ b/src/data/PhoneNumberMetadata_MP.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-9]\\d{6})$', + 'nationalPrefixForParsing' => '([2-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '670$1', 'sameMobileAndFixedLinePattern' => true, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_MQ.php b/src/data/PhoneNumberMetadata_MQ.php index 6bd1cd34..64a712b3 100644 --- a/src/data/PhoneNumberMetadata_MQ.php +++ b/src/data/PhoneNumberMetadata_MQ.php @@ -9,7 +9,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '(?:69|80)\\d{7}|(?:59|97)6\\d{6}', + 'NationalNumberPattern' => '596\\d{6}|(?:69|80|9\\d)\\d{7}', 'PossibleLength' => [ 0 => 9, @@ -53,7 +53,7 @@ ], 'voip' => [ - 'NationalNumberPattern' => '976(?:6\\d|7[0-367])\\d{4}', + 'NationalNumberPattern' => '9(?:(?:39|47)7[01]|76(?:6\\d|7[0-367]))\\d{4}', 'ExampleNumber' => '976612345', ], 'pager' => diff --git a/src/data/PhoneNumberMetadata_MS.php b/src/data/PhoneNumberMetadata_MS.php index 58763ecc..36f03a9a 100644 --- a/src/data/PhoneNumberMetadata_MS.php +++ b/src/data/PhoneNumberMetadata_MS.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([34]\\d{6})$', + 'nationalPrefixForParsing' => '([34]\\d{6})$|1', 'nationalPrefixTransformRule' => '664$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_RE.php b/src/data/PhoneNumberMetadata_RE.php index b9b464ae..4e131001 100644 --- a/src/data/PhoneNumberMetadata_RE.php +++ b/src/data/PhoneNumberMetadata_RE.php @@ -9,7 +9,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '976\\d{6}|(?:26|[68]\\d)\\d{7}', + 'NationalNumberPattern' => '(?:26|[689]\\d)\\d{7}', 'PossibleLength' => [ 0 => 9, @@ -17,12 +17,12 @@ ], 'fixedLine' => [ - 'NationalNumberPattern' => '26(?:2\\d\\d|3(?:0\\d|1[0-2]))\\d{4}', + 'NationalNumberPattern' => '26(?:2\\d\\d|3(?:0\\d|1[0-3]))\\d{4}', 'ExampleNumber' => '262161234', ], 'mobile' => [ - 'NationalNumberPattern' => '(?:69(?:2\\d\\d|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|6[0-6]|7[0-27]|8[0-8]|9[0-479]))|976(?:2[27]|3[0-37]|9\\d))\\d{4}', + 'NationalNumberPattern' => '(?:69(?:2\\d\\d|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|6[0-6]|7[0-27]|8[0-8]|9[0-479]))|9(?:399[0-2]|4790|76(?:2[27]|3[0-37]|9\\d)))\\d{4}', 'ExampleNumber' => '692123456', ], 'tollFree' => @@ -104,6 +104,5 @@ ], ], 'mainCountryForCode' => true, - 'leadingDigits' => '26[23]|69|[89]', 'mobileNumberPortableRegion' => false, ]; diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php index 4f62a9b7..1b0364f9 100644 --- a/src/data/PhoneNumberMetadata_RO.php +++ b/src/data/PhoneNumberMetadata_RO.php @@ -23,7 +23,7 @@ ], 'mobile' => [ - 'NationalNumberPattern' => '7020\\d{5}|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[019])\\d{6}', + 'NationalNumberPattern' => '7020\\d{5}|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-29])\\d{6}', 'ExampleNumber' => '712034567', 'PossibleLength' => [ diff --git a/src/data/PhoneNumberMetadata_SX.php b/src/data/PhoneNumberMetadata_SX.php index b7b5027a..ccfe7a6f 100644 --- a/src/data/PhoneNumberMetadata_SX.php +++ b/src/data/PhoneNumberMetadata_SX.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|(5\\d{6})$', + 'nationalPrefixForParsing' => '(5\\d{6})$|1', 'nationalPrefixTransformRule' => '721$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_TC.php b/src/data/PhoneNumberMetadata_TC.php index e5206998..3781c3d4 100644 --- a/src/data/PhoneNumberMetadata_TC.php +++ b/src/data/PhoneNumberMetadata_TC.php @@ -100,7 +100,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-479]\\d{6})$', + 'nationalPrefixForParsing' => '([2-479]\\d{6})$|1', 'nationalPrefixTransformRule' => '649$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_TG.php b/src/data/PhoneNumberMetadata_TG.php index ed912e76..b78ce607 100644 --- a/src/data/PhoneNumberMetadata_TG.php +++ b/src/data/PhoneNumberMetadata_TG.php @@ -22,7 +22,7 @@ ], 'mobile' => [ - 'NationalNumberPattern' => '(?:7[09]|9[0-36-9])\\d{6}', + 'NationalNumberPattern' => '(?:7[019]|9[0-36-9])\\d{6}', 'ExampleNumber' => '90112345', ], 'tollFree' => diff --git a/src/data/PhoneNumberMetadata_TT.php b/src/data/PhoneNumberMetadata_TT.php index c8b225b2..2015e119 100644 --- a/src/data/PhoneNumberMetadata_TT.php +++ b/src/data/PhoneNumberMetadata_TT.php @@ -100,7 +100,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-46-8]\\d{6})$', + 'nationalPrefixForParsing' => '([2-46-8]\\d{6})$|1', 'nationalPrefixTransformRule' => '868$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php index e9919d5f..e7ce5420 100644 --- a/src/data/PhoneNumberMetadata_US.php +++ b/src/data/PhoneNumberMetadata_US.php @@ -21,7 +21,7 @@ ], 'fixedLine' => [ - 'NationalNumberPattern' => '505(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|4[46]))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[0-2]|6[014]|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-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|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-389]|8[04-69]))[2-9]\\d{6}', + 'NationalNumberPattern' => '(?:47220[01]|5(?:05(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|4[46]))|57200))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[0-2]|6[014]|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-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|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-389]|8[04-69]))[2-9]\\d{6}', 'ExampleNumber' => '2015550123', 'PossibleLengthLocalOnly' => [ @@ -30,7 +30,7 @@ ], 'mobile' => [ - 'NationalNumberPattern' => '505(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|4[46]))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[0-2]|6[014]|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-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|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-389]|8[04-69]))[2-9]\\d{6}', + 'NationalNumberPattern' => '(?:47220[01]|5(?:05(?:[2-57-9]\\d\\d|6(?:[0-35-9]\\d|4[46]))|57200))\\d{4}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[0-2]|6[014]|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-47-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|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-389]|8[04-69]))[2-9]\\d{6}', 'ExampleNumber' => '2015550123', 'PossibleLengthLocalOnly' => [ diff --git a/src/data/PhoneNumberMetadata_VC.php b/src/data/PhoneNumberMetadata_VC.php index cf9d3872..98e65eaf 100644 --- a/src/data/PhoneNumberMetadata_VC.php +++ b/src/data/PhoneNumberMetadata_VC.php @@ -100,7 +100,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-7]\\d{6})$', + 'nationalPrefixForParsing' => '([2-7]\\d{6})$|1', 'nationalPrefixTransformRule' => '784$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_VG.php b/src/data/PhoneNumberMetadata_VG.php index a43f98aa..d9a3ca01 100644 --- a/src/data/PhoneNumberMetadata_VG.php +++ b/src/data/PhoneNumberMetadata_VG.php @@ -21,7 +21,7 @@ ], 'fixedLine' => [ - 'NationalNumberPattern' => '284496[0-5]\\d{3}|284(?:229|4(?:22|9[45])|774|8(?:52|6[459]))\\d{4}', + 'NationalNumberPattern' => '284(?:229|4(?:22|9[45])|774|8(?:52|6[459]))\\d{4}', 'ExampleNumber' => '2842291234', 'PossibleLengthLocalOnly' => [ @@ -30,7 +30,7 @@ ], 'mobile' => [ - 'NationalNumberPattern' => '284496[6-9]\\d{3}|284(?:245|3(?:0[0-3]|4[0-7]|68|9[34])|4(?:4[0-6]|68|99)|5(?:4[0-7]|68|9[69]))\\d{4}', + 'NationalNumberPattern' => '284(?:245|3(?:0[0-3]|4[0-7]|68|9[34])|4(?:4[0-6]|68|9[69])|5(?:4[0-7]|68|9[69]))\\d{4}', 'ExampleNumber' => '2843001234', 'PossibleLengthLocalOnly' => [ @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-578]\\d{6})$', + 'nationalPrefixForParsing' => '([2-578]\\d{6})$|1', 'nationalPrefixTransformRule' => '284$1', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_VI.php b/src/data/PhoneNumberMetadata_VI.php index eb0ded09..191bf309 100644 --- a/src/data/PhoneNumberMetadata_VI.php +++ b/src/data/PhoneNumberMetadata_VI.php @@ -98,7 +98,7 @@ 'countryCode' => 1, 'internationalPrefix' => '011', 'nationalPrefix' => '1', - 'nationalPrefixForParsing' => '1|([2-9]\\d{6})$', + 'nationalPrefixForParsing' => '([2-9]\\d{6})$|1', 'nationalPrefixTransformRule' => '340$1', 'sameMobileAndFixedLinePattern' => true, 'numberFormat' => diff --git a/src/data/PhoneNumberMetadata_YT.php b/src/data/PhoneNumberMetadata_YT.php index de3b3062..476418a9 100644 --- a/src/data/PhoneNumberMetadata_YT.php +++ b/src/data/PhoneNumberMetadata_YT.php @@ -9,7 +9,7 @@ return [ 'generalDesc' => [ - 'NationalNumberPattern' => '80\\d{7}|(?:26|63)9\\d{6}', + 'NationalNumberPattern' => '(?:(?:(?:26|63)9|80\\d)\\d\\d|93980)\\d{4}', 'PossibleLength' => [ 0 => 9, @@ -17,12 +17,12 @@ ], 'fixedLine' => [ - 'NationalNumberPattern' => '269(?:0[0-367]|5[0-3]|6\\d|[78]0)\\d{4}', + 'NationalNumberPattern' => '269(?:0[0-467]|5[0-3]|6\\d|[78]0)\\d{4}', 'ExampleNumber' => '269601234', ], 'mobile' => [ - 'NationalNumberPattern' => '639(?:0[0-79]|1[019]|[267]\\d|3[09]|40|5[05-9]|9[04-79])\\d{4}', + 'NationalNumberPattern' => '(?:639(?:0[0-79]|1[019]|[267]\\d|3[09]|40|5[05-9]|9[04-79])|93980)\\d{4}', 'ExampleNumber' => '639012345', ], 'tollFree' => @@ -96,6 +96,6 @@ [ ], 'mainCountryForCode' => false, - 'leadingDigits' => '269|63', + 'leadingDigits' => '269|63|9398', 'mobileNumberPortableRegion' => false, ];