[Serializer] Fix Serializer deprecations merge

alexandre-daubois · alexandre-daubois · commit 61a23a317ae4 · 2023-10-17T16:36:12.000+02:00
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -547,6 +547,7 @@ Serializer
        // ...
    }
    ```
+ * Remove `AnnotationLoader`, use `AttributeLoader` instead
 
 Templating
 ----------
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1858,9 +1858,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         $serializerLoaders = [];
         if (isset($config['enable_attributes']) && $config['enable_attributes']) {
-            $annotationLoader = new Definition(AttributeLoader::class);
+            $attributeLoader = new Definition(AttributeLoader::class);
 
-            $serializerLoaders[] = $annotationLoader;
+            $serializerLoaders[] = $attributeLoader;
         }
 
         $fileRecorder = function ($extension, $path) use (&$serializerLoaders) {
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -13,7 +13,7 @@ CHANGELOG
  * Require explicit argument when calling `AttributeMetadata::setSerializedName()` and `ClassMetadata::setClassDiscriminatorMapping()`
  * Add argument `$context` to `NormalizerInterface::supportsNormalization()` and `DenormalizerInterface::supportsDenormalization()`
  * Remove Doctrine annotations support in favor of native attributes
- * Remove the annotation reader parameter from the constructor of `AnnotationLoader`
+ * Remove `AnnotationLoader`, use `AttributeLoader` instead
 
 6.4
 ---
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php
@@ -307,7 +307,3 @@ private function getPropertyAnnotations(\ReflectionProperty $reflector): array
         return $annotations;
     }
 }
-
-if (!class_exists(AnnotationLoader::class, false)) {
-    class_alias(AttributeLoader::class, AnnotationLoader::class);
-}
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderTest.php
@@ -18,14 +18,12 @@
 use Symfony\Component\Serializer\Mapping\AttributeMetadata;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummyFirstChild;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummySecondChild;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\AbstractDummyThirdChild;
-use Symfony\Component\Serializer\Tests\Fixtures\Attributes\BadAttributeDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\BadMethodContextDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\ContextDummyParent;
 use Symfony\Component\Serializer\Tests\Fixtures\Attributes\ContextDummyPromotedProperties;
@@ -46,19 +44,16 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-<<<<<<<< HEAD:src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
-========
-abstract class AttributeLoaderTestCase extends TestCase
->>>>>>>> 6.4:src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderTestCase.php
+class AttributeLoaderTest extends TestCase
 {
     use ContextMappingTestTrait;
     use ExpectDeprecationTrait;
 
-    private AnnotationLoader $loader;
+    protected AttributeLoader $loader;
 
     protected function setUp(): void
     {
-        $this->loader = new AnnotationLoader();
+        $this->loader = new AttributeLoader();
     }
 
     public function testInterface()
@@ -226,9 +221,7 @@ public function testLoadGroupsOnClass()
         self::assertSame(['a'], $attributesMetadata['baz']->getGroups());
     }
 
-    abstract protected function createLoader(): AttributeLoader;
-
-    protected function getLoaderForContextMapping(): AnnotationLoader
+    protected function getLoaderForContextMapping(): AttributeLoader
     {
         return $this->loader;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderWithAttributesTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AttributeLoaderWithAttributesTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 
-class AttributeLoaderWithAttributesTest extends AttributeLoaderTestCase
+class AttributeLoaderWithAttributesTest extends AttributeLoaderTest
 {
     protected function createLoader(): AttributeLoader
     {

Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,7 @@ Serializer`
`547`	`547`	`// ...`
`548`	`548`	`}`
`549`	`549`	```
	`550`	+ * Remove `AnnotationLoader`, use `AttributeLoader` instead
`550`	`551`
`551`	`552`	`Templating`
`552`	`553`	`----------`
Original file line number	Diff line number	Diff line change
`@@ -1858,9 +1858,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1858`	`1858`
`1859`	`1859`	`$serializerLoaders = [];`
`1860`	`1860`	`if (isset($config['enable_attributes']) && $config['enable_attributes']) {`
`1861`		`- $annotationLoader = new Definition(AttributeLoader::class);`
	`1861`	`+ $attributeLoader = new Definition(AttributeLoader::class);`
`1862`	`1862`
`1863`		`- $serializerLoaders[] = $annotationLoader;`
	`1863`	`+ $serializerLoaders[] = $attributeLoader;`
`1864`	`1864`	`}`
`1865`	`1865`
`1866`	`1866`	`$fileRecorder = function ($extension, $path) use (&$serializerLoaders) {`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,3 @@ private function getPropertyAnnotations(\ReflectionProperty $reflector): array`
`307`	`307`	`return $annotations;`
`308`	`308`	`}`
`309`	`309`	`}`
`310`		`-`
`311`		`-if (!class_exists(AnnotationLoader::class, false)) {`
`312`		`- class_alias(AttributeLoader::class, AnnotationLoader::class);`
`313`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Symfony\Component\Serializer\Mapping\ClassMetadata;`
`16`	`16`	`use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;`
`17`	`17`
`18`		`-class AttributeLoaderWithAttributesTest extends AttributeLoaderTestCase`
	`18`	`+class AttributeLoaderWithAttributesTest extends AttributeLoaderTest`
`19`	`19`	`{`
`20`	`20`	`protected function createLoader(): AttributeLoader`
`21`	`21`	`{`