From b072e242415daa2016f06a9e9d763630a606c554 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 11 Jul 2022 08:51:42 +0100 Subject: [PATCH 1/3] Update docs of formatInOriginalFormat It should be used after parseAndKeepRawInput Mirrors https://github.com/google/libphonenumber/pull/2785 --- src/PhoneNumberUtil.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php index 27914246..655c6e5c 100644 --- a/src/PhoneNumberUtil.php +++ b/src/PhoneNumberUtil.php @@ -2827,11 +2827,13 @@ public function isNANPACountry($regionCode) } /** - * Formats a phone number using the original phone number format that the number is parsed from. + * Formats a phone number using the original phone number format (e.g. INTERNATIONAL or NATIONAL) + * that the number is parsed from, provided that the number has been parsed with + * parseAndKeepRawInput. Otherwise the number will be formatted in NATIONAL format. + * * The original format is embedded in the country_code_source field of the PhoneNumber object - * passed in. If such information is missing, the number will be formatted into the NATIONAL - * format by default. When we don't have a formatting pattern for the number, the method returns - * the raw input when it is available. + * passed in, which is only set when parsing keeps the raw input. When we don't have a formatting + * pattern for the number, the method falls back to returning the raw input. * * Note this method guarantees no digit will be inserted, removed or modified as a result of * formatting. From caed0f1f3fa650a822a065f48be697d6e1e37fe0 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 11 Jul 2022 09:07:20 +0100 Subject: [PATCH 2/3] Update formatForMobileDialling() for Columbia 03 The national code 03 is deprecated after Colombia renumbering Mirrors https://github.com/google/libphonenumber/pull/2786 --- METADATA-VERSION.txt | 2 +- src/CountryCodeToRegionCodeMapForTesting.php | 4 ++++ src/PhoneNumberUtil.php | 12 +----------- src/RegionCode.php | 2 ++ tests/core/PhoneNumberUtilTest.php | 7 +++++++ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index c13b6355..75316c61 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -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.50 +99a44a6ab50ccbd7654de6b6c803bd81977e9e99 diff --git a/src/CountryCodeToRegionCodeMapForTesting.php b/src/CountryCodeToRegionCodeMapForTesting.php index 1a57032d..0d0330d5 100644 --- a/src/CountryCodeToRegionCodeMapForTesting.php +++ b/src/CountryCodeToRegionCodeMapForTesting.php @@ -68,6 +68,10 @@ class CountryCodeToRegionCodeMapForTesting { array ( 0 => 'BR', ), + 57 => + array ( + 0 => 'CO', + ), 61 => array ( 0 => 'AU', diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php index 655c6e5c..f2121cc6 100644 --- a/src/PhoneNumberUtil.php +++ b/src/PhoneNumberUtil.php @@ -43,11 +43,6 @@ class PhoneNumberUtil const UNKNOWN_REGION = 'ZZ'; const NANPA_COUNTRY_CODE = 1; - /* - * The prefix that needs to be inserted in front of a Colombian landline number when dialed from - * a mobile number in Colombia. - */ - const COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX = '3'; // The PLUS_SIGN signifies the international prefix. const PLUS_SIGN = '+'; const PLUS_CHARS = '+＋'; @@ -2441,12 +2436,7 @@ public function formatNumberForMobileDialing(PhoneNumber $number, $regionCalling if ($regionCallingFrom == $regionCode) { $isFixedLineOrMobile = ($numberType == PhoneNumberType::FIXED_LINE) || ($numberType == PhoneNumberType::MOBILE) || ($numberType == PhoneNumberType::FIXED_LINE_OR_MOBILE); // Carrier codes may be needed in some countries. We handle this here. - if ($regionCode == 'CO' && $numberType == PhoneNumberType::FIXED_LINE) { - $formattedNumber = $this->formatNationalNumberWithCarrierCode( - $numberNoExt, - static::COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX - ); - } elseif ($regionCode == 'BR' && $isFixedLineOrMobile) { + if ($regionCode === 'BR' && $isFixedLineOrMobile) { // Historically, we set this to an empty string when parsing with raw input if none was // found in the input string. However, this doesn't result in a number we can dial. For this // reason, we treat the empty string the same as if it isn't set at all. diff --git a/src/RegionCode.php b/src/RegionCode.php index 01394b0d..f6368a6d 100644 --- a/src/RegionCode.php +++ b/src/RegionCode.php @@ -19,6 +19,7 @@ /** * Class containing string constants of region codes for easier testing. + * @internal */ class RegionCode { @@ -39,6 +40,7 @@ class RegionCode const CH = 'CH'; const CL = 'CL'; const CN = 'CN'; + const CO = 'CO'; const CS = 'CS'; const CX = 'CX'; const DE = 'DE'; diff --git a/tests/core/PhoneNumberUtilTest.php b/tests/core/PhoneNumberUtilTest.php index 6df91e08..280594ca 100644 --- a/tests/core/PhoneNumberUtilTest.php +++ b/tests/core/PhoneNumberUtilTest.php @@ -21,6 +21,7 @@ class PhoneNumberUtilTest extends TestCase { const TEST_META_DATA_FILE_PREFIX = '../../tests/core/data/PhoneNumberMetadataForTesting'; private static $bsNumber; + private static $coFixedLine; private static $internationalTollFree; private static $sgNumber; private static $usShortByOneNumber; @@ -71,6 +72,8 @@ private static function initializePhoneUtilForTesting() { self::$bsNumber = new PhoneNumber(); self::$bsNumber->setCountryCode(1)->setNationalNumber(2423651234); + self::$coFixedLine = new PhoneNumber(); + self::$coFixedLine->setCountryCode(57)->setNationalNumber(6012345678); self::$bsMobile = new PhoneNumber(); self::$bsMobile->setCountryCode(1)->setNationalNumber(2423591234); self::$internationalTollFree = new PhoneNumber(); @@ -1034,6 +1037,10 @@ public function testFormatNumberForMobileDialing() { // Numbers are normally dialed in national format in-country, and international format from // outside the country. + $this->assertEquals( + '6012345678', + $this->phoneUtil->formatNumberForMobileDialing(self::$coFixedLine, RegionCode::CO, false) + ); $this->assertEquals( '030123456', $this->phoneUtil->formatNumberForMobileDialing(self::$deNumber, RegionCode::DE, false) From fc5ee0fe1e985657b4ae85585e543ee7a2e65d41 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Mon, 11 Jul 2022 09:08:37 +0100 Subject: [PATCH 3/3] Upstream metadata changes from Google for v8.12.51 - Updated phone metadata for region code(s): 800, BJ, BR, CO, EH, FO, GE, GP, KE, KG, MA, MM, MN, MY, NZ, RE, SI, UG, VN - Updated geocoding data for country calling code(s): 57 (en), 61 (en) - Updated carrier data for country calling code(s): 60 (en), 254 (en), 262 (en), 298 (en), 386 (en), 421 (en), 976 (en), 995 (en), 996 (en) - Updated / refreshed time zone meta data. --- METADATA-VERSION.txt | 2 +- src/carrier/data/en/254.php | 1 + src/carrier/data/en/262.php | 2 +- src/carrier/data/en/298.php | 1 + src/carrier/data/en/386.php | 2 +- src/carrier/data/en/421.php | 1 + src/carrier/data/en/60.php | 16 +- src/carrier/data/en/976.php | 1 + src/carrier/data/en/995.php | 5 +- src/carrier/data/en/996.php | 2 +- src/data/PhoneNumberMetadata_800.php | 4 +- src/data/PhoneNumberMetadata_BJ.php | 2 +- src/data/PhoneNumberMetadata_BR.php | 6 +- src/data/PhoneNumberMetadata_CO.php | 52 ++--- src/data/PhoneNumberMetadata_EH.php | 2 +- src/data/PhoneNumberMetadata_FO.php | 2 +- src/data/PhoneNumberMetadata_GE.php | 2 +- src/data/PhoneNumberMetadata_GP.php | 2 +- src/data/PhoneNumberMetadata_KE.php | 2 +- src/data/PhoneNumberMetadata_KG.php | 2 +- src/data/PhoneNumberMetadata_MA.php | 2 +- src/data/PhoneNumberMetadata_MM.php | 2 +- src/data/PhoneNumberMetadata_MN.php | 2 +- src/data/PhoneNumberMetadata_MY.php | 7 +- src/data/PhoneNumberMetadata_NZ.php | 2 +- src/data/PhoneNumberMetadata_RE.php | 4 +- src/data/PhoneNumberMetadata_SI.php | 2 +- src/data/PhoneNumberMetadata_UG.php | 2 +- src/data/PhoneNumberMetadata_VN.php | 2 +- src/geocoding/data/en/57.php | 168 ----------------- src/geocoding/data/en/61.php | 51 ++--- src/timezone/data/map_data.php | 4 + .../data/PhoneNumberMetadataForTesting_CO.php | 177 ++++++++++++++++++ 33 files changed, 270 insertions(+), 264 deletions(-) create mode 100644 tests/core/data/PhoneNumberMetadataForTesting_CO.php diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 75316c61..d89ceb9a 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -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 -99a44a6ab50ccbd7654de6b6c803bd81977e9e99 +v8.12.51 diff --git a/src/carrier/data/en/254.php b/src/carrier/data/en/254.php index c3979087..e55cabbd 100644 --- a/src/carrier/data/en/254.php +++ b/src/carrier/data/en/254.php @@ -16,6 +16,7 @@ 254120 => 'Telkom', 254121 => 'Infura', 254124 => 'Finserve', + 25413 => 'NRG Media Limited', 25470 => 'Safaricom', 25471 => 'Safaricom', 25472 => 'Safaricom', diff --git a/src/carrier/data/en/262.php b/src/carrier/data/en/262.php index a1e14f2d..ad7972d4 100644 --- a/src/carrier/data/en/262.php +++ b/src/carrier/data/en/262.php @@ -119,5 +119,5 @@ 26269394 => 'SFR', 26269397 => 'SFR', 26269399 => 'Orange', - 2629 => 'Orange', + 2629769 => 'Orange', ); diff --git a/src/carrier/data/en/298.php b/src/carrier/data/en/298.php index bd350a87..c8bf9180 100644 --- a/src/carrier/data/en/298.php +++ b/src/carrier/data/en/298.php @@ -25,4 +25,5 @@ 29878 => 'Faroese Telecom', 29879 => 'Faroese Telecom', 29891 => 'Tosa', + 29896 => 'Faroese Telecom', ); diff --git a/src/carrier/data/en/386.php b/src/carrier/data/en/386.php index 6c281de8..bec99648 100644 --- a/src/carrier/data/en/386.php +++ b/src/carrier/data/en/386.php @@ -21,7 +21,7 @@ 38664 => 'T-2', 386651 => 'SŽ - Infrastruktura', 386655 => 'Telekom Slovenije', - 386656 => 'Telekom Slovenije', + 386656 => 'SoftNet', 386657 => 'Novatel', 38668 => 'A1', 38669 => 'A1', diff --git a/src/carrier/data/en/421.php b/src/carrier/data/en/421.php index a0f32ffd..03a6e0fc 100644 --- a/src/carrier/data/en/421.php +++ b/src/carrier/data/en/421.php @@ -48,5 +48,6 @@ 421949 => 'Telefonica O2', 421950 => '4ka of SWAN', 421951 => '4ka of SWAN', + 421952 => '4ka of SWAN', 4219598 => 'Slovak Republic Railways (GSM-R)', ); diff --git a/src/carrier/data/en/60.php b/src/carrier/data/en/60.php index e24a0e79..3f2c3ffb 100644 --- a/src/carrier/data/en/60.php +++ b/src/carrier/data/en/60.php @@ -12,11 +12,11 @@ return array ( 60102 => 'DiGi', - 601030 => 'Celcom', - 601031 => 'Celcom', - 601032 => 'Celcom', - 601033 => 'Celcom', - 601034 => 'Celcom', + 601030 => 'XOX', + 601031 => 'XOX', + 601032 => 'XOX', + 601033 => 'XOX', + 601034 => 'XOX', 601035 => 'Webe', 601036 => 'DiGi', 601037 => 'DiGi', @@ -273,7 +273,9 @@ 601173 => 'YTL', 601174 => 'YTL', 601175 => 'YTL', - 60118 => 'U Mobile', + 60118886 => 'U Mobile', + 60118888 => 'red ONE', + 60118889 => 'U Mobile', 6012 => 'Maxis', 60131 => 'Celcom', 60132 => 'Celcom', @@ -292,6 +294,7 @@ 60147 => 'Maxis', 60148 => 'Celcom', 60149 => 'DiGi', + 60153 => 'Tune Talk', 601591 => 'DiGi', 601592 => 'Celcom', 601596 => 'DiGi', @@ -313,6 +316,7 @@ 601833 => 'YTL', 601834 => 'YTL', 60184 => 'U Mobile', + 601854 => 'XOX', 601857 => 'U Mobile', 601858 => 'YTL', 601859 => 'YTL', diff --git a/src/carrier/data/en/976.php b/src/carrier/data/en/976.php index 00499005..474fdaaf 100644 --- a/src/carrier/data/en/976.php +++ b/src/carrier/data/en/976.php @@ -14,6 +14,7 @@ 97650 => 'Unitel', 97655 => 'Unitel', 97680 => 'Unitel', + 97681 => 'ONDO', 97683 => 'G-Mobile', 97685 => 'Mobicom', 97686 => 'Unitel', diff --git a/src/carrier/data/en/995.php b/src/carrier/data/en/995.php index fb6c3ce9..4fc317c9 100644 --- a/src/carrier/data/en/995.php +++ b/src/carrier/data/en/995.php @@ -12,7 +12,8 @@ return array ( 9955000 => 'Mobilaive', - 9955005 => 'MagtiCom', + 99550050 => 'MagtiCom', + 99550055 => 'Silknet', 9955007 => 'MyPhone', 995505 => 'MagtiCom', 9955110 => 'MagtiCom', @@ -22,6 +23,8 @@ 9955115 => 'Silknet', 9955117 => 'MagtiCom', 995514 => 'Geocell', + 995515 => 'MagtiCom', + 995517 => 'MagtiCom', 99552 => 'MagtiCom', 99553 => 'MagtiCom', 99554444 => 'MagtiCom', diff --git a/src/carrier/data/en/996.php b/src/carrier/data/en/996.php index 9d2ec6e5..adaf753b 100644 --- a/src/carrier/data/en/996.php +++ b/src/carrier/data/en/996.php @@ -31,5 +31,5 @@ 996996 => 'Sky mobile', 996997 => 'ALFA Telecom', 996998 => 'ALFA Telecom', - 996999 => 'Sky mobile', + 996999 => 'ALFA Telecom', ); diff --git a/src/data/PhoneNumberMetadata_800.php b/src/data/PhoneNumberMetadata_800.php index e01c7204..e3ce74aa 100644 --- a/src/data/PhoneNumberMetadata_800.php +++ b/src/data/PhoneNumberMetadata_800.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:005|[1-9]\\d\\d)\\d{5}', + 'NationalNumberPattern' => '(?:00|[1-9]\\d)\\d{6}', 'PossibleLength' => array ( 0 => 8, @@ -45,7 +45,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '(?:005|[1-9]\\d\\d)\\d{5}', + 'NationalNumberPattern' => '(?:00|[1-9]\\d)\\d{6}', 'ExampleNumber' => '12345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_BJ.php b/src/data/PhoneNumberMetadata_BJ.php index 09d6f7ac..04d30843 100644 --- a/src/data/PhoneNumberMetadata_BJ.php +++ b/src/data/PhoneNumberMetadata_BJ.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:40|5[1-8]|6\\d|9[013-9])\\d{6}', + 'NationalNumberPattern' => '(?:40|5[1-9]|6\\d|9[013-9])\\d{6}', 'ExampleNumber' => '90011234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_BR.php b/src/data/PhoneNumberMetadata_BR.php index 42f14f01..a1c82b49 100644 --- a/src/data/PhoneNumberMetadata_BR.php +++ b/src/data/PhoneNumberMetadata_BR.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[1-46-9]\\d\\d|5(?:[0-46-9]\\d|5[0-24679]))\\d{8}|[1-9]\\d{9}|[3589]\\d{8}|[34]\\d{7}', + 'NationalNumberPattern' => '(?:[1-46-9]\\d\\d|5(?:[0-46-9]\\d|5[0-46-9]))\\d{8}|[1-9]\\d{9}|[3589]\\d{8}|[34]\\d{7}', 'PossibleLength' => array ( 0 => 8, @@ -145,10 +145,12 @@ ), 'noInternationalDialling' => array ( - 'NationalNumberPattern' => '4020\\d{4}|[34]00\\d{5}', + 'NationalNumberPattern' => '30(?:0\\d{5,7}|3\\d{7})|40(?:0\\d|20)\\d{4}|800\\d{6,7}', 'PossibleLength' => array ( 0 => 8, + 1 => 9, + 2 => 10, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/data/PhoneNumberMetadata_CO.php b/src/data/PhoneNumberMetadata_CO.php index 5df9448f..a9ae6291 100644 --- a/src/data/PhoneNumberMetadata_CO.php +++ b/src/data/PhoneNumberMetadata_CO.php @@ -14,12 +14,11 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:(?:1\\d|[36])\\d{3}|9101)\\d{6}|[124-8]\\d{7}', + 'NationalNumberPattern' => '(?:60\\d\\d|9101)\\d{6}|(?:1\\d|3)\\d{9}', 'PossibleLength' => array ( - 0 => 8, - 1 => 10, - 2 => 11, + 0 => 10, + 1 => 11, ), 'PossibleLengthLocalOnly' => array ( @@ -28,12 +27,11 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '60[124-8][2-9]\\d{6}|[124-8][2-9]\\d{6}', - 'ExampleNumber' => '12345678', + 'NationalNumberPattern' => '60[124-8][2-9]\\d{6}', + 'ExampleNumber' => '6012345678', 'PossibleLength' => array ( - 0 => 8, - 1 => 10, + 0 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -150,23 +148,11 @@ 'countryCode' => 57, 'internationalPrefix' => '00(?:4(?:[14]4|56)|[579])', 'nationalPrefix' => '0', - 'nationalPrefixForParsing' => '0([3579]|4(?:[14]4|56))?', + 'nationalPrefixForParsing' => '0(4(?:[14]4|56)|[579])?', 'sameMobileAndFixedLinePattern' => false, 'numberFormat' => array ( 0 => - array ( - 'pattern' => '(\\d)(\\d{7})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '[146][2-9]|[2578]', - ), - 'nationalPrefixFormattingRule' => '($1)', - 'domesticCarrierCodeFormattingRule' => '0$CC $1', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 1 => array ( 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', @@ -175,10 +161,10 @@ 0 => '6', ), 'nationalPrefixFormattingRule' => '($1)', - 'domesticCarrierCodeFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '0$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), - 2 => + 1 => array ( 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', @@ -190,7 +176,7 @@ 'domesticCarrierCodeFormattingRule' => '0$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 2 => array ( 'pattern' => '(\\d)(\\d{3})(\\d{7})', 'format' => '$1-$2-$3', @@ -206,18 +192,6 @@ 'intlNumberFormat' => array ( 0 => - array ( - 'pattern' => '(\\d)(\\d{7})', - 'format' => '$1 $2', - 'leadingDigitsPatterns' => - array ( - 0 => '[146][2-9]|[2578]', - ), - 'nationalPrefixFormattingRule' => '($1)', - 'domesticCarrierCodeFormattingRule' => '0$CC $1', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 1 => array ( 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', @@ -226,10 +200,10 @@ 0 => '6', ), 'nationalPrefixFormattingRule' => '($1)', - 'domesticCarrierCodeFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '0$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), - 2 => + 1 => array ( 'pattern' => '(\\d{3})(\\d{7})', 'format' => '$1 $2', @@ -241,7 +215,7 @@ 'domesticCarrierCodeFormattingRule' => '0$CC $1', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 2 => array ( 'pattern' => '(\\d)(\\d{3})(\\d{7})', 'format' => '$1 $2 $3', diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php index 7404177e..be301e22 100644 --- a/src/data/PhoneNumberMetadata_EH.php +++ b/src/data/PhoneNumberMetadata_EH.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-367]))\\d{6}', + 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-8]))\\d{6}', 'ExampleNumber' => '650123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_FO.php b/src/data/PhoneNumberMetadata_FO.php index f3949bea..ba288dcb 100644 --- a/src/data/PhoneNumberMetadata_FO.php +++ b/src/data/PhoneNumberMetadata_FO.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:[27][1-9]|5\\d|91)\\d{4}', + 'NationalNumberPattern' => '(?:[27][1-9]|5\\d|9[16])\\d{4}', 'ExampleNumber' => '211234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GE.php b/src/data/PhoneNumberMetadata_GE.php index 90615392..7fd85d07 100644 --- a/src/data/PhoneNumberMetadata_GE.php +++ b/src/data/PhoneNumberMetadata_GE.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '5(?:(?:0555|1177)[5-9]|757(?:7[7-9]|8[01]))\\d{3}|5(?:00(?:0\\d|50)|11(?:00|1\\d|2[0-4]|3[01])|5200|75(?:00|[57]5)|8(?:0(?:[01]\\d|2[0-4])|58[89]|8(?:55|88)))\\d{4}|5(?:0070|11(?:33|51)|[25]222|3333)[0-4]\\d{3}|(?:5(?:[14]4|5[0157-9]|68|7[0147-9]|9[1-35-9])|790)\\d{6}', + 'NationalNumberPattern' => '5(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d{3}|5(?:0070|11(?:33|51)|[25]222|3333)[0-4]\\d{3}|5(?:00(?:0\\d|5[05])|11(?:00|1\\d|2[0-4]|3[01])|5200|75(?:00|[57]5)|8(?:0(?:[01]\\d|2[0-4])|58[89]|8(?:55|88)))\\d{4}|(?:5(?:[14]4|5[0157-9]|68|7[0147-9]|9[1-35-9])|790)\\d{6}', 'ExampleNumber' => '555123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_GP.php b/src/data/PhoneNumberMetadata_GP.php index 71f13af8..acb0f087 100644 --- a/src/data/PhoneNumberMetadata_GP.php +++ b/src/data/PhoneNumberMetadata_GP.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '590(?:0[1-68]|[14][0-24-9]|2[0-68]|3[1289]|5[3-579]|6[0189]|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-289]|7[08]|8[0-689]|9\\d)\\d{4}', 'ExampleNumber' => '590201234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_KE.php b/src/data/PhoneNumberMetadata_KE.php index 087dff45..279548aa 100644 --- a/src/data/PhoneNumberMetadata_KE.php +++ b/src/data/PhoneNumberMetadata_KE.php @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:1(?:0[0-6]|1[0-5]|2[014])|7\\d\\d)\\d{6}', + 'NationalNumberPattern' => '(?:1(?:0[0-6]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}', 'ExampleNumber' => '712123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_KG.php b/src/data/PhoneNumberMetadata_KG.php index be070050..b18e3df2 100644 --- a/src/data/PhoneNumberMetadata_KG.php +++ b/src/data/PhoneNumberMetadata_KG.php @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '312(?:58\\d|973)\\d{3}|(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|7(?:[07]\\d|55)|880|99[05-9])\\d{6}', + 'NationalNumberPattern' => '312(?:58\\d|973)\\d{3}|(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|7(?:[07]\\d|55)|88[08]|99[05-9])\\d{6}', 'ExampleNumber' => '700123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php index cef1ff4c..387e6c75 100644 --- a/src/data/PhoneNumberMetadata_MA.php +++ b/src/data/PhoneNumberMetadata_MA.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-367]))\\d{6}', + 'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-8]))\\d{6}', 'ExampleNumber' => '650123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MM.php b/src/data/PhoneNumberMetadata_MM.php index d48758bb..c5248a6e 100644 --- a/src/data/PhoneNumberMetadata_MM.php +++ b/src/data/PhoneNumberMetadata_MM.php @@ -46,7 +46,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}', + 'NationalNumberPattern' => '(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|9[4-8])\\d|7(?:3|40|[5-9]\\d)|8(?:78|[89]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}', 'ExampleNumber' => '92123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MN.php b/src/data/PhoneNumberMetadata_MN.php index e2feee7f..9c4e2aab 100644 --- a/src/data/PhoneNumberMetadata_MN.php +++ b/src/data/PhoneNumberMetadata_MN.php @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:83[01]|920)\\d{5}|(?:5[05]|8[05689]|9[013-9])\\d{6}', + 'NationalNumberPattern' => '(?:83[01]|920)\\d{5}|(?:5[05]|8[015689]|9[013-9])\\d{6}', 'ExampleNumber' => '88123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MY.php b/src/data/PhoneNumberMetadata_MY.php index 343b79dc..49f44827 100644 --- a/src/data/PhoneNumberMetadata_MY.php +++ b/src/data/PhoneNumberMetadata_MY.php @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '1(?:1888[69]|4400|8(?:47|8[27])[0-4])\\d{4}|1(?:0(?:[23568]\\d|4[0-6]|7[016-9]|9[0-8])|1(?:[1-5]\\d\\d|6(?:0[5-9]|[1-9]\\d)|7(?:[0134]\\d|2[1-9]|5[0-6]))|(?:(?:[269]|59)\\d|[37][1-9]|4[235-9])\\d|8(?:1[23]|[236]\\d|4[06]|5[7-9]|7[016-9]|8[01]|9[0-8]))\\d{5}', + 'NationalNumberPattern' => '1(?:1888[689]|4400|8(?:47|8[27])[0-4])\\d{4}|1(?:0(?:[23568]\\d|4[0-6]|7[016-9]|9[0-8])|1(?:[1-5]\\d\\d|6(?:0[5-9]|[1-9]\\d)|7(?:[0134]\\d|2[1-9]|5[0-6]))|(?:[269]\\d|[37][1-9]|4[235-9])\\d|5(?:31|9\\d\\d)|8(?:1[23]|[236]\\d|4[06]|5(?:46|[7-9])|7[016-9]|8[01]|9[0-8]))\\d{5}', 'ExampleNumber' => '123456789', 'PossibleLength' => array ( @@ -177,7 +177,8 @@ 'format' => '$1-$2 $3', 'leadingDigitsPatterns' => array ( - 0 => '1(?:[02469]|[378][1-9])|8', + 0 => '1(?:[02469]|[378][1-9]|53)|8', + 1 => '1(?:[02469]|[37][1-9]|53|8(?:[1-46-9]|5[7-9]))|8', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', @@ -201,7 +202,7 @@ 'format' => '$1-$2-$3-$4', 'leadingDigitsPatterns' => array ( - 0 => '1[36-8]', + 0 => '1(?:[367]|80)', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_NZ.php b/src/data/PhoneNumberMetadata_NZ.php index a57770f7..92d0f015 100644 --- a/src/data/PhoneNumberMetadata_NZ.php +++ b/src/data/PhoneNumberMetadata_NZ.php @@ -197,7 +197,7 @@ 2 => array ( 'pattern' => '(\\d)(\\d{3})(\\d{4})', - 'format' => '$1-$2 $3', + 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( 0 => '24|[346]|7[2-57-9]|9[2-9]', diff --git a/src/data/PhoneNumberMetadata_RE.php b/src/data/PhoneNumberMetadata_RE.php index 711694fe..2779f047 100644 --- a/src/data/PhoneNumberMetadata_RE.php +++ b/src/data/PhoneNumberMetadata_RE.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '9769\\d{5}|(?:26|[68]\\d)\\d{7}', + 'NationalNumberPattern' => '976\\d{6}|(?:26|[68]\\d)\\d{7}', 'PossibleLength' => array ( 0 => 9, @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:69(?:2\\d\\d|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|6[0-6]|7[0-27]|8[0-8]|9[0-479]))|9769\\d)\\d{4}', + 'NationalNumberPattern' => '(?:69(?:2\\d\\d|3(?:0[0-46]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|6[0-6]|7[0-27]|8[0-8]|9[0-479]))|976(?:2[27]|3[0-37]|9\\d))\\d{4}', 'ExampleNumber' => '692123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_SI.php b/src/data/PhoneNumberMetadata_SI.php index 542bb9e4..65a112ed 100644 --- a/src/data/PhoneNumberMetadata_SI.php +++ b/src/data/PhoneNumberMetadata_SI.php @@ -41,7 +41,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '65(?:1\\d|55|[67]0)\\d{4}|(?:[37][01]|4[0139]|51|6[489])\\d{6}', + 'NationalNumberPattern' => '65(?:1\\d|55|6[01]|70)\\d{4}|(?:[37][01]|4[0139]|51|6[489])\\d{6}', 'ExampleNumber' => '31234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_UG.php b/src/data/PhoneNumberMetadata_UG.php index 233e35f5..c9207fdc 100644 --- a/src/data/PhoneNumberMetadata_UG.php +++ b/src/data/PhoneNumberMetadata_UG.php @@ -28,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '20(?:(?:(?:24|81)0|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|32|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}', + 'NationalNumberPattern' => '20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|32|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}', 'ExampleNumber' => '312345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_VN.php b/src/data/PhoneNumberMetadata_VN.php index 4d303f35..4a202c14 100644 --- a/src/data/PhoneNumberMetadata_VN.php +++ b/src/data/PhoneNumberMetadata_VN.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:5(?:2[238]|59)|89[689]|99[013-9])\\d{6}|(?:3\\d|5[689]|7[06-9]|8[1-8]|9[0-8])\\d{7}', + 'NationalNumberPattern' => '(?:5(?:2[238]|59)|89[6-9]|99[013-9])\\d{6}|(?:3\\d|5[689]|7[06-9]|8[1-8]|9[0-8])\\d{7}', 'ExampleNumber' => '912345678', 'PossibleLength' => array ( diff --git a/src/geocoding/data/en/57.php b/src/geocoding/data/en/57.php index d8d6433d..08208214 100644 --- a/src/geocoding/data/en/57.php +++ b/src/geocoding/data/en/57.php @@ -11,152 +11,6 @@ */ return array ( - 5712 => 'Bogotá', - 5713 => 'Bogotá', - 5714 => 'Bogotá', - 5715 => 'Bogotá', - 5716 => 'Bogotá', - 5717 => 'Bogotá', - 571820 => 'Madrid', - 571821 => 'Funza', - 571822 => 'Funza', - 5718230 => 'Subachoque', - 5718232 => 'Funza', - 5718240 => 'El Rosal', - 5718241 => 'El Rosal', - 57182420 => 'La Pradera', - 57182428 => 'Subachoque', - 57182429 => 'Subachique', - 5718243 => 'Bojaca', - 5718245 => 'Subachoque', - 5718246 => 'Puente Piedra', - 5718247 => 'La Punta', - 5718249 => 'Zipacon', - 5718250 => 'Madrid', - 5718251 => 'Madrid', - 5718252 => 'Madrid', - 5718253 => 'Madrid', - 5718254 => 'Madrid', - 5718255 => 'Madrid', - 5718256 => 'Madrid', - 5718257 => 'Funza', - 571826 => 'Funza', - 571827 => 'Mosquera', - 5718283 => 'Mosquera', - 5718288 => 'Madrid', - 5718289 => 'Madrid', - 571830 => 'Girardot', - 571831 => 'Girardot', - 571832 => 'Girardot', - 571833 => 'Girardot', - 5718370 => 'Jerusalén', - 5718371 => 'Guataqui', - 5718373 => 'Beltrán', - 5718375 => 'Nariño', - 5718376 => 'Tocaima', - 5718381 => 'Agua de Dios', - 5718383 => 'Nilo', - 5718384 => 'Viota', - 5718385 => 'Nariño', - 5718386 => 'Apulo', - 57183925 => 'Nilo', - 57183926 => 'Nilo', - 57183927 => 'Nilo', - 57183928 => 'Nilo', - 57183929 => 'La Esmeralda', - 5718393 => 'Girardot', - 5718397 => 'Apulo', - 5718398 => 'Apulo', - 5718402 => 'San Antonio de Tequendama', - 5718403 => 'Choachi', - 5718404 => 'Fomeque', - 5718412 => 'Santa Inés', - 5718416 => 'Guaduas', - 5718417 => 'Guaduas', - 5718419 => 'Pandi', - 571842 => 'Facatativa', - 5718430 => 'Facatativa', - 5718431 => 'Facatativa', - 57184330 => 'Ninaima', - 57184331 => 'Ninaima', - 57184332 => 'Ninaima', - 57184333 => 'Tobia', - 57184334 => 'Tobia', - 5718434 => 'Cartagenita', - 5718435 => 'Cartagenita', - 5718436 => 'Facatativa', - 5718437 => 'Facatativa', - 5718438 => 'Facatativa', - 5718439 => 'Facatativa', - 5718440 => 'Facatativa', - 5718441 => 'Viani', - 5718442 => 'Cachipay', - 5718443 => 'Cachipay', - 5718444 => 'Villeta', - 5718445 => 'Villeta', - 5718446 => 'Villeta', - 5718447 => 'Villeta', - 5718449 => 'La Peña', - 5718450 => 'San Antonio de Tequendama', - 5718451 => 'Nocaima', - 571845340 => 'La Florida', - 571845341 => 'La Florida', - 571845342 => 'La Florida', - 571845343 => 'La Florida', - 571845344 => 'La Florida', - 571845345 => 'La Florida', - 5718480 => 'Quebradanegra', - 5718481 => 'Quebradanegra', - 5718482 => 'La Magdalena', - 57230 => 'Cali', - 57231 => 'Cali', - 57232 => 'Cali', - 57233 => 'Cali', - 57234 => 'Cali', - 57235 => 'Cali', - 57236 => 'Cali', - 57272 => 'Pasto', - 57273 => 'Pasto', - 57288 => 'Cali', - 57289 => 'Cali', - 57290 => 'Cali', - 57292 => 'Cali', - 5742 => 'Medellín', - 5743 => 'Medellín', - 5744 => 'Medellín', - 5745 => 'Medellín', - 574842 => 'Medellín', - 5748510 => 'Medellín', - 5748511 => 'Medellín', - 5748720 => 'Medellín', - 5748721 => 'Medellín', - 5748722 => 'Medellín', - 5748723 => 'Medellín', - 5748724 => 'Medellín', - 5748725 => 'Medellín', - 5748726 => 'Medellín', - 5749092 => 'Medellín', - 574911 => 'Medellín', - 574913 => 'Medellín', - 574917 => 'Medellín', - 57492 => 'Medellín', - 57532 => 'Barranquilla', - 57533 => 'Barranquilla', - 57534 => 'Barranquilla', - 57535 => 'Barranquilla', - 57536 => 'Barranquilla', - 57537 => 'Barranquilla', - 57538 => 'Barranquilla', - 57557 => 'Valledupar', - 57562951 => 'Cartagena', - 57562956 => 'Cartagena', - 57562957 => 'Cartagena', - 57562958 => 'Cartagena', - 57562959 => 'Cartagena', - 57565 => 'Cartagena', - 57566 => 'Cartagena', - 57567 => 'Cartagena', - 57568 => 'Cartagena', 576012 => 'Bogotá', 576013 => 'Bogotá', 576014 => 'Bogotá', @@ -306,26 +160,4 @@ 5760866 => 'Villavicencio', 5760886 => 'Neiva', 5760887 => 'Neiva', - 57631 => 'Pereira', - 57632 => 'Pereira', - 57633 => 'Pereira', - 57634 => 'Pereira', - 57635 => 'Pereira', - 57687 => 'Manizales', - 57688 => 'Manizales', - 57689 => 'Manizales', - 57757 => 'Cucuta', - 57758 => 'Cucuta', - 57761 => 'Bucaramanga', - 57763 => 'Bucaramanga', - 57764 => 'Bucaramanga', - 57765 => 'Bucaramanga', - 57767 => 'Bucaramanga', - 57768 => 'Bucaramanga', - 57790 => 'Bucaramanga', - 57826 => 'Ibague', - 57827 => 'Ibague', - 57866 => 'Villavicencio', - 57886 => 'Neiva', - 57887 => 'Neiva', ); diff --git a/src/geocoding/data/en/61.php b/src/geocoding/data/en/61.php index 22b2fbdc..05a49cc8 100644 --- a/src/geocoding/data/en/61.php +++ b/src/geocoding/data/en/61.php @@ -260,10 +260,10 @@ 61240030 => 'Wootton', 61240031 => 'Bandon Grove', 61240032 => 'Branxton', - 61240033 => 'Bulahdelah', - 61240034 => 'Cessnock', - 61240035 => 'Clarence Town', - 61240036 => 'Dungog', + 61240033 => 'Newcastle', + 61240034 => 'Newcastle', + 61240035 => 'Newcastle', + 61240036 => 'Newcastle', 61240037 => 'Newcastle', 61240038 => 'Eccleston', 61240039 => 'Karuah', @@ -17500,6 +17500,12 @@ 6134245 => 'Geelong', 61342460 => 'Geelong', 61342461 => 'Geelong', + 6134250 => 'Swan Marsh/Torquay/Winchelsea South/Wingeel/Aireys Inlet/Anglesea/Apollo Bay/Bannockburn/Geelong', + 6134251 => 'Geelong/Inverleigh/Barwon Downs/Kennedys Creek/Beeac/Lara/Beech Forest/Lavers Hill/Birregurra/Lorne', + 6134252 => 'Geelong/Meredith/Colac/Queenscliff/Cressy/Swan Marsh/Torquay/Winchelsea South', + 6134253 => 'Inverleigh/Wingeel/Kennedys Creek/Lara/Lavers Hill/Lorne/Meredith/Queenscliff/Swan Marsh/Torquay', + 61342540 => 'Winchelsea South/Wingeel', + 61342541 => 'Winchelsea South/Wingeel', 6134300 => 'Horsham', 61343010 => 'Stawell', 61343011 => 'Daylesford', @@ -18032,22 +18038,14 @@ 61343299 => 'Horsham', 6134330 => 'Ballarat', 6134331 => 'Ballarat', - 6134332 => 'Ballarat', + 6134332 => 'Elmhurst/Horsham/Gerang Gerung/Horsham/Glenisla/Glenorchy/Ballarat', 6134333 => 'Ballarat', 6134334 => 'Ballarat', - 61343350 => 'Ballarat', - 61343351 => 'Ballarat', - 61343352 => 'Ballarat', - 61343353 => 'Ballarat', - 61343354 => 'Ballarat', - 61343355 => 'Ballarat', - 61343356 => 'Ararat', - 61343357 => 'Ararat', - 61343358 => 'Ararat', - 6134336 => 'Ballarat', - 6134337 => 'Ballarat', - 6134338 => 'Ballarat', - 6134339 => 'Ballarat', + 6134335 => 'Ballarat/Ararat/Stawell', + 6134336 => 'Goroke/Halls Gap/Horsham/Jeparit/Kalkee/Ballarat', + 6134337 => 'Kaniva/Laharum/Lake Bolac/Landsborough/Learmonth', + 6134338 => 'Linton/Lorquon/Marnoo/Maroona/Minimay', + 6134339 => 'Minyip/Mount Wallace/Moyston/Murtoa/Natimuk', 61343429 => 'Ballan', 6134343 => 'Ballarat', 61343440 => 'Ballarat', @@ -18749,7 +18747,7 @@ 613442253 => 'Wycheproof', 61344226 => 'Bridgewater', 61344227 => 'Maldon', - 61344230 => 'Birchip', + 6134423 => 'Birchip/Charlton/Cohuna', 61344249 => 'Lake Meran', 61344260 => 'Moonambel', 61344261 => 'St Arnaud', @@ -19770,7 +19768,9 @@ 613470952 => 'Yarrawonga', 613470953 => 'Yea', 61347099 => 'Cheshunt', - 61347110 => 'Kinglake', + 6134710 => 'Cheshunt/Devlins Bridge/Kilmore', + 6134711 => 'Kinglake/Mansfield/St James/Strathbogie', + 6134712 => 'Whorouly/Woods Point/Yarck/Beechworth', 6134800 => 'Shepparton', 61348004 => 'Cobram', 61348006 => 'Tocumwal', @@ -40686,7 +40686,7 @@ 61753413 => 'Noosaville', 61753414 => 'Noosaville', 61753415 => 'Noosaville', - 617534169 => 'Noosaville', + 61753416 => 'Noosaville', 61753417 => 'Jimna', 61753418 => 'Caloundra', 61753419 => 'Caloundra', @@ -42207,7 +42207,7 @@ 617750420 => 'Yetman', 617750421 => 'Yuleba', 61775049 => 'Bonshaw', - 61775060 => 'Bunya Mountains', + 6177506 => 'Bunya Mountains/Charleville/Chinchilla/Clifton', 61775070 => 'Cooyar', 61775071 => 'Cooyar', 61775072 => 'Cooyar', @@ -45500,6 +45500,11 @@ 61868430 => 'Narrogin', 61868446 => 'Pingelly', 61868447 => 'Wagin', + 61868581 => 'Muradup', + 61868583 => 'Nalyerlup', + 61868585 => 'Narrakine', + 61868587 => 'Narrogin', + 61868589 => 'Newdegate', 61868888 => 'Albany', 61868889 => 'Lake Toolbrunup', 618700 => 'Adelaide', @@ -47616,7 +47621,7 @@ 61876417 => 'Elliston', 61876418 => 'Elliston', 61876419 => 'Elliston', - 61876429 => 'Leigh Creek South', + 6187642 => 'Georgetown/Jamestown/Laura/Leigh Creek South', 61876440 => 'Port Neill', 61876459 => 'Wirrulla', 61876470 => 'Gairdner', diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php index eaa08891..9a2bf083 100644 --- a/src/timezone/data/map_data.php +++ b/src/timezone/data/map_data.php @@ -3268,6 +3268,10 @@ 97624 => 'Asia/Hovd', 97625 => 'Asia/Ulaanbaatar', 976258 => 'Asia/Choibalsan', + 9765 => 'Asia/Ulaanbaatar', + 9767 => 'Asia/Ulaanbaatar', + 9768 => 'Asia/Ulaanbaatar', + 9769 => 'Asia/Ulaanbaatar', 977 => 'Asia/Katmandu', 98 => 'Asia/Tehran', 992 => 'Asia/Dushanbe', diff --git a/tests/core/data/PhoneNumberMetadataForTesting_CO.php b/tests/core/data/PhoneNumberMetadataForTesting_CO.php new file mode 100644 index 00000000..0b4dda43 --- /dev/null +++ b/tests/core/data/PhoneNumberMetadataForTesting_CO.php @@ -0,0 +1,177 @@ + + array ( + 'NationalNumberPattern' => '(?:60|3\\d)\\d{8}', + 'PossibleLength' => + array ( + 0 => 10, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'fixedLine' => + array ( + 'NationalNumberPattern' => '60\\d{8}', + 'ExampleNumber' => '6012345678', + 'PossibleLength' => + array ( + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'mobile' => + array ( + 'NationalNumberPattern' => '3(?:0[0-5]|1\\d|2[0-3]|5[01]|70)\\d{7}', + 'ExampleNumber' => '3211234567', + 'PossibleLength' => + array ( + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'tollFree' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'premiumRate' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'sharedCost' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'personalNumber' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'voip' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'pager' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'uan' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'voicemail' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'noInternationalDialling' => + array ( + 'PossibleLength' => + array ( + 0 => -1, + ), + 'PossibleLengthLocalOnly' => + array ( + ), + ), + 'id' => 'CO', + 'countryCode' => 57, + 'internationalPrefix' => '', + 'nationalPrefix' => '0', + 'nationalPrefixForParsing' => '0(4(?:[14]4|56)|[579])?', + 'sameMobileAndFixedLinePattern' => false, + 'numberFormat' => + array ( + 0 => + array ( + 'pattern' => '(\\d{3})(\\d{7})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '6', + ), + 'nationalPrefixFormattingRule' => '($1)', + 'domesticCarrierCodeFormattingRule' => '0$CC $1', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 1 => + array ( + 'pattern' => '(\\d{3})(\\d{7})', + 'format' => '$1 $2', + 'leadingDigitsPatterns' => + array ( + 0 => '3', + ), + 'nationalPrefixFormattingRule' => '', + 'domesticCarrierCodeFormattingRule' => '0$CC $1', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + ), + 'intlNumberFormat' => + array ( + ), + 'mainCountryForCode' => false, + 'leadingZeroPossible' => false, + 'mobileNumberPortableRegion' => true, +);