Strip extension before appending formatted extension

Mirrors google/libphonenumber#3724
giggsey · Jan 15, 2025 · 0474ef7 · 0474ef7
1 parent cc9a82b
commit 0474ef7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php
@@ -2776,6 +2776,9 @@ public function formatOutOfCountryKeepingAlphaChars(PhoneNumber $number, $region
         $regionCode = $this->getRegionCodeForCountryCode($countryCode);
         // Metadata cannot be null because the country calling code is valid.
         $metadataForRegion = $this->getMetadataForRegionOrCallingCode($countryCode, $regionCode);
+        // Strip any extension
+        $this->maybeStripExtension($formattedNumber);
+        // Append the formatted extension
         $this->maybeAppendFormattedExtension(
             $number,
             $metadataForRegion,

diff --git a/tests/core/PhoneNumberUtilTest.php b/tests/core/PhoneNumberUtilTest.php
@@ -880,6 +880,13 @@ public function testFormatOutOfCountryKeepingAlphaChars()
             $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumber, RegionCode::BS)
         );
 
+        // Testing a number with extension.
+        $alphaNumericNumberWithExtn = $this->phoneUtil->parseAndKeepRawInput('800 SIX-flag ext. 1234', RegionCode::US);
+        $this->assertEquals(
+            '0011 1 800 SIX-FLAG extn. 1234',
+            $this->phoneUtil->formatOutOfCountryKeepingAlphaChars($alphaNumericNumberWithExtn, RegionCode::AU)
+        );
+
         // Testing that if the raw input doesn't exist, it is formatted using
         // formatOutOfCountryCallingNumber.
         $alphaNumericNumber->clearRawInput();