Merge pull request #638 from giggsey/upstream-8.13.40

Upstream metadata changes from Google for v8.13.40

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.13.39
+v8.13.40

src/PhoneNumberUtil.php

@@ -164,6 +164,13 @@ class PhoneNumberUtil
      */
     protected static $GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES;
 
+    /**
+     * Set of country codes that doesn't have national prefix, but it has area codes.
+     *
+     * @var array
+     */
+    protected static $COUNTRIES_WITHOUT_NATIONAL_PREFIX_WITH_AREA_CODES;
+
     /**
      * Set of country calling codes that have geographically assigned mobile numbers. This may not be
      * complete; we add calling codes case by case, as we find geographical mobile numbers or hear
@@ -400,6 +407,9 @@ protected function __construct(MetadataSourceInterface $metadataSource, $country
         static::$GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES = array();
         static::$GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES[] = 86; // China
 
+        static::$COUNTRIES_WITHOUT_NATIONAL_PREFIX_WITH_AREA_CODES = array();
+        static::$COUNTRIES_WITHOUT_NATIONAL_PREFIX_WITH_AREA_CODES[] = 52; // Mexico
+
         static::$GEO_MOBILE_COUNTRIES = array();
         static::$GEO_MOBILE_COUNTRIES[] = 52; // Mexico
         static::$GEO_MOBILE_COUNTRIES[] = 54; // Argentina
@@ -873,14 +883,18 @@ public function getLengthOfGeographicalAreaCode(PhoneNumber $number)
         if ($metadata === null) {
             return 0;
         }
+
+        $countryCallingCode = $number->getCountryCode();
+
         // If a country doesn't use a national prefix, and this number doesn't have an Italian leading
         // zero, we assume it is a closed dialling plan with no area codes.
-        if (!$metadata->hasNationalPrefix() && !$number->isItalianLeadingZero()) {
+        // Note:this is our general assumption, but there are exceptions which are tracked in
+        // COUNTRIES_WITHOUT_NATIONAL_PREFIX_WITH_AREA_CODES.
+        if (!$metadata->hasNationalPrefix() && !$number->isItalianLeadingZero() && !in_array($countryCallingCode, self::$COUNTRIES_WITHOUT_NATIONAL_PREFIX_WITH_AREA_CODES)) {
             return 0;
         }
 
         $type = $this->getNumberType($number);
-        $countryCallingCode = $number->getCountryCode();
 
         if ($type === PhoneNumberType::MOBILE
             // Note this is a rough heuristic; it doesn't cover Indonesia well, for example, where area

src/carrier/data/en/230.php

@@ -54,6 +54,7 @@
   230701 => 'Emtel',
   230702 => 'MTML',
   230703 => 'Emtel',
+  230704 => 'Emtel',
   230730 => 'Emtel',
   230731 => 'MTML',
   230733 => 'Cellplus',

src/carrier/data/en/235.php

@@ -13,5 +13,6 @@
 return array (
   2356 => 'Airtel',
   2357 => 'Sotel',
+  2358 => 'Airtel',
   2359 => 'Tigo',
 );

src/carrier/data/en/592.php

@@ -52,14 +52,17 @@
   592720 => 'E-Networks',
   592721 => 'Digicel Guyana',
   592722 => 'Digicel Guyana',
+  592723 => 'Digicel Guyana',
+  592724 => 'Digicel Guyana',
   592725 => 'GTT',
   592726 => 'GTT',
   592727 => 'GTT',
   592728 => 'GTT',
   59273 => 'E-Networks',
+  59274 => 'Digicel Guyana',
   592740 => 'E-Networks',
   592741 => 'E-Networks',
   592742 => 'E-Networks',
-  592749 => 'GTT',
   59275 => 'GTT',
+  592750 => 'Digicel Guyana',
 );

src/carrier/data/en/852.php

@@ -13,15 +13,15 @@
 return array (
   852440 => 'China Mobile',
   852441 => 'HKT',
-  852442 => 'Hutchison Telecom.',
+  852442 => 'Hutchison Telecom',
   852443 => 'HKT',
   852444 => 'HKT',
-  8524441 => 'Hutchison Telecom.',
-  8524442 => 'Hutchison Telecom.',
+  8524441 => 'Hutchison Telecom',
+  8524442 => 'Hutchison Telecom',
   852445 => 'HKT',
-  852446 => 'Hutchison Telecom.',
+  852446 => 'Hutchison Telecom',
   852447 => 'China Mobile',
-  852448 => 'Hutchison Telecom.',
+  852448 => 'Hutchison Telecom',
   852460 => 'China Unicom',
   8524607 => 'Multibyte',
   8524608 => 'HKT',
@@ -71,6 +71,7 @@
   852468 => 'China Mobile',
   852469 => 'China Mobile',
   8524699 => 'South China Telecommunications',
+  85247 => 'Hutchison Telecom',
   852510 => 'China Mobile',
   852511 => 'HKT',
   852512 => 'China Mobile',
@@ -288,19 +289,20 @@
   852697 => 'HKT',
   852699 => 'China Mobile',
   852701 => 'China Mobile',
-  852702 => 'Hutchison Telecom.',
+  852702 => 'Hutchison Telecom',
+  852703 => 'Hutchison Telecom',
   8527071 => 'SmarTone',
   8527072 => 'SmarTone',
   8527073 => 'SmarTone',
   8527074 => 'SmarTone',
   8527075 => 'SmarTone',
   8527076 => 'China Mobile',
-  8527077 => 'Hutchison Telecom.',
-  8527078 => 'Hutchison Telecom.',
+  8527077 => 'Hutchison Telecom',
+  8527078 => 'Hutchison Telecom',
   852708 => 'HKT',
-  852709 => 'Hutchison Telecom.',
+  852709 => 'Hutchison Telecom',
   852840 => 'China Mobile',
-  852841 => 'Hutchison Telecom.',
+  852841 => 'Hutchison Telecom',
   852842 => 'HKT',
   8528480 => 'HKT',
   8528481 => 'HKT',
@@ -315,8 +317,8 @@
   852901 => 'SmarTone',
   852902 => 'HKT',
   852903 => 'HKT',
-  852904 => 'Hutchison Telecom.',
-  852905 => 'Hutchison Telecom.',
+  852904 => 'Hutchison Telecom',
+  852905 => 'Hutchison Telecom',
   852906 => 'China Mobile',
   852907 => 'HKT',
   852908 => 'HKT',

src/carrier/data/en/880.php

@@ -15,7 +15,7 @@
   88013 => 'Grameenphone',
   88014 => 'Banglalink',
   88015 => 'TeleTalk',
-  88016 => 'Airtel',
+  88016 => 'Robi',
   88017 => 'Grameenphone',
   88018 => 'Robi',
   88019 => 'Banglalink',

src/carrier/data/en/995.php

@@ -37,6 +37,7 @@
   99550090 => 'Cellfie',
   99550099 => 'Silknet',
   995501 => 'Cellfie',
+  995502 => 'Silknet',
   9955050 => 'Silknet',
   9955055 => 'MagtiCom',
   995507 => 'Globalcell',

src/carrier/data/zh/852.php

@@ -70,6 +70,7 @@
   852468 => '中国移动',
   852469 => '中国移动',
   8524699 => '中國南方電信(香港)有限公司',
+  85247 => '和記電話有限公司',
   852510 => '中国移动',
   852511 => '香港移动通讯',
   852512 => '中国移动',
@@ -253,6 +254,7 @@
   852699 => '中国移动',
   852701 => '中国移动',
   852702 => '和記電話有限公司',
+  852703 => '和記電話有限公司',
   8527071 => '数码通',
   8527072 => '数码通',
   8527073 => '数码通',

src/data/PhoneNumberMetadata_FI.php

@@ -32,7 +32,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:1[3-79][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}',
+    'NationalNumberPattern' => '1[35-7][1-8]\\d{3,6}|(?:1[49][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}',
     'ExampleNumber' => '131234567',
     'PossibleLength' => 
     array (
@@ -247,7 +247,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
+        0 => '(?:1[49]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -310,7 +310,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
+        0 => '(?:1[49]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9',
       ),
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',

src/data/PhoneNumberMetadata_GE.php

@@ -40,7 +40,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|77\\d)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
+    'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
     'ExampleNumber' => '555123456',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_GY.php

@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[013]\\d|2[0-25-8]|4[0-29]|5[1-9]))\\d{4}',
+    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[0135]\\d|2[0-8]|4[0-24-9]))\\d{4}',
     'ExampleNumber' => '6091234',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_HK.php

@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[129]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9]|70)|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-39]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
     'ExampleNumber' => '51234567',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_IL.php

@@ -105,7 +105,7 @@
   ),
   'voip' => 
   array (
-    'NationalNumberPattern' => '7(?:38(?:0\\d|5[0-29]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
+    'NationalNumberPattern' => '7(?:38(?:0\\d|5[0-259]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
     'ExampleNumber' => '771234567',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_MU.php

@@ -40,7 +40,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-3]|3[013]))\\d{5}',
+    'NationalNumberPattern' => '5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-4]|3[013]))\\d{5}',
     'ExampleNumber' => '52512345',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_MX.php

@@ -27,7 +27,7 @@
   ),
   'fixedLine' => 
   array (
-    '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(?:[1346][1-9]|[27]\\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[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\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[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\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[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
     'ExampleNumber' => '2001234567',
     'PossibleLength' => 
     array (
@@ -40,7 +40,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '657[12]\\d{6}|(?: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(?:[1346][1-9]|[27]\\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[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
+    'NationalNumberPattern' => '657[12]\\d{6}|(?: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[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\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[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
     'ExampleNumber' => '2221234567',
     'PossibleLength' => 
     array (

src/data/PhoneNumberMetadata_TD.php

@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:22|[69]\\d|77)\\d{6}',
+    'NationalNumberPattern' => '(?:22|[689]\\d|77)\\d{6}',
     'PossibleLength' => 
     array (
       0 => 8,
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:6[0-689]|77|9\\d)\\d{6}',
+    'NationalNumberPattern' => '(?:[69]\\d|77|8[56])\\d{6}',
     'ExampleNumber' => '63012345',
     'PossibleLength' => 
     array (
@@ -148,7 +148,7 @@
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[2679]',
+        0 => '[26-9]',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',

src/data/ShortNumberMetadata_FI.php

@@ -62,7 +62,7 @@
   ),
   'shortCode' => 
   array (
-    'NationalNumberPattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|75[12]\\d\\d',
+    'NationalNumberPattern' => '11(?:2|6(?:00[06]|1(?:1[17]|23)))|(?:1[235-8]\\d|75[12])\\d\\d',
     'ExampleNumber' => '112',
     'PossibleLength' => 
     array (
@@ -73,9 +73,11 @@
   ),
   'standardRate' => 
   array (
+    'NationalNumberPattern' => '1[235-8]\\d{3}',
+    'ExampleNumber' => '12000',
     'PossibleLength' => 
     array (
-      0 => -1,
+      0 => 5,
     ),
     'PossibleLengthLocalOnly' => 
     array (

src/geocoding/data/en/52.php

@@ -224,6 +224,7 @@
   526572 => 'Juarez/Chihuahua',
   52658 => 'Baja California',
   52659 => 'Chihuahua',
+  52660 => 'Culiacan',
   52661 => 'Primo Tapia/Rosarito, BCN',
   52662 => 'Sonora',
   52665 => 'Tecate, BCN',

src/geocoding/data/es/52.php

@@ -69,6 +69,7 @@
   52632 => 'Ímuris/Magdalena, SON',
   52641 => 'Benjamín Hill/Santa Ana, SON',
   52653 => 'Luis B. Sánchez/San Luis Río Colorado, SON',
+  52660 => 'Culiacán',
   52711 => 'México/Michoacán',
   52712 => 'Estado de México',
   52714 => 'Estado de México',

src/timezone/data/map_data.php

@@ -2307,6 +2307,7 @@
   52657 => 'America/Mazatlan',
   52658 => 'America/Tijuana',
   52659 => 'America/Mazatlan',
+  52660 => 'America/Mazatlan',
   52661 => 'America/Tijuana',
   52662 => 'America/Mazatlan',
   52663 => 'America/Mexico_City',

tests/core/PhoneNumberUtilTest.php

@@ -333,6 +333,9 @@ public function testGetLengthOfGeographicalAreaCode()
         $this->assertEquals(1, $this->phoneUtil->getLengthOfGeographicalAreaCode(self::$auNumber));
 
         // Italian numbers - there is no national prefix, but it still has an area code.
+        $this->assertEquals(2, $this->phoneUtil->getLengthOfGeographicalAreaCode(self::$mxNumber1));
+
+        // Mexico numbers - there is no national prefix, but it still has an area code.
         $this->assertEquals(2, $this->phoneUtil->getLengthOfGeographicalAreaCode(self::$itNumber));
 
         // Google Singapore. Singapore has no area code and no national prefix.