Skip to content

Commit 6f4f8a2

Browse files
giggseygiggsey
authored
Merge pull request #748 from giggsey/upstream-9.0.28
Upstream changes from Google for v9.0.28
2 parents 7973753 + 407357b commit 6f4f8a2

14 files changed

Lines changed: 53 additions & 36 deletions

‎METADATA-VERSION.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
* For more information, look at the phing tasks in build.xml
99
* @internal
1010
*/
11-
return 'v9.0.27';
11+
return 'v9.0.28';

‎src/PhoneNumberUtil.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,7 +2752,9 @@ public function isNANPACountry(string $regionCode): bool
27522752
*/
27532753
public function formatInOriginalFormat(PhoneNumber $number, string $regionCallingFrom): string
27542754
{
2755-
if ($number->hasRawInput() && !$this->hasFormattingPatternForNumber($number)) {
2755+
$formatRule = $this->getFormattingPatternForNumber($number);
2756+
2757+
if ($number->hasRawInput() && $formatRule === null) {
27562758
// We check if we have the formatting pattern because without that, we might format the number
27572759
// as a group without national prefix.
27582760
return $number->getRawInput();
@@ -2796,11 +2798,6 @@ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallin
27962798
$formattedNumber = $nationalFormat;
27972799
break;
27982800
}
2799-
// Metadata cannot be null here because getNddPrefixForRegion() (above) returns null if
2800-
// there is no metadata for the region.
2801-
$metadata = $this->getMetadataForRegion($regionCode);
2802-
$nationalNumber = $this->getNationalSignificantNumber($number);
2803-
$formatRule = $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber);
28042801
// The format rule could still be null here if the national number was 0 and there was no
28052802
// raw input (this should not be possible for numbers generated by the phonenumber library
28062803
// as they would also not have a country calling code and we would have exited earlier).
@@ -2847,17 +2844,19 @@ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallin
28472844
return $formattedNumber;
28482845
}
28492846

2850-
protected function hasFormattingPatternForNumber(PhoneNumber $number): bool
2847+
/**
2848+
* Called chooseFormattingPatternForNumber in libphonenumber
2849+
*/
2850+
protected function getFormattingPatternForNumber(PhoneNumber $number): ?NumberFormat
28512851
{
28522852
$countryCallingCode = $number->getCountryCode();
28532853
$phoneNumberRegion = $this->getRegionCodeForCountryCode($countryCallingCode);
28542854
$metadata = $this->getMetadataForRegionOrCallingCode($countryCallingCode, $phoneNumberRegion);
28552855
if ($metadata === null) {
2856-
return false;
2856+
return null;
28572857
}
28582858
$nationalNumber = $this->getNationalSignificantNumber($number);
2859-
$formatRule = $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber);
2860-
return $formatRule !== null;
2859+
return $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber);
28612860
}
28622861

28632862
/**

‎src/carrier/data/en/En_267.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,7 @@ class En_267
5757
267777 => 'Mascom',
5858
267778 => 'Mascom',
5959
267779 => 'Orange',
60+
267790 => 'Orange',
61+
267793 => 'Orange',
6062
];
6163
}

‎src/carrier/data/en/En_34.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,10 @@ class En_34
130130
346110 => 'Orange',
131131
346112 => 'Yoigo',
132132
346113 => 'Yoigo',
133-
346122 => 'Lycamobile',
134-
346124 => 'Lycamobile',
135-
346125 => 'Lycamobile',
133+
346122 => 'Yoigo',
134+
346124 => 'Yoigo',
135+
346125 => 'Yoigo',
136+
346126 => 'Sarenet',
136137
346210 => 'Republica Movil',
137138
346211 => 'Republica Movil',
138139
346212 => 'Movistar',

‎src/carrier/data/en/En_359.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ class En_359
1919
public const DATA = [
2020
35987 => 'Vivacom',
2121
35988 => 'A1',
22-
35989 => 'Telenor',
22+
35989 => 'Yettel',
2323
359988 => 'Bob',
2424
359989 => 'A1',
2525
3599960 => 'A1',
2626
3599961 => 'A1',
2727
3599962 => 'A1',
28-
3599964 => 'Telenor',
29-
3599965 => 'Telenor',
30-
3599966 => 'Telenor',
28+
3599964 => 'Yettel',
29+
3599965 => 'Yettel',
30+
3599966 => 'Yettel',
3131
3599967 => 'Vivacom',
3232
3599968 => 'Vivacom',
3333
3599969 => 'Vivacom',
3434
3599990 => 'A1',
3535
3599991 => 'A1',
3636
3599992 => 'A1',
3737
3599993 => 'A1',
38-
3599994 => 'Telenor',
39-
3599995 => 'Telenor',
38+
3599994 => 'Yettel',
39+
3599995 => 'Yettel',
4040
3599996 => 'Vivacom',
4141
3599997 => 'Vivacom',
4242
3599998 => 'Vivacom',

‎src/carrier/data/en/En_972.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class En_972
3939
9725531 => '019mobile',
4040
9725532 => 'Free Telecom',
4141
9725533 => 'Free Telecom',
42-
9725540 => 'Rami Levy',
4342
9725541 => 'Merkaziya',
4443
9725543 => 'Maskyoo',
4544
9725544 => 'Cellran Cellular Communications',
@@ -54,6 +53,10 @@ class En_972
5453
9725571 => 'Cellact',
5554
9725572 => 'Cellact',
5655
9725577 => '019mobile',
56+
97255400 => 'Rami Levy',
57+
97255401 => 'Rami Levy',
58+
97255402 => 'Rami Levy',
59+
97255403 => 'Yossi',
5760
97255440 => 'Merkaziya',
5861
97255442 => 'Xphone',
5962
97255443 => 'Yossi',

‎src/carrier/data/en/En_976.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
class En_976
1818
{
1919
public const DATA = [
20-
97655 => 'Unitel',
2120
97660 => 'ONDO',
2221
97666 => 'ONDO',
2322
97669 => 'Skytel',
@@ -28,6 +27,7 @@ class En_976
2827
97683 => 'G-Mobile',
2928
97685 => 'Mobicom',
3029
97686 => 'Unitel',
30+
97687 => 'G-Mobile',
3131
97688 => 'Unitel',
3232
97689 => 'Unitel',
3333
97690 => 'Skytel',
@@ -50,5 +50,15 @@ class En_976
5050
976507 => 'Mobicom',
5151
976508 => 'Mobicom',
5252
976509 => 'Mobicom',
53+
976550 => 'Unitel',
54+
976551 => 'Unitel',
55+
976552 => 'Unitel',
56+
976553 => 'Unitel',
57+
976554 => 'Unitel',
58+
976555 => 'Mobicom',
59+
976556 => 'Mobicom',
60+
976557 => 'Mobicom',
61+
976558 => 'Mobicom',
62+
976559 => 'Mobicom',
5363
];
5464
}

‎src/data/PhoneNumberMetadata_BW.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct()
3131
->setNationalNumberPattern('(?:0800|(?:[37]|800)\d)\d{6}|(?:[2-6]\d|90)\d{5}')
3232
->setPossibleLength([7, 8, 10]);
3333
$this->mobile = (new PhoneNumberDesc())
34-
->setNationalNumberPattern('(?:321|7[1-8]\d)\d{5}')
34+
->setNationalNumberPattern('(?:321|7(?:[1-8]\d|9[03]))\d{5}')
3535
->setExampleNumber('71123456')
3636
->setPossibleLength([8]);
3737
$this->premiumRate = (new PhoneNumberDesc())

‎src/data/PhoneNumberMetadata_IL.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public function __construct()
3434
->setNationalNumberPattern('1\d{6}(?:\d{3,5})?|[57]\d{8}|[1-489]\d{7}')
3535
->setPossibleLength([7, 8, 9, 10, 11, 12]);
3636
$this->mobile = (new PhoneNumberDesc())
37-
->setNationalNumberPattern('55(?:4(?:0[0-2]|[16]0)|57[0-289])\d{4}|5(?:(?:[0-2][02-9]|[36]\d|[49][2-9]|8[3-7])\d|5(?:01|2\d|3[0-3]|4[3-5]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\d{5}')
37+
->setNationalNumberPattern('55(?:4(?:0[0-3]|[16]0)|57[0-289])\d{4}|5(?:(?:[0-2][02-9]|[36]\d|[49][2-9]|8[3-7])\d|5(?:01|2\d|3[0-3]|4[3-5]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\d{5}')
3838
->setExampleNumber('502345678')
3939
->setPossibleLength([9]);
4040
$this->premiumRate = (new PhoneNumberDesc())
41-
->setNationalNumberPattern('1212\d{4}|1(?:200|9(?:0[0-2]|19))\d{6}')
41+
->setNationalNumberPattern('1212\d{4}|1(?:200|9(?:0[0-2]|19|9\d))\d{6}')
4242
->setExampleNumber('1919123456')
4343
->setPossibleLength([8, 10]);
4444
$this->fixedLine = (new PhoneNumberDesc())

‎src/data/PhoneNumberMetadata_MN.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public function __construct()
3434
->setPossibleLengthLocalOnly([4, 5, 6])
3535
->setPossibleLength([8, 9, 10]);
3636
$this->mobile = (new PhoneNumberDesc())
37-
->setNationalNumberPattern('92[0139]\d{5}|(?:5[05]|6[069]|7[28]|8[0135689]|9[013-9])\d{6}')
37+
->setNationalNumberPattern('(?:87[01]|92[0139])\d{5}|(?:5[05]|6[069]|7[28]|8[0135689]|9[013-9])\d{6}')
3838
->setExampleNumber('88123456')
3939
->setPossibleLength([8]);
4040
$this->premiumRate = PhoneNumberDesc::empty();
4141
$this->fixedLine = (new PhoneNumberDesc())
42-
->setNationalNumberPattern('[12]2[1-3]\d{5,6}|(?:(?:[12](?:1|27)|5[368])\d\d|7(?:0(?:[0-5]\d|7[078]|80)|128))\d{4}|[12](?:3[2-8]|4[2-68]|5[1-4689])\d{6,7}')
42+
->setNationalNumberPattern('[12](?:2[1-3]|(?:3[2-8]|4[2-68]|5[1-4689])\d)\d{5,6}|7(?:0(?:[0-5]\d|7[078]|80)|128)\d{4}|[12]27\d{6}|(?:11|2[16]|5[368])\d{6}')
4343
->setExampleNumber('53123456')
4444
->setPossibleLengthLocalOnly([4, 5, 6]);
4545
$this->numberFormat = [
4646
(new NumberFormat())
4747
->setPattern('(\d{2})(\d{2})(\d{4})')
4848
->setFormat('$1 $2 $3')
49-
->setLeadingDigitsPattern(['[12]1'])
49+
->setLeadingDigitsPattern(['11|2[16]'])
5050
->setNationalPrefixFormattingRule('0$1')
5151
->setNationalPrefixOptionalWhenFormatting(false),
5252
(new NumberFormat())

0 commit comments

Comments
 (0)
⚡