Skip to content

Commit

Permalink
Merge pull request #551 from giggsey/upstream-v8.13.3
Browse files Browse the repository at this point in the history
Upstream metadata changes from Google for v8.13.3
  • Loading branch information
giggsey authored Dec 22, 2022
2 parents 362e049 + 841fe5f commit f40e769
Show file tree
Hide file tree
Showing 18 changed files with 85 additions and 42 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.13.2
v8.13.3
8 changes: 7 additions & 1 deletion src/carrier/data/en/420.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
4207702 => 'Vodafone',
4207703 => 'Vodafone',
4207704 => 'Vodafone',
4207705 => 'O2',
42077050 => 'Compatel',
42077051 => '3ton s.r.o.',
42077052 => '3ton s.r.o.',
42077055 => 'ASTELNET',
4207706 => 'Vodafone',
42077070 => 'O2',
42077071 => 'Cesky bezdrat',
Expand Down Expand Up @@ -150,6 +150,12 @@
42079191 => 'T-Mobile',
42079192 => '3ton s.r.o.',
42079193 => 'GOPE Systems a.s.',
42079194 => 'O2',
42079195 => 'O2',
42079196 => 'O2',
42079197 => 'O2',
42079198 => 'O2',
42079199 => 'O2',
420792 => 'O2',
42079234 => 'Tesco Mobile CR',
42079235 => 'Tesco Mobile CR',
Expand Down
2 changes: 2 additions & 0 deletions src/carrier/data/en/44.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
4473684 => 'Sky',
4473685 => 'Sky',
4473686 => 'Sky',
4473690 => 'Telet Research',
4473692 => 'Sky',
4473699 => 'Anywhere Sim',
447375 => 'EE',
447376 => 'EE',
Expand Down
1 change: 1 addition & 0 deletions src/carrier/data/en/65.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
658056 => 'Simba',
658057 => 'Simba',
658058 => 'Simba',
658059 => 'M1',
65806 => 'Simba',
6581 => 'StarHub',
65810 => 'M1',
Expand Down
4 changes: 2 additions & 2 deletions src/carrier/data/en/882.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
882342 => 'BebbiCell AG',
882347 => 'BebbiCell AG',
88237 => 'AT&T Cingular Wireless Network',
8824 => 'Monaco Telecom',
8825 => 'Phonegroup',
88249 => 'Monaco Telecom',
88250 => 'Phonegroup',
);
1 change: 1 addition & 0 deletions src/carrier/data/en/967.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
96771 => 'SabaFon',
96773 => 'MTN',
96777 => 'Yemen Mobile',
96778 => 'Yemen Mobile',
);
12 changes: 6 additions & 6 deletions src/data/PhoneNumberMetadata_882.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '[13]\\d{6}(?:\\d{2,5})?|(?:285|50\\d)\\d{9}|(?:[19]\\d|49)\\d{6}',
'NationalNumberPattern' => '[13]\\d{6}(?:\\d{2,5})?|[19]\\d{7}|(?:[25]\\d\\d|4)\\d{7}(?:\\d{2})?',
'PossibleLength' =>
array (
0 => 7,
Expand Down Expand Up @@ -96,7 +96,7 @@
),
'voip' =>
array (
'NationalNumberPattern' => '1(?:3(?:0[0347]|[13][0139]|2[035]|4[013568]|6[0459]|7[06]|8[15-8]|9[0689])\\d{4}|6\\d{5,10})|(?:(?:285\\d\\d|3(?:45|[69]\\d{3}))\\d|9[89])\\d{6}',
'NationalNumberPattern' => '1(?:3(?:0[0347]|[13][0139]|2[035]|4[013568]|6[0459]|7[06]|8[15-8]|9[0689])\\d{4}|6\\d{5,10})|(?:345\\d|9[89])\\d{6}|(?:10|2(?:3|85\\d)|3(?:[15]|[69]\\d\\d)|4[15-8]|51)\\d{8}',
'ExampleNumber' => '390123456789',
'PossibleLength' =>
array (
Expand Down Expand Up @@ -171,7 +171,7 @@
'format' => '$1 $2',
'leadingDigitsPatterns' =>
array (
0 => '4',
0 => '49',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
Expand All @@ -183,7 +183,7 @@
'format' => '$1 $2 $3',
'leadingDigitsPatterns' =>
array (
0 => '[19]',
0 => '1[36]|9',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
Expand All @@ -207,7 +207,7 @@
'format' => '$1 $2 $3',
'leadingDigitsPatterns' =>
array (
0 => '1',
0 => '16',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
Expand All @@ -219,7 +219,7 @@
'format' => '$1 $2 $3',
'leadingDigitsPatterns' =>
array (
0 => '34[57]',
0 => '10|23|3(?:[15]|4[57])|4|51',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
Expand Down
30 changes: 22 additions & 8 deletions src/data/PhoneNumberMetadata_883.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '2\\d{9}(?:\\d{2})?|51\\d{7}|(?:370|51\\d)\\d{9}',
'NationalNumberPattern' => '(?:[1-4]\\d|51)\\d{6,10}',
'PossibleLength' =>
array (
0 => 9,
1 => 10,
2 => 12,
0 => 8,
1 => 9,
2 => 10,
3 => 11,
4 => 12,
),
'PossibleLengthLocalOnly' =>
array (
Expand Down Expand Up @@ -87,7 +89,7 @@
),
'voip' =>
array (
'NationalNumberPattern' => '(?:2(?:00\\d\\d|10)|(?:370[1-9]|51[013]0)\\d)\\d{7}|5100\\d{5}',
'NationalNumberPattern' => '(?:2(?:00\\d\\d|10)|(?:370[1-9]|51\\d0)\\d)\\d{7}|51(?:00\\d{5}|[24-9]0\\d{4,7})|(?:1[013-79]|2[24-689]|3[02-689]|4[0-4])0\\d{5,9}',
'ExampleNumber' => '510012345',
'PossibleLength' =>
array (
Expand Down Expand Up @@ -143,6 +145,18 @@
'numberFormat' =>
array (
0 =>
array (
'pattern' => '(\\d{3})(\\d{3})(\\d{2,8})',
'format' => '$1 $2 $3',
'leadingDigitsPatterns' =>
array (
0 => '[14]|2[24-689]|3[02-689]|51[24-9]',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
array (
'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
'format' => '$1 $2 $3',
Expand All @@ -154,7 +168,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
2 =>
array (
'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
'format' => '$1 $2 $3',
Expand All @@ -166,7 +180,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
3 =>
array (
'pattern' => '(\\d{4})(\\d{4})(\\d{4})',
'format' => '$1 $2 $3',
Expand All @@ -178,7 +192,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
3 =>
4 =>
array (
'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
'format' => '$1 $2 $3 $4',
Expand Down
26 changes: 19 additions & 7 deletions src/data/PhoneNumberMetadata_AT.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,18 @@
'numberFormat' =>
array (
0 =>
array (
'pattern' => '(\\d{4})',
'format' => '$1',
'leadingDigitsPatterns' =>
array (
0 => '14',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
array (
'pattern' => '(\\d)(\\d{3,12})',
'format' => '$1 $2',
Expand All @@ -202,7 +214,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
2 =>
array (
'pattern' => '(\\d{3})(\\d{2})',
'format' => '$1 $2',
Expand All @@ -214,7 +226,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
3 =>
array (
'pattern' => '(\\d{2})(\\d{3,5})',
'format' => '$1 $2',
Expand All @@ -226,7 +238,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
3 =>
4 =>
array (
'pattern' => '(\\d{6})',
'format' => '$1',
Expand All @@ -238,7 +250,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
4 =>
5 =>
array (
'pattern' => '(\\d{3})(\\d{3,10})',
'format' => '$1 $2',
Expand All @@ -250,7 +262,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
5 =>
6 =>
array (
'pattern' => '(\\d{4})(\\d{3,9})',
'format' => '$1 $2',
Expand All @@ -262,7 +274,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
6 =>
7 =>
array (
'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
'format' => '$1 $2 $3',
Expand All @@ -274,7 +286,7 @@
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => false,
),
7 =>
8 =>
array (
'pattern' => '(\\d{2})(\\d{4})(\\d{4,7})',
'format' => '$1 $2 $3',
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_GP.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1289]|5[3-579]|6[0-289]|7[08]|8[0-689]|9\\d)\\d{4}',
'NationalNumberPattern' => '590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1289]|5[3-579]|6[0-389]|7[08]|8[0-689]|9\\d)\\d{4}',
'ExampleNumber' => '590201234',
'PossibleLength' =>
array (
Expand Down
6 changes: 3 additions & 3 deletions src/data/PhoneNumberMetadata_MX.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '1(?:(?:44|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[017]\\d|[235][1-9]|4[0-35-9]|6[0-46-9]|8[1-79]|9[1-8])|[2-9]\\d)\\d{8}',
'NationalNumberPattern' => '1(?:(?:[27]2|44|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-9]|8[1-79]|9[1-8])|[2-9]\\d)\\d{8}',
'PossibleLength' =>
array (
0 => 10,
Expand All @@ -28,7 +28,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
'ExampleNumber' => '2001234567',
'PossibleLength' =>
array (
Expand All @@ -42,7 +42,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
'NationalNumberPattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
'ExampleNumber' => '12221234567',
'PossibleLength' =>
array (
Expand Down
8 changes: 5 additions & 3 deletions src/data/PhoneNumberMetadata_QA.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '[2-7]\\d{7}|800\\d{4}(?:\\d{2})?|2\\d{6}',
'NationalNumberPattern' => '(?:0080|[2-7])\\d{7}|800\\d{4}(?:\\d{2})?|2\\d{6}',
'PossibleLength' =>
array (
0 => 7,
1 => 8,
2 => 9,
3 => 11,
),
'PossibleLengthLocalOnly' =>
array (
),
),
'fixedLine' =>
array (
'NationalNumberPattern' => '414[1-4]\\d{4}|(?:23|4[04])\\d{6}',
'NationalNumberPattern' => '4(?:1111|2022)\\d{3}|(?:23\\d\\d|4(?:[04]\\d\\d|14[0-6]|999))\\d{4}',
'ExampleNumber' => '44123456',
'PossibleLength' =>
array (
Expand All @@ -51,12 +52,13 @@
),
'tollFree' =>
array (
'NationalNumberPattern' => '800\\d{4}(?:\\d{2})?',
'NationalNumberPattern' => '800\\d{4}|(?:0080[01]|800)\\d{6}',
'ExampleNumber' => '8001234',
'PossibleLength' =>
array (
0 => 7,
1 => 9,
2 => 11,
),
'PossibleLengthLocalOnly' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_RE.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '26(?:2\\d\\d|3(?:0\\d|1[01]))\\d{4}',
'NationalNumberPattern' => '26(?:2\\d\\d|3(?:0\\d|1[0-2]))\\d{4}',
'ExampleNumber' => '262161234',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_SG.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '(?:8(?:0(?:[1-4]\\d|5[0-8]|6[0-6])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}',
'NationalNumberPattern' => '8(?:06[0-6]|95[0-2])\\d{4}|(?:8(?:0[1-5]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
'ExampleNumber' => '81234567',
'PossibleLength' =>
array (
Expand Down
4 changes: 2 additions & 2 deletions src/data/PhoneNumberMetadata_YE.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '7[0137]\\d{7}',
'NationalNumberPattern' => '7[01378]\\d{7}',
'ExampleNumber' => '712345678',
'PossibleLength' =>
array (
Expand Down Expand Up @@ -156,7 +156,7 @@
'format' => '$1 $2 $3',
'leadingDigitsPatterns' =>
array (
0 => '[1-6]|7[24-68]',
0 => '[1-6]|7(?:[24-6]|8[0-7])',
),
'nationalPrefixFormattingRule' => '0$1',
'domesticCarrierCodeFormattingRule' => '',
Expand Down
Loading

0 comments on commit f40e769

Please sign in to comment.