Skip to content

Commit

Permalink
Merge pull request #510 from giggsey/upstream-8.12.49
Browse files Browse the repository at this point in the history
Upstream metadata changes from Google for v8.12.49
  • Loading branch information
giggsey committed May 27, 2022
2 parents 52c0142 + c96af82 commit 9f0b214
Show file tree
Hide file tree
Showing 19 changed files with 586 additions and 53 deletions.
2 changes: 1 addition & 1 deletion METADATA-VERSION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.48
v8.12.49
1 change: 1 addition & 0 deletions src/carrier/data/en/237.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/

return array (
23762 => 'Camtel',
237650 => 'MTN Cameroon',
237651 => 'MTN Cameroon',
237652 => 'MTN Cameroon',
Expand Down
1 change: 1 addition & 0 deletions src/carrier/data/en/675.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
67577 => 'bmobile',
67578 => 'bmobile',
67581 => 'DIGIVOIP',
67582 => 'Digicel',
67588 => 'Digicel',
);
16 changes: 12 additions & 4 deletions src/data/PhoneNumberMetadata_CA.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '(?:[2-8]\\d|90)\\d{8}',
'NationalNumberPattern' => '(?:[2-8]\\d|90)\\d{8}|3\\d{6}',
'PossibleLength' =>
array (
0 => 10,
0 => 7,
1 => 10,
),
'PossibleLengthLocalOnly' =>
array (
0 => 7,
),
),
'fixedLine' =>
Expand All @@ -30,6 +30,7 @@
'ExampleNumber' => '5062345678',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -42,6 +43,7 @@
'ExampleNumber' => '5062345678',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -54,6 +56,7 @@
'ExampleNumber' => '8002123456',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -65,6 +68,7 @@
'ExampleNumber' => '9002123456',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -86,6 +90,7 @@
'ExampleNumber' => '5002345678',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -97,6 +102,7 @@
'ExampleNumber' => '6002012345',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -114,9 +120,11 @@
),
'uan' =>
array (
'NationalNumberPattern' => '310\\d{4}',
'ExampleNumber' => '3101234',
'PossibleLength' =>
array (
0 => -1,
0 => 7,
),
'PossibleLengthLocalOnly' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_CM.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '(?:24[23]|6[5-9]\\d)\\d{6}',
'NationalNumberPattern' => '(?:24[23]|6[25-9]\\d)\\d{6}',
'ExampleNumber' => '671234567',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_GB.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:[0-5]\\d\\d|69[7-9]|70[0359])|(?:5[0-26-9]|[78][0-49])\\d\\d|6(?:[0-4]\\d\\d|50[0-24-69]))|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:[02]\\d|1[0-27-9])))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:[0-5]\\d\\d|69[7-9]|70[01359])|(?:5[0-26-9]|[78][0-49])\\d\\d|6(?:[0-4]\\d\\d|50[0-79]))|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:[02]\\d|1[0-27-9])))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
'ExampleNumber' => '1212345678',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_IL.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
),
'voip' =>
array (
'NationalNumberPattern' => '7(?:380|8(?:33|55|77|81))\\d{5}|7(?:18|2[23]|3[237]|47|6[58]|7\\d|82|9[235-9])\\d{6}',
'NationalNumberPattern' => '7(?:380|8(?:33|55|77|81))\\d{5}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
'ExampleNumber' => '771234567',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_JM.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '(?:658295|876(?:2(?:0[2-9]|[14-9]\\d|2[013-9]|3[3-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}',
'NationalNumberPattern' => '(?: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}',
'ExampleNumber' => '8762101234',
'PossibleLength' =>
array (
Expand Down
12 changes: 6 additions & 6 deletions src/data/PhoneNumberMetadata_JP.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@
'format' => '$1-$2-$3',
'leadingDigitsPatterns' =>
array (
0 => '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51|63)|9(?:49|80|9[16])',
1 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9]|636)|9(?:496|802|9(?:1[23]|69))|1(?:45|58)[67]',
2 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9]|636[457-9])|9(?:496|802|9(?:1[23]|69))|1(?:45|58)[67]',
0 => '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51|63)|9(?:80|9[16])',
1 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9]|636)|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
2 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9]|636[457-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
),
'nationalPrefixFormattingRule' => '0$1',
'domesticCarrierCodeFormattingRule' => '',
Expand Down Expand Up @@ -376,9 +376,9 @@
'format' => '$1-$2-$3',
'leadingDigitsPatterns' =>
array (
0 => '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51|63)|9(?:49|80|9[16])',
1 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9]|636)|9(?:496|802|9(?:1[23]|69))|1(?:45|58)[67]',
2 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9]|636[457-9])|9(?:496|802|9(?:1[23]|69))|1(?:45|58)[67]',
0 => '1(?:26|3[79]|4[56]|5[4-68]|6[3-5])|499|5(?:76|97)|746|8(?:3[89]|47|51|63)|9(?:80|9[16])',
1 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:76|97)9|7468|8(?:3(?:8[7-9]|96)|477|51[2-9]|636)|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
2 => '1(?:267|3(?:7[247]|9[278])|466|5(?:47|58|64)|6(?:3[245]|48|5[4-68]))|499[2468]|5(?:769|979[2-69])|7468|8(?:3(?:8[7-9]|96[2457-9])|477|51[2-9]|636[457-9])|9(?:802|9(?:1[23]|69))|1(?:45|58)[67]',
),
'nationalPrefixFormattingRule' => '0$1',
'domesticCarrierCodeFormattingRule' => '',
Expand Down
6 changes: 3 additions & 3 deletions src/data/PhoneNumberMetadata_MA.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '5(?:29(?:[189][05]|2[29]|3[01])|38(?:8[057]|9[05]))\\d{4}|5(?:2(?:[0-25-7]\\d|3[1-578]|4[02-46-8]|8[0235-7]|90)|3(?:[0-47]\\d|5[02-9]|6[02-8]|80|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}',
'NationalNumberPattern' => '5(?:29(?:[189][05]|2[29]|3[01])|389[05])\\d{4}|5(?:2(?:[0-25-7]\\d|3[1-578]|4[02-46-8]|8[0235-7]|90)|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[08]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}',
'ExampleNumber' => '520123456',
'PossibleLength' =>
array (
Expand Down Expand Up @@ -153,8 +153,8 @@
'leadingDigitsPatterns' =>
array (
0 => '5(?:29|38)',
1 => '5(?:29|38)[89]',
2 => '5(?:29|38)[89]0',
1 => '5(?:29[89]|389)',
2 => '5(?:29[89]|389)0',
),
'nationalPrefixFormattingRule' => '0$1',
'domesticCarrierCodeFormattingRule' => '',
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_MV.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
),
'uan' =>
array (
'NationalNumberPattern' => '4[05]0\\d{4}',
'NationalNumberPattern' => '4(?:0[01]|50)\\d{4}',
'ExampleNumber' => '4001234',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_PG.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '(?:7\\d|8[18])\\d{6}',
'NationalNumberPattern' => '(?:7\\d|8[128])\\d{6}',
'ExampleNumber' => '70123456',
'PossibleLength' =>
array (
Expand Down
30 changes: 27 additions & 3 deletions src/data/PhoneNumberMetadata_US.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '[2-9]\\d{9}',
'NationalNumberPattern' => '[2-9]\\d{9}|3\\d{6}',
'PossibleLength' =>
array (
0 => 10,
Expand Down Expand Up @@ -155,13 +155,25 @@
'format' => '$1-$2',
'leadingDigitsPatterns' =>
array (
0 => '[2-9]',
0 => '310',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
'nationalPrefixOptionalWhenFormatting' => true,
),
1 =>
array (
'pattern' => '(\\d{3})(\\d{4})',
'format' => '$1-$2',
'leadingDigitsPatterns' =>
array (
0 => '[24-9]|3(?:[02-9]|1[1-9])',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
array (
'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
'format' => '($1) $2-$3',
Expand All @@ -177,6 +189,18 @@
'intlNumberFormat' =>
array (
0 =>
array (
'pattern' => '(\\d{3})(\\d{4})',
'format' => '$1-$2',
'leadingDigitsPatterns' =>
array (
0 => '310',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
),
1 =>
array (
'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
'format' => '$1-$2-$3',
Expand Down
Loading

0 comments on commit 9f0b214

Please sign in to comment.