Update formatForMobileDialling() for Columbia 03

The national code 03 is deprecated after Colombia renumbering

Mirrors google/libphonenumber#2786

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

src/CountryCodeToRegionCodeMapForTesting.php

@@ -68,6 +68,10 @@ class CountryCodeToRegionCodeMapForTesting {
   array (
     0 => 'BR',
   ),
+  57 => 
+  array (
+    0 => 'CO',
+  ),
   61 => 
   array (
     0 => 'AU',

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.

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';

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)