update giggsey/libphonenumber-for-php-lite (#38)

Author: danny-janse

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": ">=8.1",
         "ext-intl": "*",
-        "giggsey/libphonenumber-for-php-lite": "^8.13.11",
+        "giggsey/libphonenumber-for-php-lite": "^9.0.12",
         "moneyphp/money": "^3.3 || ^4.0"
     },
     "autoload": {

src/PhoneNumber/PhoneNumberFormatOptions.php

@@ -3,8 +3,6 @@
 
 namespace DR\Internationalization\PhoneNumber;
 
-use libphonenumber\PhoneNumberFormat;
-
 /**
  * @phpstan-type Format self::FORMAT_*
  */
@@ -13,22 +11,22 @@ class PhoneNumberFormatOptions
     /**
      * Formats the NL phoneNumber "101234567" as "+31101234567"
      */
-    public const FORMAT_E164 = PhoneNumberFormat::E164;
+    public const FORMAT_E164 = 0;
 
     /**
      * Formats the NL phoneNumber "101234567" as "+31 10 123 4567"
      */
-    public const FORMAT_INTERNATIONAL = PhoneNumberFormat::INTERNATIONAL;
+    public const FORMAT_INTERNATIONAL = 1;
 
     /**
      * Formats the NL phoneNumber "101234567" as "010 123 4567"
      */
-    public const FORMAT_NATIONAL = PhoneNumberFormat::NATIONAL;
+    public const FORMAT_NATIONAL = 2;
 
     /**
      * Formats the NL phoneNumber "101234567" as "tel:+31-10-123-4567"
      */
-    public const FORMAT_RFC3966 = PhoneNumberFormat::RFC3966;
+    public const FORMAT_RFC3966 = 3;
 
     /**
      * Formats the NL phoneNumber "101234567" as "0031101234567"

src/PhoneNumber/PhoneNumberTypeEnum.php

@@ -16,8 +16,20 @@ enum PhoneNumberTypeEnum: string
     case PAGER = 'PAGER';
     case UAN = 'UAN';
     case UNKNOWN = 'UNKNOWN';
+
+    /**
+     * @deprecated Unsupported, will be removed in version 2.0
+     */
     case EMERGENCY = 'EMERGENCY';
     case VOICEMAIL = 'VOICEMAIL';
+
+    /**
+     * @deprecated Unsupported, will be removed in version 2.0
+     */
     case SHORT_CODE = 'SHORT_CODE';
+
+    /**
+     * @deprecated Unsupported, will be removed in version 2.0
+     */
     case STANDARD_RATE = 'STANDARD_RATE';
 }

src/PhoneNumberFormatService.php

@@ -7,6 +7,7 @@
 use DR\Internationalization\PhoneNumber\PhoneNumberFormatOptions;
 use InvalidArgumentException;
 use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 
 class PhoneNumberFormatService
@@ -43,12 +44,12 @@ public function format(string|PhoneNumber $phoneNumber, PhoneNumberFormatOptions
             $metaData = $this->phoneNumberUtil->getMetadataForRegion((string)$countryCode);
             $prefix   = $metaData?->getInternationalPrefix() ?? $metaData?->getPreferredInternationalPrefix();
             if (is_numeric($prefix)) {
-                return $prefix . ltrim($this->phoneNumberUtil->format($parsedNumber, PhoneNumberFormatOptions::FORMAT_E164), '+');
+                return $prefix . ltrim($this->phoneNumberUtil->format($parsedNumber, PhoneNumberFormat::E164), '+');
             }
 
-            return $this->phoneNumberUtil->format($parsedNumber, PhoneNumberFormatOptions::FORMAT_E164);
+            return $this->phoneNumberUtil->format($parsedNumber, PhoneNumberFormat::E164);
         }
 
-        return $this->phoneNumberUtil->format($parsedNumber, $format);
+        return $this->phoneNumberUtil->format($parsedNumber, PhoneNumberFormat::from($format));
     }
 }

src/PhoneNumberParseService.php

@@ -25,7 +25,7 @@ public function parse(string $phoneNumber, ?string $countryCode = null): PhoneNu
         $countryCode ??= $this->defaultCountryCode;
 
         try {
-            $parsedNumber = $this->phoneNumberUtil->parse($phoneNumber, $countryCode, keepRawInput: true);
+            $parsedNumber = $this->phoneNumberUtil->parse($phoneNumber, $countryCode, null, true);
         } catch (NumberParseException $e) {
             throw new InvalidArgumentException("Unable to parse phoneNumber: " . $phoneNumber, 0, $e);
         }
@@ -48,16 +48,27 @@ public function parse(string $phoneNumber, ?string $countryCode = null): PhoneNu
             (string)$parsedNumber->getNationalNumber(),
             (string)$parsedNumber->getRawInput(),
             (string)$this->phoneNumberUtil->getRegionCodeForNumber($parsedNumber),
-            $this->getNumberType($this->phoneNumberUtil->getNumberType($parsedNumber)),
+            $this->convertNumberType($this->phoneNumberUtil->getNumberType($parsedNumber)),
             $parsedNumber,
             $parsedNumber->getExtension()
         );
     }
 
-    private function getNumberType(int $numberType): PhoneNumberTypeEnum
+    private function convertNumberType(PhoneNumberType $numberType): PhoneNumberTypeEnum
     {
-        $numberType = PhoneNumberType::values()[$numberType];
-
-        return PhoneNumberTypeEnum::tryFrom($numberType) ?? PhoneNumberTypeEnum::UNKNOWN;
+        return match ($numberType) {
+            PhoneNumberType::FIXED_LINE => PhoneNumberTypeEnum::FIXED_LINE,
+            PhoneNumberType::MOBILE => PhoneNumberTypeEnum::MOBILE,
+            PhoneNumberType::FIXED_LINE_OR_MOBILE => PhoneNumberTypeEnum::FIXED_LINE_OR_MOBILE,
+            PhoneNumberType::TOLL_FREE => PhoneNumberTypeEnum::TOLL_FREE,
+            PhoneNumberType::PREMIUM_RATE => PhoneNumberTypeEnum::PREMIUM_RATE,
+            PhoneNumberType::SHARED_COST => PhoneNumberTypeEnum::SHARED_COST,
+            PhoneNumberType::VOIP => PhoneNumberTypeEnum::VOIP,
+            PhoneNumberType::PERSONAL_NUMBER => PhoneNumberTypeEnum::PERSONAL_NUMBER,
+            PhoneNumberType::PAGER => PhoneNumberTypeEnum::PAGER,
+            PhoneNumberType::UAN => PhoneNumberTypeEnum::UAN,
+            PhoneNumberType::VOICEMAIL => PhoneNumberTypeEnum::VOICEMAIL,
+            default => PhoneNumberTypeEnum::UNKNOWN,
+        };
     }
 }

tests/Unit/PhoneNumberParseServiceTest.php

@@ -73,5 +73,10 @@ public static function parseProvider(): Generator
         yield ['NL', '0294-787123', '00', '31', '294787123', PhoneNumberTypeEnum::FIXED_LINE, 'NL'];
 
         yield ['FR', '01 50 12 08 32', '00', '33', '150120832', PhoneNumberTypeEnum::FIXED_LINE, 'FR'];
+
+        yield ['SE', '+46 -75 123 45 67', '00', '46', '751234567', PhoneNumberTypeEnum::PERSONAL_NUMBER, 'SE'];
+        yield ['SE', '+46 -74 012 34 56', '00', '46', '740123456', PhoneNumberTypeEnum::PAGER, 'SE'];
+        yield ['SE', '+46 -10 234 56 78', '00', '46', '102345678', PhoneNumberTypeEnum::UAN, 'SE'];
+        yield ['SE', '+46 -25 412 34 56 789', '00', '46', '254123456789', PhoneNumberTypeEnum::VOICEMAIL, 'SE'];
     }
 }