Merge pull request #28 from spiral-packages/fix-normalizer

Fixed compatibility with `NormalizerInterface`
spiral-packages · Mar 21, 2024 · f484db5 · f484db5
2 parents a81c894 + ea39b43
commit f484db5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -2,7 +2,6 @@ on:
     pull_request: null
     push:
         branches:
-            - master
             - '*.*'
 
 name: phpunit
@@ -14,7 +13,5 @@ jobs:
             extensions: sockets, grpc
             os: >-
                 ['ubuntu-latest']
-            php: >-
-                ['8.1', '8.2']
             stability: >-
                 ['prefer-stable']
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -2,7 +2,6 @@ on:
     pull_request: null
     push:
         branches:
-            - master
             - '*.*'
 
 name: static analysis
@@ -13,5 +12,3 @@ jobs:
         with:
             os: >-
                 ['ubuntu-latest']
-            php: >-
-                ['8.1']
diff --git a/composer.json b/composer.json
@@ -16,14 +16,13 @@
         "spiral/config": "^3.7",
         "doctrine/annotations": "^1.12 || ^2.0",
         "spiral/serializer": "^3.7",
-        "symfony/serializer": "^5.4 || ^6.0 || ^7.0",
-        "symfony/property-access": "^5.4 || ^6.0 || ^7.0"
+        "symfony/serializer": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.2",
         "spiral/testing": "^2.7",
-        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.0",
+        "symfony/yaml": "^6.4 || ^7.0",
         "vimeo/psalm": "^5.12",
         "ramsey/uuid": "^4.7"
     },

diff --git a/src/Config/SerializerConfig.php b/src/Config/SerializerConfig.php
@@ -46,7 +46,9 @@ public function getMetadataLoader(): LoaderInterface
             return new AttributeLoader();
         }
 
+        /** @psalm-suppress DeprecatedClass */
         if (\class_exists(AnnotationLoader::class)) {
+            /** @psalm-suppress TooManyArguments, InvalidReturnStatement */
             return new AnnotationLoader(new AnnotationReader());
         }
 

diff --git a/src/Normalizer/RamseyUuidNormalizer.php b/src/Normalizer/RamseyUuidNormalizer.php
@@ -16,12 +16,12 @@ final class RamseyUuidNormalizer implements NormalizerInterface, DenormalizerInt
      * @param UuidInterface $object
      * @psalm-suppress MoreSpecificImplementedParamType
      */
-    public function normalize(mixed $object, string $format = null, array $context = []): string
+    public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
         return $object->toString();
     }
 
-    public function supportsNormalization(mixed $data, string $format = null): bool
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
     {
         return $data instanceof UuidInterface;
     }
@@ -37,11 +37,14 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         }
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
     {
         return \is_string($data) && \is_a($type, UuidInterface::class, true) && Uuid::isValid($data);
     }
 
+    /**
+     * @return array<class-string, bool>
+     */
     public function getSupportedTypes(?string $format): array
     {
         return [