diff --git a/METADATA-VERSION.php b/METADATA-VERSION.php index 92efd243..2726bf71 100644 --- a/METADATA-VERSION.php +++ b/METADATA-VERSION.php @@ -8,4 +8,4 @@ * For more information, look at the phing tasks in build.xml * @internal */ -return 'v9.0.12'; +return 'v9.0.13'; diff --git a/src/carrier/data/en/En_30.php b/src/carrier/data/en/En_30.php index 17da1e8e..5d22881e 100644 --- a/src/carrier/data/en/En_30.php +++ b/src/carrier/data/en/En_30.php @@ -49,6 +49,10 @@ class En_30 3069524 => 'BWS', 3069529 => 'BWS', 3069530 => 'Cyta', + 3069540 => 'OTE', + 3069541 => 'OTE', + 3069542 => 'OTE', + 3069543 => 'OTE', 3069601 => 'OTE', 3069900 => 'Wind', 30685185 => 'Cyta', @@ -86,14 +90,15 @@ class En_30 30692354 => 'Premium Net International', 30692356 => 'SIA NETBALT', 30692428 => 'Premium Net International', - 30695200 => 'Compatel', + 30695200 => 'Vodafone', + 30695201 => 'Vodafone', + 30695202 => 'Vodafone', + 30695203 => 'Vodafone', 30695310 => 'MI Carrier Services', 30695328 => 'Premium Net International', 30695330 => 'Apifon', 30695340 => 'AMD Telecom', 30695355 => 'Cyta', - 30695400 => 'AMD Telecom', - 30695410 => 'MI Carrier Services', 30695456 => 'BWS', 30695490 => 'MI Carrier Services', 30695499 => 'M-STAT', diff --git a/src/carrier/data/en/En_372.php b/src/carrier/data/en/En_372.php index 9c81c6d8..273dafd0 100644 --- a/src/carrier/data/en/En_372.php +++ b/src/carrier/data/en/En_372.php @@ -18,6 +18,7 @@ class En_372 { public const DATA = [ 37250 => 'Telia Eesti AS', + 37251 => 'Telia Eesti AS', 37252 => 'Telia Eesti AS', 37254 => 'Telia Eesti AS', 37255 => 'Tele 2', @@ -29,7 +30,6 @@ class En_372 37282 => 'Elisa', 37283 => 'Tele 2', 37284 => 'Tele 2', - 372519 => 'Telia Eesti AS', 372530 => 'Telia Eesti AS', 372533 => 'Telia Eesti AS', 372534 => 'Telia Eesti AS', diff --git a/src/carrier/data/en/En_41.php b/src/carrier/data/en/En_41.php index a5bc2502..af22af74 100644 --- a/src/carrier/data/en/En_41.php +++ b/src/carrier/data/en/En_41.php @@ -66,6 +66,8 @@ class En_41 417553 => 'Swisscom', 417557 => 'Swisscom', 417600 => 'Sunrise', + 417601 => 'Sunrise', + 417602 => 'Sunrise', 417603 => 'Sunrise', 417604 => 'Sunrise', 417605 => 'Sunrise', diff --git a/src/carrier/data/en/En_46.php b/src/carrier/data/en/En_46.php index 70ec33bd..822dddbe 100644 --- a/src/carrier/data/en/En_46.php +++ b/src/carrier/data/en/En_46.php @@ -402,6 +402,12 @@ class En_46 4679007 => 'FONIA AB', 4679008 => 'Voice Integrate', 4679009 => 'Soatso AB', + 4679110 => 'Setera', + 4679111 => 'Setera', + 4679112 => 'Setera', + 4679113 => 'Setera', + 4679114 => 'Setera', + 4679115 => 'Telavox AB', 4679550 => 'Soatso AB', 4679551 => 'Tele2 Sverige', 4679552 => 'Tele2 Sverige', diff --git a/src/carrier/data/en/En_49.php b/src/carrier/data/en/En_49.php index 2cbf14b0..fcd1250d 100644 --- a/src/carrier/data/en/En_49.php +++ b/src/carrier/data/en/En_49.php @@ -39,6 +39,7 @@ class En_49 491526 => 'Vodafone', 491529 => 'Vodafone/Truphone', 491531 => 'Mtel', + 491533 => 'Simsalasim', 491555 => '1&1 Mobilfunk', 491556 => '1&1 Mobilfunk', 491570 => 'Eplus/Telogic', diff --git a/src/carrier/data/en/En_597.php b/src/carrier/data/en/En_597.php index 982df447..d8c94569 100644 --- a/src/carrier/data/en/En_597.php +++ b/src/carrier/data/en/En_597.php @@ -17,6 +17,7 @@ class En_597 { public const DATA = [ + 5976 => 'Telesur', 59771 => 'Digicel', 59772 => 'Digicel', 59774 => 'Digicel', diff --git a/src/carrier/data/en/En_65.php b/src/carrier/data/en/En_65.php index 5dee13f5..aa893bfc 100644 --- a/src/carrier/data/en/En_65.php +++ b/src/carrier/data/en/En_65.php @@ -471,6 +471,7 @@ class En_65 658971 => 'Circle.Life', 658972 => 'SingTel', 658976 => 'SingTel', + 658977 => 'SingTel', 659001 => 'StarHub', 659002 => 'StarHub', 659003 => 'StarHub', diff --git a/src/carrier/data/en/En_86.php b/src/carrier/data/en/En_86.php index d279768d..95b251b1 100644 --- a/src/carrier/data/en/En_86.php +++ b/src/carrier/data/en/En_86.php @@ -54,7 +54,7 @@ class En_86 86189 => 'China Telecom', 86190 => 'China Telecom', 86191 => 'China Telecom', - 86192 => 'CBN', + 86192 => 'China Broadnet', 86193 => 'China Telecom', 86195 => 'China Mobile', 86196 => 'China Unicom', diff --git a/src/carrier/data/en/En_968.php b/src/carrier/data/en/En_968.php index 21d41fed..f76fa2df 100644 --- a/src/carrier/data/en/En_968.php +++ b/src/carrier/data/en/En_968.php @@ -21,6 +21,7 @@ class En_968 96871 => 'Omantel', 96872 => 'Omantel', 96874 => 'Ooredoo', + 96875 => 'Vodafone Oman', 96876 => 'Vodafone Oman', 96877 => 'Vodafone Oman', 96878 => 'Ooredoo', diff --git a/src/carrier/data/en/En_975.php b/src/carrier/data/en/En_975.php index 6414ea7c..839e2f39 100644 --- a/src/carrier/data/en/En_975.php +++ b/src/carrier/data/en/En_975.php @@ -16,5 +16,9 @@ */ class En_975 { - public const DATA = [9751 => 'B-Mobile of Bhutan Telecom', 97577 => 'TashiCell of Tashi InfoComm']; + public const DATA = [ + 9751 => 'B-Mobile of Bhutan Telecom', + 97577 => 'TashiCell of Tashi InfoComm', + 97587 => 'TashiCell of Tashi InfoComm', + ]; } diff --git a/src/carrier/data/zh/Zh_86.php b/src/carrier/data/zh/Zh_86.php index 0b23c5fa..bd011c15 100644 --- a/src/carrier/data/zh/Zh_86.php +++ b/src/carrier/data/zh/Zh_86.php @@ -54,6 +54,7 @@ class Zh_86 86189 => '中国电信', 86190 => '中国电信', 86191 => '中国电信', + 86192 => '中国广电', 86193 => '中国电信', 86195 => '中国移动', 86196 => '中国联通', diff --git a/src/data/PhoneNumberMetadata_BT.php b/src/data/PhoneNumberMetadata_BT.php index 01565209..12635e0f 100644 --- a/src/data/PhoneNumberMetadata_BT.php +++ b/src/data/PhoneNumberMetadata_BT.php @@ -28,11 +28,11 @@ class PhoneNumberMetadata_BT extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[17]\d{7}|[2-8]\d{6}') + ->setNationalNumberPattern('[178]\d{7}|[2-8]\d{6}') ->setPossibleLengthLocalOnly([6]) ->setPossibleLength([7, 8]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1[67]|77)\d{6}') + ->setNationalNumberPattern('(?:1[67]|[78]7)\d{6}') ->setExampleNumber('17123456') ->setPossibleLength([8]); $this->premiumRate = PhoneNumberDesc::empty(); @@ -50,12 +50,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[2-68]|7[246]']) + ->setLeadingDigitsPattern(['[2-6]|7[246]|8[2-4]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['1[67]|7']) + ->setLeadingDigitsPattern(['1[67]|[78]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; $this->tollFree = PhoneNumberDesc::empty(); @@ -70,12 +70,12 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d)(\d{3})(\d{3})') ->setFormat('$1 $2 $3') - ->setLeadingDigitsPattern(['[2-68]|7[246]']) + ->setLeadingDigitsPattern(['[2-6]|7[246]|8[2-4]']) ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})(\d{2})') ->setFormat('$1 $2 $3 $4') - ->setLeadingDigitsPattern(['1[67]|7']) + ->setLeadingDigitsPattern(['1[67]|[78]']) ->setNationalPrefixOptionalWhenFormatting(false), ]; } diff --git a/src/data/PhoneNumberMetadata_DE.php b/src/data/PhoneNumberMetadata_DE.php index 5c17cd8b..fb349868 100644 --- a/src/data/PhoneNumberMetadata_DE.php +++ b/src/data/PhoneNumberMetadata_DE.php @@ -35,7 +35,7 @@ public function __construct() ->setPossibleLengthLocalOnly([2, 3]) ->setPossibleLength([4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('15310\d{6}|1(?:5[0-25-9]\d|7[013-5])\d{7}|1(?:6[023]|7[26-9])\d{7,8}') + ->setNationalNumberPattern('1(?:(?:5(?:[0-25-9]\d\d|3(?:10|33))|7[26-9]\d\d)\d{6}|6[023]\d{7,8})|17\d{8}') ->setExampleNumber('15123456789') ->setPossibleLength([10, 11]); $this->premiumRate = (new PhoneNumberDesc()) @@ -135,7 +135,7 @@ public function __construct() (new NumberFormat()) ->setPattern('(\d{5})(\d{6})') ->setFormat('$1 $2') - ->setLeadingDigitsPattern(['15[03568]', '15(?:[0568]|31)']) + ->setLeadingDigitsPattern(['15[03568]', '15(?:[0568]|3[13])']) ->setNationalPrefixFormattingRule('0$1') ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php index c6b5fc3f..8c2b2ac8 100644 --- a/src/data/PhoneNumberMetadata_GY.php +++ b/src/data/PhoneNumberMetadata_GY.php @@ -31,7 +31,7 @@ public function __construct() ->setNationalNumberPattern('(?:[2-8]\d{3}|9008)\d{3}') ->setPossibleLength([7]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:51[01]|6\d\d|7(?:[0-5]\d|6[019]|70))\d{4}') + ->setNationalNumberPattern('(?:51[01]|6\d\d|7(?:[0-5]\d|6[0-39]|70))\d{4}') ->setExampleNumber('6091234'); $this->premiumRate = (new PhoneNumberDesc()) ->setNationalNumberPattern('9008\d{3}') diff --git a/src/data/PhoneNumberMetadata_IL.php b/src/data/PhoneNumberMetadata_IL.php index b7d61656..ac4ea78a 100644 --- a/src/data/PhoneNumberMetadata_IL.php +++ b/src/data/PhoneNumberMetadata_IL.php @@ -34,7 +34,7 @@ public function __construct() ->setNationalNumberPattern('1\d{6}(?:\d{3,5})?|[57]\d{8}|[1-489]\d{7}') ->setPossibleLength([7, 8, 9, 10, 11, 12]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('55(?:4(?:[01]0|5[0-5])|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[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\d{5}') + ->setNationalNumberPattern('55(?:4(?:0[01]|10|5[0-7])|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[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\d{5}') ->setExampleNumber('502345678') ->setPossibleLength([9]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/src/data/PhoneNumberMetadata_OM.php b/src/data/PhoneNumberMetadata_OM.php index 79476b8b..3ef63eee 100644 --- a/src/data/PhoneNumberMetadata_OM.php +++ b/src/data/PhoneNumberMetadata_OM.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:1505|[279]\d{3}|500)\d{4}|800\d{5,6}') ->setPossibleLength([7, 8, 9]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1505\d{4}|(?:7(?:[126-9]\d|41)|9(?:0[1-9]|[1-9]\d))\d{5}') + ->setNationalNumberPattern('1505\d{4}|(?:7(?:[125-9]\d|41)|9(?:0[1-9]|[1-9]\d))\d{5}') ->setExampleNumber('92123456') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/src/data/PhoneNumberMetadata_PA.php b/src/data/PhoneNumberMetadata_PA.php index 70a43155..4c5ae88f 100644 --- a/src/data/PhoneNumberMetadata_PA.php +++ b/src/data/PhoneNumberMetadata_PA.php @@ -40,7 +40,7 @@ public function __construct() ->setExampleNumber('8601234') ->setPossibleLength([7]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:1(?:0\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\d|1[0-7]|4[013-9]|8[02-9])|3(?:[047-9]\d|1[0-8]|2[0-5]|33|5[0-35]|6[068])|4(?:00|3[0-579]|4\d|7[0-57-9])|5(?:[01]\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[4-9]|90)|8(?:09|2[89]|3\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\d))\d{4}') + ->setNationalNumberPattern('(?:1(?:0\d|1[0479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\d|1[0-7]|4[013-9]|8[02-9])|3(?:[047-9]\d|1[0-8]|2[0-5]|33|5[0-35]|6[068])|4(?:00|3[0-579]|4\d|7[0-57-9])|5(?:[01]\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[4-9]|90)|8(?:09|2[89]|3\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\d))\d{4}') ->setExampleNumber('2001234') ->setPossibleLength([7]); $this->numberFormat = [ diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index 655145f8..a67f8f75 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -32,7 +32,7 @@ public function __construct() ->setNationalNumberPattern('(?:(?:1\d|8)\d\d|7000)\d{7}|[3689]\d{7}') ->setPossibleLength([8, 10, 11]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('89(?:7[0-689]|80)\d{4}|(?:8(?:0[1-9]|[1-8]\d|9[0-6])|9[0-8]\d)\d{5}') + ->setNationalNumberPattern('8980\d{4}|(?:8(?:0[1-9]|[1-8]\d|9[0-7])|9[0-8]\d)\d{5}') ->setExampleNumber('81234567') ->setPossibleLength([8]); $this->premiumRate = (new PhoneNumberDesc()) diff --git a/src/data/PhoneNumberMetadata_SR.php b/src/data/PhoneNumberMetadata_SR.php index 087335c4..c902aaa1 100644 --- a/src/data/PhoneNumberMetadata_SR.php +++ b/src/data/PhoneNumberMetadata_SR.php @@ -28,10 +28,10 @@ class PhoneNumberMetadata_SR extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:[2-5]|68|[78]\d|90)\d{5}') + ->setNationalNumberPattern('(?:[2-5]|[6-8]\d|90)\d{5}') ->setPossibleLength([6, 7]); $this->mobile = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:7[124-7]|8[1-9])\d{5}') + ->setNationalNumberPattern('(?:6[08]|7[124-7]|8[1-9])\d{5}') ->setExampleNumber('7412345') ->setPossibleLength([7]); $this->premiumRate = (new PhoneNumberDesc()) @@ -39,8 +39,9 @@ public function __construct() ->setExampleNumber('9012345') ->setPossibleLength([7]); $this->fixedLine = (new PhoneNumberDesc()) - ->setNationalNumberPattern('(?:2[1-3]|3[0-7]|(?:4|68)\d|5[2-58])\d{4}') - ->setExampleNumber('211234'); + ->setNationalNumberPattern('(?:2[1-3]|3[0-7]|4\d|5[2-58])\d{4}') + ->setExampleNumber('211234') + ->setPossibleLength([6]); $this->numberFormat = [ (new NumberFormat()) ->setPattern('(\d{2})(\d{2})(\d{2})') diff --git a/src/data/PhoneNumberMetadata_UY.php b/src/data/PhoneNumberMetadata_UY.php index 598a7bf7..6d61fef4 100644 --- a/src/data/PhoneNumberMetadata_UY.php +++ b/src/data/PhoneNumberMetadata_UY.php @@ -32,8 +32,8 @@ class PhoneNumberMetadata_UY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('0004\d{2,9}|[1249]\d{7}|(?:[49]\d|80)\d{5}') - ->setPossibleLength([6, 7, 8, 9, 10, 11, 12, 13]); + ->setNationalNumberPattern('0004\d{2,9}|[1249]\d{7}|2\d{3,4}|(?:[49]\d|80)\d{5}') + ->setPossibleLength([4, 5, 6, 7, 8, 9, 10, 11, 12, 13]); $this->mobile = (new PhoneNumberDesc()) ->setNationalNumberPattern('9[1-9]\d{6}') ->setExampleNumber('94231234') @@ -48,6 +48,11 @@ public function __construct() ->setPossibleLengthLocalOnly([7]) ->setPossibleLength([8]); $this->numberFormat = [ + (new NumberFormat()) + ->setPattern('(\d{4,5})') + ->setFormat('$1') + ->setLeadingDigitsPattern(['21']) + ->setNationalPrefixOptionalWhenFormatting(false), (new NumberFormat()) ->setPattern('(\d{3})(\d{3,4})') ->setFormat('$1 $2') @@ -83,12 +88,16 @@ public function __construct() ]; $this->tollFree = (new PhoneNumberDesc()) ->setNationalNumberPattern('0004\d{2,9}|(?:405|80[05])\d{4}') - ->setExampleNumber('8001234'); + ->setExampleNumber('8001234') + ->setPossibleLength([6, 7, 8, 9, 10, 11, 12, 13]); $this->sharedCost = PhoneNumberDesc::empty(); $this->personalNumber = PhoneNumberDesc::empty(); $this->voip = PhoneNumberDesc::empty(); $this->pager = PhoneNumberDesc::empty(); - $this->uan = PhoneNumberDesc::empty(); + $this->uan = (new PhoneNumberDesc()) + ->setNationalNumberPattern('21\d{2,3}') + ->setExampleNumber('21123') + ->setPossibleLength([4, 5]); $this->voicemail = PhoneNumberDesc::empty(); $this->noInternationalDialling = PhoneNumberDesc::empty(); } diff --git a/src/data/ShortNumberMetadata_UY.php b/src/data/ShortNumberMetadata_UY.php index b030161e..4022628d 100644 --- a/src/data/ShortNumberMetadata_UY.php +++ b/src/data/ShortNumberMetadata_UY.php @@ -27,7 +27,7 @@ class ShortNumberMetadata_UY extends PhoneMetadata public function __construct() { $this->generalDesc = (new PhoneNumberDesc()) - ->setNationalNumberPattern('[129]\d{2,4}') + ->setNationalNumberPattern('[19]\d{2,4}') ->setPossibleLength([3, 4, 5]); $this->premiumRate = PhoneNumberDesc::empty(); $this->tollFree = (new PhoneNumberDesc()) @@ -39,7 +39,7 @@ public function __construct() ->setExampleNumber('128') ->setPossibleLength([3]); $this->short_code = (new PhoneNumberDesc()) - ->setNationalNumberPattern('1(?:0[4-9]|1[2368]|2[0-3568]|787|997\d?)|21997|911') + ->setNationalNumberPattern('1(?:0[4-9]|1[2368]|2[0-3568]|787|997\d?)|911') ->setExampleNumber('104'); $this->standard_rate = (new PhoneNumberDesc()) ->setNationalNumberPattern('178\d') diff --git a/src/geocoding/data/en/En_975.php b/src/geocoding/data/en/En_975.php index fd1ea896..91a2d96a 100644 --- a/src/geocoding/data/en/En_975.php +++ b/src/geocoding/data/en/En_975.php @@ -22,9 +22,11 @@ class En_975 9754 => 'Trashigang', 9755 => 'Phuentsholing', 9756 => 'Gelephu', - 9758 => 'Paro', 97572 => 'Samdrup Jongkhar', 97574 => 'Samdrup Jongkhar', 97576 => 'Samdrup Jongkhar', + 97582 => 'Paro', + 97583 => 'Paro', + 97584 => 'Paro', ]; }