Fix PHP 8.4 deprecations

headsnet · Dec 16, 2024 · f08f5f3 · f08f5f3
1 parent 97dce45
commit f08f5f3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/Serializer/Normalizer/MoneyAsDecimalNormalizer.php b/src/Serializer/Normalizer/MoneyAsDecimalNormalizer.php
@@ -28,26 +28,26 @@ public function __construct()
     }
 
     /**
-     * @param Money $object
+     * @param Money $data
      * @param array<string, string> $context
      */
-    public function normalize($object, string $format = null, array $context = []): string
+    public function normalize($data, string|null $format = null, array $context = []): string
     {
-        return $this->moneyFormatter->format($object);
+        return $this->moneyFormatter->format($data);
     }
 
     /**
      * @param array<string, string> $context
      */
-    public function supportsNormalization($data, string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string|null $format = null, array $context = []): bool
     {
         return $data instanceof Money;
     }
 
     /**
      * @return array<string, bool>
      */
-    public function getSupportedTypes(?string $format): array
+    public function getSupportedTypes(string|null $format): array
     {
         return [
             Money::class => true,

diff --git a/src/Serializer/Normalizer/MoneyNormalizer.php b/src/Serializer/Normalizer/MoneyNormalizer.php
@@ -18,23 +18,23 @@
 class MoneyNormalizer implements NormalizerInterface, DenormalizerInterface
 {
     /**
-     * @param Money $object
+     * @param Money $data
      * @param array<string, string> $context
      *
      * @return array{amount: string, currency: Currency}
      */
-    public function normalize($object, string $format = null, array $context = []): array
+    public function normalize($data, string|null $format = null, array $context = []): array
     {
         return [
-            'amount' => $object->getAmount(),
-            'currency' => $object->getCurrency(),
+            'amount' => $data->getAmount(),
+            'currency' => $data->getCurrency(),
         ];
     }
 
     /**
      * @param array<string, string> $context
      */
-    public function supportsNormalization($data, string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string|null $format = null, array $context = []): bool
     {
         return $data instanceof Money;
     }
@@ -43,15 +43,15 @@ public function supportsNormalization($data, string $format = null, array $conte
      * @param array{amount: numeric-string, currency: non-empty-string} $data
      * @param array<string, string> $context
      */
-    public function denormalize($data, string $type, string $format = null, array $context = []): Money
+    public function denormalize($data, string $type, string|null $format = null, array $context = []): Money
     {
         return new Money($data['amount'], new Currency($data['currency']));
     }
 
     /**
      * @param array<string, string> $context
      */
-    public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization($data, string $type, string|null $format = null, array $context = []): bool
     {
         if ($type !== Money::class) {
             return false;
@@ -63,7 +63,7 @@ public function supportsDenormalization($data, string $type, string $format = nu
     /**
      * @return array<string, bool>
      */
-    public function getSupportedTypes(?string $format): array
+    public function getSupportedTypes(string|null $format): array
     {
         return [
             Money::class => true,

diff --git a/src/Twig/Extension/FormatMoneyExtension.php b/src/Twig/Extension/FormatMoneyExtension.php
@@ -34,7 +34,7 @@ public function getFilters(): array
         return [new TwigFilter('money', [$this, 'moneyFilter'])];
     }
 
-    public function moneyFilter(Money $money, string $locale = null): string
+    public function moneyFilter(Money $money, string|null $locale = null): string
     {
         $defaultLocale = $this->translator->getLocale();