Fix PHP 8.4 compatibility

giggsey · Oct 8, 2024 · 3a06bf9 · 3a06bf9
1 parent 5338f04
commit 3a06bf9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build/BuildMetadataFromXml.php b/build/BuildMetadataFromXml.php
@@ -585,7 +585,7 @@ public static function setPossibleLengthsGeneralDesc(PhoneNumberDesc $generalDes
      * @param int[] $lengths
      * @param int[] $localOnlyLengths
      */
-    private static function setPossibleLengths(array $lengths, array $localOnlyLengths, PhoneNumberDesc $desc, PhoneNumberDesc $parentDesc = null): void
+    private static function setPossibleLengths(array $lengths, array $localOnlyLengths, PhoneNumberDesc $desc, ?PhoneNumberDesc $parentDesc = null): void
     {
         // We clear these fields since the metadata tends to inherit from the parent element for other
         // fields (via a mergeFrom).

diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php
@@ -397,9 +397,9 @@ protected function __construct(MetadataSourceInterface $metadataSource, array $c
      */
     public static function getInstance(
         string $baseFileLocation = self::META_DATA_FILE_PREFIX,
-        array $countryCallingCodeToRegionCodeMap = null,
-        MetadataLoaderInterface $metadataLoader = null,
-        MetadataSourceInterface $metadataSource = null
+        ?array $countryCallingCodeToRegionCodeMap = null,
+        ?MetadataLoaderInterface $metadataLoader = null,
+        ?MetadataSourceInterface $metadataSource = null
     ): PhoneNumberUtil {
         if (static::$instance === null) {
             if ($countryCallingCodeToRegionCodeMap === null) {
@@ -2969,7 +2969,7 @@ public function isValidNumberForRegion(PhoneNumber $number, string $regionCode):
      *                               and the number is not in international format (does not start
      *                               with +)
      */
-    public function parse(string $numberToParse, ?string $defaultRegion = null, PhoneNumber $phoneNumber = null, bool $keepRawInput = false): PhoneNumber
+    public function parse(string $numberToParse, ?string $defaultRegion = null, ?PhoneNumber $phoneNumber = null, bool $keepRawInput = false): PhoneNumber
     {
         if ($phoneNumber === null) {
             $phoneNumber = new PhoneNumber();