feat: support for laravel 11.x and symfony 7.x

lotyp · lotyp · commit b05333d46480 · 2024-06-13T21:57:01.000+03:00
diff --git a/README.md b/README.md
@@ -1,21 +1,37 @@
-<br>
-
-<div align="center">
-<img width="456" src="https://raw.githubusercontent.com/wayofdev/laravel-symfony-serializer/master/assets/logo.gh-light-mode-only.png#gh-light-mode-only">
-<img width="456" src="https://raw.githubusercontent.com/wayofdev/laravel-symfony-serializer/master/assets/logo.gh-dark-mode-only.png#gh-dark-mode-only">
-</div>
-
-<br>
-
-<br>
+<p align="center">
+    <br>
+    <a href="https://wayof.dev" target="_blank">
+        <picture>
+            <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wayofdev/.github/master/assets/logo.gh-dark-mode-only.png">
+            <img width="400" src="https://raw.githubusercontent.com/wayofdev/.github/master/assets/logo.gh-light-mode-only.png" alt="WayOfDev Logo">
+        </picture>
+    </a>
+    <br>
+</p>
+
+<p align="center">
+    <strong>Build</strong><br>
+    <a href="https://github.com/wayofdev/laravel-symfony-serializer/actions" target="_blank"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fwayofdev%2Flaravel-symfony-serializer%2Fbadge&style=flat-square&label=github%20actions"/></a>
+</p>
+<p align="center">
+    <strong>Project</strong><br>
+    <a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer" target="_blank"><img src="https://img.shields.io/packagist/dt/wayofdev/laravel-symfony-serializer?&style=flat-square" alt="Total Downloads"></a>
+    <a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer" target="_blank"><img src="https://img.shields.io/packagist/v/wayofdev/laravel-symfony-serializer?&style=flat-square" alt="Latest Stable Version"></a>
+    <a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer" target="_blank"><img alt="Commits since latest release" src="https://img.shields.io/github/commits-since/wayofdev/laravel-symfony-serializer/latest?style=flat-square"></a>
+    <a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer" target="_blank"><img alt="PHP Version Require" src="https://poser.pugx.org/wayofdev/laravel-symfony-serializer/require/php?style=flat-square"></a>
+</p>
+<p align="center">
+    <strong>Quality</strong><br>
+    <a href="https://app.codecov.io/gh/wayofdev/laravel-symfony-serializer" target="_blank"><img alt="Codecov" src="https://img.shields.io/codecov/c/github/wayofdev/laravel-symfony-serializer?style=flat-square&logo=codecov"></a>
+    <a href="https://dashboard.stryker-mutator.io/reports/github.com/wayofdev/laravel-symfony-serializer/master" target="_blank"><img alt="Mutation testing badge" src="https://img.shields.io/endpoint?style=flat-square&label=mutation%20score&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fwayofdev%2Flaravel-symfony-serializer%2Fmaster"></a>
+    <a href=""><img src="https://img.shields.io/badge/phpstan%20level-6%20of%209-yellowgreen?style=flat-square" alt="PHP Stan Level 6 of 9"></a>
+</p>
+<p align="center">
+    <strong>Community</strong><br>
+    <a href="https://discord.gg/CE3TcCC5vr" target="_blank"><img alt="Discord" src="https://img.shields.io/discord/1228506758562058391?style=flat-square&logo=discord&labelColor=7289d9&logoColor=white&color=39456d"></a>
+    <a href="https://x.com/intent/follow?screen_name=wayofdev" target="_blank"><img alt="Follow on Twitter (X)" src="https://img.shields.io/badge/-Follow-black?style=flat-square&logo=X"></a>
+</p>
 
-<div align="center">
-<a href="https://github.com/wayofdev/laravel-symfony-serializer/actions"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fwayofdev%2Flaravel-symfony-serializer%2Fbadge&style=flat-square"/></a>
-<a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer"><img src="https://img.shields.io/packagist/dt/wayofdev/laravel-symfony-serializer?&style=flat-square" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer"><img src="https://img.shields.io/packagist/v/wayofdev/laravel-symfony-serializer?&style=flat-square" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer"><img src="https://img.shields.io/packagist/l/wayofdev/laravel-symfony-serializer?style=flat-square&color=blue" alt="Software License"/></a>
-<a href="https://packagist.org/packages/wayofdev/laravel-symfony-serializer"><img alt="Commits since latest release" src="https://img.shields.io/github/commits-since/wayofdev/laravel-symfony-serializer/latest?style=flat-square"></a>
-</div>
 <br>
 
 # Laravel Symfony Serializer
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -3,6 +3,7 @@
         "Illuminate\\Support\\ServiceProvider",
         "Illuminate\\Console\\Command",
         "config_path",
-        "Symfony\\Component\\Yaml\\Dumper"
+        "Symfony\\Component\\Yaml\\Dumper",
+        "Illuminate\\Http\\Response"
     ]
 }
diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
     },
     "require": {
         "php": "^8.2",
-        "doctrine/annotations": "^2.0",
         "illuminate/http": "^11.0",
         "symfony/property-access": "^7.1",
         "symfony/serializer": "^7.1",
@@ -68,8 +67,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "WayOfDev\\Serializer\\App\\": "tests/app/",
-            "WayOfDev\\Serializer\\Tests\\": "tests/src/"
+            "WayOfDev\\App\\": "tests/app/",
+            "WayOfDev\\Tests\\": "tests/src/"
         }
     },
     "config": {
diff --git a/infection.json.dist b/infection.json.dist
@@ -6,8 +6,8 @@
             "report": "master"
         }
     },
-    "minCoveredMsi": 55,
-    "minMsi": 55,
+    "minCoveredMsi": 90,
+    "minMsi": 85,
     "phpUnit": {
         "configDir": "./"
     },
diff --git a/src/Config.php b/src/Config.php
@@ -4,8 +4,7 @@
 
 namespace WayOfDev\Serializer;
 
-use Doctrine\Common\Annotations\AnnotationReader;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;
 use WayOfDev\Serializer\Contracts\ConfigRepository;
 use WayOfDev\Serializer\Exceptions\MissingRequiredAttributes;
@@ -63,6 +62,10 @@ public function encoders(): array
 
     public function metadataLoader(): LoaderInterface
     {
-        return new AnnotationLoader(new AnnotationReader());
+        if (! empty($this->config['metadataLoader'])) {
+            return $this->config['metadataLoader'];
+        }
+
+        return new AttributeLoader();
     }
 }
diff --git a/src/Normalizers/RamseyUuidNormalizer.php b/src/Normalizers/RamseyUuidNormalizer.php
@@ -4,6 +4,7 @@
 
 namespace WayOfDev\Serializer\Normalizers;
 
+use ArrayObject;
 use InvalidArgumentException;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
@@ -18,14 +19,16 @@
 final class RamseyUuidNormalizer implements NormalizerInterface, DenormalizerInterface
 {
     /**
-     * @phan-param-override UuidInterface $object
+     * @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;
     }
@@ -41,8 +44,18 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         }
     }
 
-    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|'*'|'object'|string, bool|null>
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            UuidInterface::class => true,
+        ];
+    }
 }
diff --git a/tests/app/Item.php b/tests/app/Item.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App;
+namespace WayOfDev\App;
 
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
diff --git a/tests/app/NestedObjects/City.php b/tests/app/NestedObjects/City.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App\NestedObjects;
+namespace WayOfDev\App\NestedObjects;
 
 use DateTimeZone;
 use JsonSerializable;
diff --git a/tests/app/NestedObjects/Country.php b/tests/app/NestedObjects/Country.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App\NestedObjects;
+namespace WayOfDev\App\NestedObjects;
 
 final class Country
 {
diff --git a/tests/app/Object/Author.php b/tests/app/Object/Author.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App\Object;
+namespace WayOfDev\App\Object;
 
 use Ramsey\Uuid\UuidInterface;
 
diff --git a/tests/app/Object/Post.php b/tests/app/Object/Post.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App\Object;
+namespace WayOfDev\App\Object;
 
 class Post
 {
diff --git a/tests/app/Object/Product.php b/tests/app/Object/Product.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App\Object;
+namespace WayOfDev\App\Object;
 
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
diff --git a/tests/app/Object/User.php b/tests/app/Object/User.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App\Object;
+namespace WayOfDev\App\Object;
 
 use DateTimeInterface;
 
diff --git a/tests/app/Response.php b/tests/app/Response.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\App;
+namespace WayOfDev\App;
 
 use ArrayIterator;
 use Webmozart\Assert\Assert;
diff --git a/tests/src/Arch/DebugTest.php b/tests/src/Arch/DebugTest.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+arch('do not forget dumps in your production code')
+    ->expect(['trap', 'dd', 'dump', 'exit', 'die', 'print_r', 'var_dump', 'echo', 'print'])
+    ->not
+    ->toBeUsed();
diff --git a/tests/src/Functional/Bridge/Laravel/Providers/SerializerServiceProviderTest.php b/tests/src/Functional/Bridge/Laravel/Providers/SerializerServiceProviderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests\Bridge\Laravel\Providers;
+namespace WayOfDev\Tests\Functional\Bridge\Laravel\Providers;
 
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -12,7 +12,7 @@
 use WayOfDev\Serializer\Contracts\NormalizersRegistryInterface;
 use WayOfDev\Serializer\EncodersRegistry;
 use WayOfDev\Serializer\NormalizersRegistry;
-use WayOfDev\Serializer\Tests\TestCase;
+use WayOfDev\Tests\Functional\TestCase;
 
 final class SerializerServiceProviderTest extends TestCase
 {
diff --git a/tests/src/Functional/EncodersRegistryTest.php b/tests/src/Functional/EncodersRegistryTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests;
+namespace WayOfDev\Tests\Functional;
 
 use PHPUnit\Framework\MockObject\Exception;
 use Symfony\Component\Serializer\Encoder\CsvEncoder;
diff --git a/tests/src/Functional/Normalizers/RamseyUuidNormalizerTest.php b/tests/src/Functional/Normalizers/RamseyUuidNormalizerTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests\Normalizers;
+namespace WayOfDev\Tests\Functional\Normalizers;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use Ramsey\Uuid\Uuid;
 use Traversable;
-use WayOfDev\Serializer\App\Object\Author;
+use WayOfDev\App\Object\Author;
 use WayOfDev\Serializer\SerializerManager;
-use WayOfDev\Serializer\Tests\TestCase;
+use WayOfDev\Tests\Functional\TestCase;
 
 use function preg_replace;
 
diff --git a/tests/src/Functional/NormalizersRegistryTest.php b/tests/src/Functional/NormalizersRegistryTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests;
+namespace WayOfDev\Tests\Functional;
 
 use PHPUnit\Framework\MockObject\Exception;
 use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;
diff --git a/tests/src/Functional/ResponseFactoryTest.php b/tests/src/Functional/ResponseFactoryTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests;
+namespace WayOfDev\Tests\Functional;
 
-use WayOfDev\Serializer\App\Item;
-use WayOfDev\Serializer\App\Object\Post;
-use WayOfDev\Serializer\App\Response;
+use WayOfDev\App\Item;
+use WayOfDev\App\Object\Post;
+use WayOfDev\App\Response;
 use WayOfDev\Serializer\ResponseFactory;
 use WayOfDev\Serializer\SerializerManager;
 
@@ -48,7 +48,7 @@ public function it_creates_from_array_iterator(): void
     public function it_creates_response_from_array(): void
     {
         $responseFactory = new ResponseFactory(app(SerializerManager::class));
-        $response = $responseFactory->fromArray(require __DIR__ . '/../app/array.php');
+        $response = $responseFactory->fromArray(require __DIR__ . '/../../app/array.php');
 
         self::assertEquals(200, $response->getStatusCode());
         self::assertEquals(
diff --git a/tests/src/Functional/SerializerManagerTest.php b/tests/src/Functional/SerializerManagerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests;
+namespace WayOfDev\Tests\Functional;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use Stringable;
diff --git a/tests/src/Functional/SerializerTest.php b/tests/src/Functional/SerializerTest.php
@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests;
+namespace WayOfDev\Tests\Functional;
 
 use DateTimeImmutable;
 use DateTimeZone;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Traversable;
-use WayOfDev\Serializer\App\NestedObjects\City;
-use WayOfDev\Serializer\App\NestedObjects\Country;
-use WayOfDev\Serializer\App\Object\Post;
-use WayOfDev\Serializer\App\Object\Product;
-use WayOfDev\Serializer\App\Object\User;
+use WayOfDev\App\NestedObjects\City;
+use WayOfDev\App\NestedObjects\Country;
+use WayOfDev\App\Object\Post;
+use WayOfDev\App\Object\Product;
+use WayOfDev\App\Object\User;
 use WayOfDev\Serializer\Serializer;
 use WayOfDev\Serializer\SerializerManager;
 
diff --git a/tests/src/Functional/TestCase.php b/tests/src/Functional/TestCase.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace WayOfDev\Serializer\Tests;
+namespace WayOfDev\Tests\Functional;
 
 use Orchestra\Testbench\TestCase as Orchestra;
 use WayOfDev\Serializer\Bridge\Laravel\Providers\SerializerServiceProvider;
diff --git a/tests/src/Pest.php b/tests/src/Pest.php
diff --git a/tests/src/Pest/ExampleTest.php b/tests/src/Pest/ExampleTest.php

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"Illuminate\\Support\\ServiceProvider",`
`4`	`4`	`"Illuminate\\Console\\Command",`
`5`	`5`	`"config_path",`
`6`		`- "Symfony\\Component\\Yaml\\Dumper"`
	`6`	`+ "Symfony\\Component\\Yaml\\Dumper",`
	`7`	`+ "Illuminate\\Http\\Response"`
`7`	`8`	`]`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace WayOfDev\Serializer;`
`6`	`6`
`7`		`-use Doctrine\Common\Annotations\AnnotationReader;`
`8`		`-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;`
	`7`	`+use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;`
`9`	`8`	`use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;`
`10`	`9`	`use WayOfDev\Serializer\Contracts\ConfigRepository;`
`11`	`10`	`use WayOfDev\Serializer\Exceptions\MissingRequiredAttributes;`
`@@ -63,6 +62,10 @@ public function encoders(): array`
`63`	`62`
`64`	`63`	`public function metadataLoader(): LoaderInterface`
`65`	`64`	`{`
`66`		`- return new AnnotationLoader(new AnnotationReader());`
	`65`	`+ if (! empty($this->config['metadataLoader'])) {`
	`66`	`+ return $this->config['metadataLoader'];`
	`67`	`+ }`
	`68`	`+`
	`69`	`+ return new AttributeLoader();`
`67`	`70`	`}`
`68`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace WayOfDev\Serializer\Normalizers;`
`6`	`6`
	`7`	`+use ArrayObject;`
`7`	`8`	`use InvalidArgumentException;`
`8`	`9`	`use Ramsey\Uuid\Uuid;`
`9`	`10`	`use Ramsey\Uuid\UuidInterface;`
`@@ -18,14 +19,16 @@`
`18`	`19`	`final class RamseyUuidNormalizer implements NormalizerInterface, DenormalizerInterface`
`19`	`20`	`{`
`20`	`21`	`/**`
`21`		`- * @phan-param-override UuidInterface $object`
	`22`	`+ * @param UuidInterface $object`
	`23`	`+ *`
	`24`	`+ * @psalm-suppress MoreSpecificImplementedParamType`
`22`	`25`	`*/`
`23`		`- public function normalize(mixed $object, ?string $format = null, array $context = []): string`
	`26`	`+ public function normalize(mixed $object, ?string $format = null, array $context = []): array\|string\|int\|float\|bool\|ArrayObject\|null`
`24`	`27`	`{`
`25`	`28`	`return $object->toString();`
`26`	`29`	`}`
`27`	`30`
`28`		`- public function supportsNormalization(mixed $data, ?string $format = null): bool`
	`31`	`+ public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool`
`29`	`32`	`{`
`30`	`33`	`return $data instanceof UuidInterface;`
`31`	`34`	`}`
`@@ -41,8 +44,18 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`
`44`		`- public function supportsDenormalization(mixed $data, string $type, ?string $format = null): bool`
	`47`	`+ public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool`
`45`	`48`	`{`
`46`	`49`	`return is_string($data) && is_a($type, UuidInterface::class, true) && Uuid::isValid($data);`
`47`	`50`	`}`
	`51`	`+`
	`52`	`+ /**`
	`53`	`+ * @return array<class-string\|'*'\|'object'\|string, bool\|null>`
	`54`	`+ */`
	`55`	`+ public function getSupportedTypes(?string $format): array`
	`56`	`+ {`
	`57`	`+ return [`
	`58`	`+ UuidInterface::class => true,`
	`59`	`+ ];`
	`60`	`+ }`
`48`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace WayOfDev\Serializer\App\NestedObjects;`
	`5`	`+namespace WayOfDev\App\NestedObjects;`
`6`	`6`
`7`	`7`	`final class Country`
`8`	`8`	`{`