Skip to content

Commit 6c31b05

Browse files
giggseygiggsey
authored
Merge pull request #742 from giggsey/upstream-9.0.24
Upstream metadata changes from Google for v9.0.24
2 parents c415b68 + dc9ca0e commit 6c31b05

22 files changed

Lines changed: 67 additions & 106 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.23';
11+
return 'v9.0.24';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class En_255
2525
25567 => 'Yas',
2626
25568 => 'Airtel',
2727
25569 => 'Airtel',
28+
25570 => 'Yas',
2829
25571 => 'Yas',
2930
25573 => 'Tanzania Telecom',
3031
25574 => 'Vodacom',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class En_32
3434
32488 => 'Telenet',
3535
32489 => 'Telenet',
3636
324510 => 'DIGI Communications',
37+
324511 => 'DIGI Communications',
3738
324618 => 'N.M.B.S.',
3839
324630 => 'Lancelot Telecom',
3940
324631 => 'Lancelot Telecom',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class En_381
2626
38166 => 'Telekom Srbija a.d.',
2727
38168 => 'A1',
2828
38169 => 'Telenor',
29+
381671 => 'Ringtel',
2930
381676 => 'GLOBALTEL',
3031
381677 => 'GLOBALTEL',
3132
381678 => 'Vectone Mobile',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ class En_65
488488
658993 => 'Simba',
489489
658994 => 'Simba',
490490
658995 => 'M1',
491+
658996 => 'SingTel',
491492
659001 => 'StarHub',
492493
659002 => 'StarHub',
493494
659003 => 'StarHub',

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
class En_685
1818
{
1919
public const DATA = [
20-
68571 => 'Bluesky',
20+
68571 => 'Vodafone',
2121
68572 => 'Digicel',
2222
68573 => 'Digicel',
23-
68575 => 'Bluesky',
24-
68576 => 'Bluesky',
23+
68575 => 'Vodafone',
24+
68576 => 'Vodafone',
2525
68577 => 'Digicel',
2626
68578 => 'Digicel',
2727
68583 => 'Digicel',

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

Lines changed: 19 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,16 @@
1717
class En_853
1818
{
1919
public const DATA = [
20-
853620 => 'CTM',
20+
85362 => 'CTM',
2121
853621 => 'China Telecom',
2222
853622 => '3',
23-
853623 => 'CTM',
2423
853624 => '3',
25-
853625 => 'SmarTone',
26-
853626 => 'SmarTone',
27-
853628 => 'CTM',
28-
853629 => 'CTM',
2924
853630 => '3',
3025
853631 => '3',
3126
853632 => 'CTM',
3227
853633 => 'CTM',
3328
853635 => 'China Telecom',
34-
853636 => 'SmarTone',
29+
853636 => 'CTM',
3530
853637 => 'China Telecom',
3631
853638 => '3',
3732
853639 => 'CTM',
@@ -42,35 +37,19 @@ class En_853
4237
853657 => '3',
4338
853658 => 'China Telecom',
4439
853659 => 'CTM',
45-
853662 => 'SmarTone',
40+
853661 => 'CTM',
41+
853662 => 'CTM',
4642
853663 => '3',
4743
853664 => '3',
4844
853665 => 'CTM',
4945
853666 => 'CTM',
46+
853667 => 'CTM',
5047
853668 => 'CTM',
48+
853681 => 'CTM',
5149
853682 => 'China Telecom',
52-
853683 => 'SmarTone',
50+
853683 => 'CTM',
5351
853686 => 'China Telecom',
5452
853689 => 'CTM',
55-
8536200 => 'SmarTone',
56-
8536242 => 'CTM',
57-
8536243 => 'CTM',
58-
8536244 => 'SmarTone',
59-
8536245 => 'SmarTone',
60-
8536250 => 'CTM',
61-
8536251 => 'CTM',
62-
8536252 => 'CTM',
63-
8536253 => 'CTM',
64-
8536264 => 'CTM',
65-
8536265 => 'CTM',
66-
8536266 => 'CTM',
67-
8536267 => 'CTM',
68-
8536270 => 'SmarTone',
69-
8536271 => 'SmarTone',
70-
8536272 => 'CTM',
71-
8536273 => 'CTM',
72-
8536274 => 'CTM',
73-
8536275 => 'CTM',
7453
8536276 => '3',
7554
8536277 => '3',
7655
8536278 => '3',
@@ -140,8 +119,9 @@ class En_853
140119
8536544 => 'China Telecom',
141120
8536545 => 'CTM',
142121
8536546 => 'CTM',
143-
8536548 => 'SmarTone',
144-
8536549 => 'SmarTone',
122+
8536547 => 'CTM',
123+
8536548 => 'CTM',
124+
8536549 => 'CTM',
145125
8536556 => 'China Telecom',
146126
8536557 => 'China Telecom',
147127
8536558 => 'China Telecom',
@@ -157,36 +137,24 @@ class En_853
157137
8536598 => 'China Telecom',
158138
8536599 => 'China Telecom',
159139
8536601 => 'CTM',
160-
8536602 => 'SmarTone',
140+
8536602 => 'CTM',
161141
8536603 => '3',
162-
8536604 => 'SmarTone',
142+
8536604 => 'CTM',
163143
8536605 => 'China Telecom',
164144
8536610 => '3',
165145
8536611 => '3',
166-
8536612 => 'CTM',
167-
8536613 => 'CTM',
168-
8536614 => 'SmarTone',
169-
8536615 => 'SmarTone',
170146
8536616 => '3',
171147
8536617 => '3',
172-
8536618 => 'CTM',
173-
8536619 => 'CTM',
174-
8536640 => 'SmarTone',
175-
8536641 => 'SmarTone',
148+
8536640 => 'CTM',
149+
8536641 => 'CTM',
176150
8536647 => 'CTM',
177151
8536649 => 'China Telecom',
178152
8536656 => '3',
179153
8536657 => '3',
180154
8536670 => 'China Telecom',
181155
8536671 => 'China Telecom',
182-
8536672 => 'CTM',
183-
8536673 => 'SmarTone',
184156
8536674 => '3',
185-
8536675 => 'CTM',
186157
8536676 => '3',
187-
8536677 => 'CTM',
188-
8536678 => 'SmarTone',
189-
8536679 => 'CTM',
190158
8536690 => 'Guangxing Communication Co',
191159
8536691 => 'Guangxing Communication Co',
192160
8536692 => 'CTM',
@@ -207,16 +175,6 @@ class En_853
207175
8536807 => '3',
208176
8536808 => '3',
209177
8536809 => '3',
210-
8536810 => 'CTM',
211-
8536811 => 'CTM',
212-
8536812 => 'CTM',
213-
8536813 => 'CTM',
214-
8536814 => 'CTM',
215-
8536815 => 'SmarTone',
216-
8536816 => 'SmarTone',
217-
8536817 => 'SmarTone',
218-
8536818 => 'SmarTone',
219-
8536819 => 'SmarTone',
220178
8536840 => '3',
221179
8536841 => '3',
222180
8536842 => '3',
@@ -237,11 +195,11 @@ class En_853
237195
8536857 => 'CTM',
238196
8536858 => 'CTM',
239197
8536859 => 'CTM',
240-
8536870 => 'SmarTone',
241-
8536871 => 'SmarTone',
242-
8536872 => 'SmarTone',
243-
8536873 => 'SmarTone',
244-
8536874 => 'SmarTone',
198+
8536870 => 'CTM',
199+
8536871 => 'CTM',
200+
8536872 => 'CTM',
201+
8536873 => 'CTM',
202+
8536874 => 'CTM',
245203
8536875 => '3',
246204
8536876 => '3',
247205
8536877 => '3',
@@ -267,16 +225,6 @@ class En_853
267225
85365427 => 'China Telecom',
268226
85365428 => 'China Telecom',
269227
85365429 => 'China Telecom',
270-
85365470 => 'CTM',
271-
85365471 => 'CTM',
272-
85365472 => 'CTM',
273-
85365473 => 'CTM',
274-
85365474 => 'CTM',
275-
85365475 => 'SmarTone',
276-
85365476 => 'SmarTone',
277-
85365477 => 'SmarTone',
278-
85365478 => 'SmarTone',
279-
85365479 => 'SmarTone',
280228
85366001 => 'CTM',
281229
];
282230
}

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

Lines changed: 10 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-
97650 => 'Unitel',
2120
97655 => 'Unitel',
2221
97660 => 'ONDO',
2322
97666 => 'ONDO',
@@ -41,5 +40,15 @@ class En_976
4140
97697 => 'G-Mobile',
4241
97698 => 'G-Mobile',
4342
97699 => 'Mobicom',
43+
976500 => 'Unitel',
44+
976501 => 'Unitel',
45+
976502 => 'Unitel',
46+
976503 => 'Unitel',
47+
976504 => 'Unitel',
48+
976505 => 'Mobicom',
49+
976506 => 'Mobicom',
50+
976507 => 'Mobicom',
51+
976508 => 'Mobicom',
52+
976509 => 'Mobicom',
4453
];
4554
}

‎src/data/PhoneNumberAlternateFormats_352.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct()
3030
(new NumberFormat())
3131
->setPattern('(\d{2})(\d{3})(\d{3})')
3232
->setFormat('$1 $2 $3')
33-
->setLeadingDigitsPattern(['2(?:[0367]|4[3-8])'])
33+
->setLeadingDigitsPattern(['20'])
3434
->setNationalPrefixOptionalWhenFormatting(false),
3535
];
3636
}

‎src/data/PhoneNumberMetadata_CF.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class PhoneNumberMetadata_CF extends PhoneMetadata
2828
public function __construct()
2929
{
3030
$this->generalDesc = (new PhoneNumberDesc())
31-
->setNationalNumberPattern('(?:[27]\d{3}|8776)\d{4}')
31+
->setNationalNumberPattern('8776\d{4}|(?:[27]\d|61)\d{6}')
3232
->setPossibleLength([8]);
3333
$this->mobile = (new PhoneNumberDesc())
3434
->setNationalNumberPattern('7[02-7]\d{6}')
@@ -37,13 +37,13 @@ public function __construct()
3737
->setNationalNumberPattern('8776\d{4}')
3838
->setExampleNumber('87761234');
3939
$this->fixedLine = (new PhoneNumberDesc())
40-
->setNationalNumberPattern('2[12]\d{6}')
40+
->setNationalNumberPattern('(?:2[12]|61)\d{6}')
4141
->setExampleNumber('21612345');
4242
$this->numberFormat = [
4343
(new NumberFormat())
4444
->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})')
4545
->setFormat('$1 $2 $3 $4')
46-
->setLeadingDigitsPattern(['[278]'])
46+
->setLeadingDigitsPattern(['[26-8]'])
4747
->setNationalPrefixOptionalWhenFormatting(false),
4848
];
4949
$this->tollFree = PhoneNumberDesc::empty();

0 commit comments

Comments
 (0)
⚡