Refactor hasFormattingPatternForNumber to only call chooseFormattingPatternForNumber once

Mirrors google/libphonenumber#3976

Author: giggsey

src/PhoneNumberUtil.php

@@ -2687,7 +2687,9 @@ public function isNANPACountry(string $regionCode): bool
      */
     public function formatInOriginalFormat(PhoneNumber $number, string $regionCallingFrom): string
     {
-        if ($number->hasRawInput() && !$this->hasFormattingPatternForNumber($number)) {
+        $formatRule = $this->getFormattingPatternForNumber($number);
+
+        if ($number->hasRawInput() && $formatRule === null) {
             // We check if we have the formatting pattern because without that, we might format the number
             // as a group without national prefix.
             return $number->getRawInput();
@@ -2731,11 +2733,6 @@ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallin
                     $formattedNumber = $nationalFormat;
                     break;
                 }
-                // Metadata cannot be null here because getNddPrefixForRegion() (above) returns null if
-                // there is no metadata for the region.
-                $metadata = $this->getMetadataForRegion($regionCode);
-                $nationalNumber = $this->getNationalSignificantNumber($number);
-                $formatRule = $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber);
                 // The format rule could still be null here if the national number was 0 and there was no
                 // raw input (this should not be possible for numbers generated by the phonenumber library
                 // as they would also not have a country calling code and we would have exited earlier).
@@ -2782,17 +2779,19 @@ public function formatInOriginalFormat(PhoneNumber $number, string $regionCallin
         return $formattedNumber;
     }
 
-    protected function hasFormattingPatternForNumber(PhoneNumber $number): bool
+    /**
+     * Called chooseFormattingPatternForNumber in libphonenumber
+     */
+    protected function getFormattingPatternForNumber(PhoneNumber $number): ?NumberFormat
     {
         $countryCallingCode = $number->getCountryCode();
         $phoneNumberRegion = $this->getRegionCodeForCountryCode($countryCallingCode);
         $metadata = $this->getMetadataForRegionOrCallingCode($countryCallingCode, $phoneNumberRegion);
         if ($metadata === null) {
-            return false;
+            return null;
         }
         $nationalNumber = $this->getNationalSignificantNumber($number);
-        $formatRule = $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber);
-        return $formatRule !== null;
+        return $this->chooseFormattingPatternForNumber($metadata->numberFormats(), $nationalNumber);
     }
 
     /**