Merge pull request #7 from giggsey/google_5.8.2

Google 5.8.4
giggsey · Sep 20, 2013 · ef005af · ef005af
2 parents d43e54c + 5a4a97c
commit ef005af
Show file tree

Hide file tree

Showing 541 changed files with 1,849 additions and 612 deletions.
diff --git a/Tests/PhoneNumberUtilTest.php b/Tests/PhoneNumberUtilTest.php
@@ -276,6 +276,14 @@ public function testGetLengthOfNationalDestinationCode()
         $this->assertEquals(4, $this->phoneUtil->getLengthOfNationalDestinationCode(self::$internationalTollFree));
     }
 
+    public function testGetCountryMobileToken()
+    {
+        $this->assertEquals("1", $this->phoneUtil->getCountryMobileToken($this->phoneUtil->getCountryCodeForRegion(RegionCode::MX)));
+
+        // Country calling code for Sweden, which has no mobile token.
+        $this->assertEquals("", $this->phoneUtil->getCountryMobileToken($this->phoneUtil->getCountryCodeForRegion(RegionCode::SE)));
+    }
+
     public function testGetNationalSignificantNumber()
     {
         $this->assertEquals("6502530000", $this->phoneUtil->getNationalSignificantNumber(self::$usNumber));

diff --git a/Tests/ShortNumberInfoTest.php b/Tests/ShortNumberInfoTest.php
@@ -126,11 +126,11 @@ public function testGetExampleShortNumberForCost()
             $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::TOLL_FREE)
         );
         $this->assertEquals(
-            "118777",
+            "1023",
             $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::STANDARD_RATE)
         );
         $this->assertEquals(
-            "3200",
+            "42000",
             $this->shortInfo->getExampleShortNumberForCost(RegionCode::FR, ShortNumberCost::PREMIUM_RATE)
         );
         $this->assertEquals(

diff --git a/Tests/data/PhoneNumberMetadataForTesting_800.php b/Tests/data/PhoneNumberMetadataForTesting_800.php
@@ -123,5 +123,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => true,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_979.php b/Tests/data/PhoneNumberMetadataForTesting_979.php
@@ -123,5 +123,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_AD.php b/Tests/data/PhoneNumberMetadataForTesting_AD.php
@@ -113,5 +113,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_AE.php b/Tests/data/PhoneNumberMetadataForTesting_AE.php
@@ -113,5 +113,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_AO.php b/Tests/data/PhoneNumberMetadataForTesting_AO.php
@@ -125,5 +125,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_AR.php b/Tests/data/PhoneNumberMetadataForTesting_AR.php
@@ -216,5 +216,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_AU.php b/Tests/data/PhoneNumberMetadataForTesting_AU.php
@@ -138,5 +138,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_BR.php b/Tests/data/PhoneNumberMetadataForTesting_BR.php
@@ -113,5 +113,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_BS.php b/Tests/data/PhoneNumberMetadataForTesting_BS.php
@@ -115,5 +115,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_BY.php b/Tests/data/PhoneNumberMetadataForTesting_BY.php
@@ -148,5 +148,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_DE.php b/Tests/data/PhoneNumberMetadataForTesting_DE.php
@@ -183,5 +183,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_FR.php b/Tests/data/PhoneNumberMetadataForTesting_FR.php
@@ -113,5 +113,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_GB.php b/Tests/data/PhoneNumberMetadataForTesting_GB.php
@@ -159,5 +159,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_GG.php b/Tests/data/PhoneNumberMetadataForTesting_GG.php
@@ -113,5 +113,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_IT.php b/Tests/data/PhoneNumberMetadataForTesting_IT.php
@@ -157,5 +157,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => true,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_JP.php b/Tests/data/PhoneNumberMetadataForTesting_JP.php
@@ -197,5 +197,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => true,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_KR.php b/Tests/data/PhoneNumberMetadataForTesting_KR.php
@@ -259,5 +259,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_MX.php b/Tests/data/PhoneNumberMetadataForTesting_MX.php
@@ -216,5 +216,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_NZ.php b/Tests/data/PhoneNumberMetadataForTesting_NZ.php
@@ -151,5 +151,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_PL.php b/Tests/data/PhoneNumberMetadataForTesting_PL.php
@@ -125,5 +125,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_RE.php b/Tests/data/PhoneNumberMetadataForTesting_RE.php
@@ -126,5 +126,6 @@
   'mainCountryForCode' => NULL,
   'leadingDigits' => '262|6(?:9[23]|47)|8',
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_SG.php b/Tests/data/PhoneNumberMetadataForTesting_SG.php
@@ -150,5 +150,6 @@
   ),
   'mainCountryForCode' => NULL,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_US.php b/Tests/data/PhoneNumberMetadataForTesting_US.php
@@ -144,5 +144,6 @@
   ),
   'mainCountryForCode' => true,
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/Tests/data/PhoneNumberMetadataForTesting_YT.php b/Tests/data/PhoneNumberMetadataForTesting_YT.php
@@ -116,5 +116,6 @@
   'mainCountryForCode' => NULL,
   'leadingDigits' => '269|639',
   'leadingZeroPossible' => NULL,
+  'mobileNumberPortableRegion' => NULL,
 );
 /* EOF */
diff --git a/build/BuildMetadataFromXml.php b/build/BuildMetadataFromXml.php
@@ -43,6 +43,7 @@ class BuildMetadataFromXml
     const INTL_FORMAT = "intlFormat";
     const LEADING_DIGITS = "leadingDigits";
     const LEADING_ZERO_POSSIBLE = "leadingZeroPossible";
+    const MOBILE_NUMBER_PORTABLE_REGION = "mobileNumberPortableRegion";
     const MAIN_COUNTRY_FOR_CODE = "mainCountryForCode";
     const MOBILE = "mobile";
     const NATIONAL_NUMBER_PATTERN = "nationalNumberPattern";
@@ -191,6 +192,9 @@ private static function loadTerritoryTagMetadata(
         if ($element->hasAttribute(self::LEADING_ZERO_POSSIBLE)) {
             $metadata->setLeadingZeroPossible(true);
         }
+        if ($element->hasAttribute(self::MOBILE_NUMBER_PORTABLE_REGION)) {
+            $metadata->setMobileNumberPortableRegion(true);
+        }
         return $metadata;
     }
 
@@ -369,7 +373,9 @@ private static function loadGeneralDesc(PhoneMetadata $metadata, \DOMElement $el
         $metadata->setUan(self::processPhoneNumberDescElement($generalDesc, $element, self::UAN));
         $metadata->setEmergency(self::processPhoneNumberDescElement($generalDesc, $element, self::EMERGENCY));
         $metadata->setVoicemail(self::processPhoneNumberDescElement($generalDesc, $element, self::VOICEMAIL));
-        $metadata->setCarrierSpecific(self::processPhoneNumberDescElement($generalDesc, $element, self::CARRIER_SPECIFIC));
+        $metadata->setCarrierSpecific(
+            self::processPhoneNumberDescElement($generalDesc, $element, self::CARRIER_SPECIFIC)
+        );
 
 
         $metadata->setNoInternationalDialling(
@@ -452,7 +458,7 @@ public static function buildCountryCodeToRegionCodeMap($metadataCollection)
             $countryCode = $metadata->getCountryCode();
             if (array_key_exists($countryCode, $countryCodeToRegionCodeMap)) {
                 if ($metadata->getMainCountryForCode()) {
-                    array_unshift( $countryCodeToRegionCodeMap[$countryCode], $regionCode);
+                    array_unshift($countryCodeToRegionCodeMap[$countryCode], $regionCode);
                 } else {
                     $countryCodeToRegionCodeMap[$countryCode][] = $regionCode;
                 }

diff --git a/src/libphonenumber/AlternateFormatsCountryCodeSet.php b/src/libphonenumber/AlternateFormatsCountryCodeSet.php
@@ -33,9 +33,10 @@ class AlternateFormatsCountryCodeSet {
   20 => 380,
   21 => 385,
   22 => 595,
-  23 => 855,
-  24 => 971,
-  25 => 972,
+  23 => 675,
+  24 => 855,
+  25 => 971,
+  26 => 972,
 );
 
 }

diff --git a/src/libphonenumber/PhoneMetadata.php b/src/libphonenumber/PhoneMetadata.php
@@ -208,6 +208,21 @@ public function setLeadingZeroPossible($value) {
 		return $this;
 	}
 
+    private $mobileNumberPortableRegion = null;
+
+    public function hasMobileNumberPortableRegion() {
+        return isset($this->mobileNumberPortableRegion);
+    }
+
+    public function isMobileNumberPortableRegion() {
+        return $this->mobileNumberPortableRegion;
+    }
+
+    public function setMobileNumberPortableRegion($value) {
+        $this->mobileNumberPortableRegion = $value;
+        return $this;
+    }
+
 	private $generalDesc = null;
 
 	public function hasGeneralDesc() {
@@ -644,6 +659,8 @@ public function toArray() {
 
 		$output['leadingZeroPossible'] = $this->isLeadingZeroPossible();
 
+        $output['mobileNumberPortableRegion'] = $this->isMobileNumberPortableRegion();
+
 		return $output;
 	}
 
@@ -783,6 +800,8 @@ public function fromArray(array $input) {
 
 		$this->setLeadingZeroPossible($input['leadingZeroPossible']);
 
+        $this->setMobileNumberPortableRegion($input['mobileNumberPortableRegion']);
+
 		return $this;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,9 +33,10 @@ class AlternateFormatsCountryCodeSet { @@
 => 380,
 => 385,
 => 595,
-=> 855,
-=> 971,
-=> 972,
+=> 675,
+=> 855,
+=> 971,
+=> 972,
     );
     }
@@ Expand Down @@