fix(ugrade): remove annotation, use only attribute

joelwurtz · joelwurtz · commit 757bddba8e15 · 2025-11-30T15:14:41.000+01:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -7,9 +7,3 @@ parameters:
 		- src/
 
 	tmpDir: cache
-
-	ignoreErrors:
-		-
-			message: "#^Method Symfony\\\\Component\\\\Serializer\\\\NameConverter\\\\NameConverterInterface\\:\\:normalize\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 2
-			path: src/EventListener/Symfony/AdvancedNameConverterListener.php
diff --git a/src/AutoMapper.php b/src/AutoMapper.php
@@ -19,7 +19,6 @@
 use AutoMapper\Transformer\PropertyTransformer\PropertyTransformerInterface;
 use AutoMapper\Transformer\PropertyTransformer\PropertyTransformerRegistry;
 use AutoMapper\Transformer\TransformerFactoryInterface;
-use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -28,9 +27,7 @@
 use Symfony\Component\Lock\Store\FlockStore;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
-use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 /**
@@ -143,7 +140,7 @@ public function mapCollection(iterable $collection, string $target, array $conte
     public static function create(
         Configuration $configuration = new Configuration(),
         ?string $cacheDirectory = null,
-        AdvancedNameConverterInterface|NameConverterInterface|null $nameConverter = null,
+        ?NameConverterInterface $nameConverter = null,
         array $transformerFactories = [],
         iterable $propertyTransformers = [],
         ?ExpressionLanguageProvider $expressionLanguageProvider = null,
@@ -153,9 +150,6 @@ public static function create(
     ): AutoMapperInterface {
         if (class_exists(AttributeLoader::class)) {
             $loaderClass = new AttributeLoader();
-        } elseif (class_exists(AnnotationReader::class) && class_exists(AnnotationLoader::class)) {
-            /** @var AttributeLoader $loaderClass */
-            $loaderClass = new AnnotationLoader(new AnnotationReader());
         } else {
             $loaderClass = null;
         }
diff --git a/src/EventListener/Symfony/NameConverterListener.php b/src/EventListener/Symfony/NameConverterListener.php
@@ -5,24 +5,29 @@
 namespace AutoMapper\EventListener\Symfony;
 
 use AutoMapper\Event\PropertyMetadataEvent;
-use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
-final readonly class AdvancedNameConverterListener
+final readonly class NameConverterListener
 {
     public function __construct(
-        private AdvancedNameConverterInterface|NameConverterInterface $nameConverter,
+        private NameConverterInterface $nameConverter,
     ) {
     }
 
     public function __invoke(PropertyMetadataEvent $event): void
     {
         if (($event->mapperMetadata->source === 'array' || $event->mapperMetadata->source === \stdClass::class) && $event->source->property === $event->target->property) {
-            $event->source->property = $this->nameConverter->normalize($event->target->property, $event->mapperMetadata->target);
+            /** @var class-string $target */
+            $target = $event->mapperMetadata->target;
+
+            $event->source->property = $this->nameConverter->normalize($event->target->property, $target);
         }
 
         if (($event->mapperMetadata->target === 'array' || $event->mapperMetadata->target === \stdClass::class) && $event->source->property === $event->target->property) {
-            $event->target->property = $this->nameConverter->normalize($event->source->property, $event->mapperMetadata->source);
+            /** @var class-string $source */
+            $source = $event->mapperMetadata->source;
+
+            $event->target->property = $this->nameConverter->normalize($event->source->property, $source);
         }
     }
 }
diff --git a/src/Extractor/FromSourceMappingExtractor.php b/src/Extractor/FromSourceMappingExtractor.php
@@ -19,6 +19,10 @@
  */
 final class FromSourceMappingExtractor extends MappingExtractor
 {
+    /**
+     * @param class-string $source
+     * @param 'array'      $target
+     */
     public function getTypes(string $source, SourcePropertyMetadata $sourceProperty, string $target, TargetPropertyMetadata $targetProperty, bool $extractTypesFromGetter): array
     {
         $sourceType = $this->sourceTypeExtractor->getType($source, $sourceProperty->property) ?? Type::mixed();
diff --git a/src/Extractor/FromTargetMappingExtractor.php b/src/Extractor/FromTargetMappingExtractor.php
@@ -19,6 +19,10 @@
  */
 final class FromTargetMappingExtractor extends MappingExtractor
 {
+    /**
+     * @param 'array'      $source
+     * @param class-string $target
+     */
     public function getTypes(string $source, SourcePropertyMetadata $sourceProperty, string $target, TargetPropertyMetadata $targetProperty, bool $extractTypesFromGetter): array
     {
         $targetType = $this->targetTypeExtractor->getType($target, $targetProperty->property) ?? Type::mixed();
diff --git a/src/Extractor/MappingExtractorInterface.php b/src/Extractor/MappingExtractorInterface.php
@@ -28,6 +28,9 @@ interface MappingExtractorInterface
     public function getProperties(string $class): iterable;
 
     /**
+     * @param class-string|'array' $source
+     * @param class-string|'array' $target
+     *
      * @return array{Type, Type}
      */
     public function getTypes(string $source, SourcePropertyMetadata $sourceProperty, string $target, TargetPropertyMetadata $targetProperty, bool $extractTypesFromGetter): array;
diff --git a/src/Extractor/SourceTargetMappingExtractor.php b/src/Extractor/SourceTargetMappingExtractor.php
@@ -17,6 +17,10 @@
  */
 class SourceTargetMappingExtractor extends MappingExtractor
 {
+    /**
+     * @param class-string $source
+     * @param class-string $target
+     */
     public function getTypes(string $source, SourcePropertyMetadata $sourceProperty, string $target, TargetPropertyMetadata $targetProperty, bool $extractTypesFromGetter): array
     {
         $sourceType = $this->sourceTypeExtractor->getType($source, $sourceProperty->property) ?? Type::mixed();
diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -16,8 +16,8 @@
 use AutoMapper\EventListener\MapProviderListener;
 use AutoMapper\EventListener\MapToContextListener;
 use AutoMapper\EventListener\MapToListener;
-use AutoMapper\EventListener\Symfony\AdvancedNameConverterListener;
 use AutoMapper\EventListener\Symfony\ClassDiscriminatorListener;
+use AutoMapper\EventListener\Symfony\NameConverterListener;
 use AutoMapper\EventListener\Symfony\SerializerGroupListener;
 use AutoMapper\EventListener\Symfony\SerializerIgnoreListener;
 use AutoMapper\EventListener\Symfony\SerializerMaxDepthListener;
@@ -56,7 +56,6 @@
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
 use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\Uid\AbstractUid;
@@ -352,7 +351,7 @@ public static function create(
         MetadataRegistry $metadataRegistry,
         ClassDiscriminatorResolver $classDiscriminatorResolver,
         ?ClassMetadataFactory $classMetadataFactory = null,
-        AdvancedNameConverterInterface|NameConverterInterface|null $nameConverter = null,
+        ?NameConverterInterface $nameConverter = null,
         ExpressionLanguage $expressionLanguage = new ExpressionLanguage(),
         EventDispatcherInterface $eventDispatcher = new EventDispatcher(),
         ?ObjectManager $objectManager = null,
@@ -375,13 +374,13 @@ public static function create(
         $reflectionExtractor = new ReflectionExtractor(accessFlags: $flags);
 
         if (null !== $classMetadataFactory) {
-            $eventDispatcher->addListener(PropertyMetadataEvent::class, new AdvancedNameConverterListener(new MetadataAwareNameConverter($classMetadataFactory, $nameConverter)));
+            $eventDispatcher->addListener(PropertyMetadataEvent::class, new NameConverterListener(new MetadataAwareNameConverter($classMetadataFactory, $nameConverter)));
             $eventDispatcher->addListener(PropertyMetadataEvent::class, new SerializerMaxDepthListener($classMetadataFactory));
             $eventDispatcher->addListener(PropertyMetadataEvent::class, new SerializerGroupListener($classMetadataFactory));
             $eventDispatcher->addListener(PropertyMetadataEvent::class, new SerializerIgnoreListener($classMetadataFactory));
             $eventDispatcher->addListener(GenerateMapperEvent::class, new ClassDiscriminatorListener(new ClassDiscriminatorFromClassMetadata($classMetadataFactory)));
         } elseif (null !== $nameConverter) {
-            $eventDispatcher->addListener(PropertyMetadataEvent::class, new AdvancedNameConverterListener($nameConverter));
+            $eventDispatcher->addListener(PropertyMetadataEvent::class, new NameConverterListener($nameConverter));
         }
 
         if (null !== $objectManager) {
diff --git a/src/Symfony/Bundle/DependencyInjection/AutoMapperExtension.php b/src/Symfony/Bundle/DependencyInjection/AutoMapperExtension.php
@@ -8,7 +8,7 @@
 use AutoMapper\Configuration as AutoMapperConfiguration;
 use AutoMapper\ConstructorStrategy;
 use AutoMapper\Event\PropertyMetadataEvent;
-use AutoMapper\EventListener\Symfony\AdvancedNameConverterListener;
+use AutoMapper\EventListener\Symfony\NameConverterListener;
 use AutoMapper\Exception\LogicException;
 use AutoMapper\Loader\ClassLoaderInterface;
 use AutoMapper\Loader\EvalLoader;
@@ -145,7 +145,7 @@ public function load(array $configs, ContainerBuilder $container): void
                     ->setArgument(1, new Reference($config['name_converter']));
             } else {
                 $container
-                    ->getDefinition(AdvancedNameConverterListener::class)
+                    ->getDefinition(NameConverterListener::class)
                     ->replaceArgument(0, new Reference($config['name_converter']))
                     ->addTag('kernel.event_listener', ['event' => PropertyMetadataEvent::class, 'priority' => -64]);
             }
diff --git a/src/Symfony/Bundle/Resources/config/event.php b/src/Symfony/Bundle/Resources/config/event.php
@@ -11,9 +11,9 @@
 use AutoMapper\EventListener\MapProviderListener;
 use AutoMapper\EventListener\MapToContextListener;
 use AutoMapper\EventListener\MapToListener;
-use AutoMapper\EventListener\Symfony\AdvancedNameConverterListener;
+use AutoMapper\EventListener\Symfony\NameConverterListener;
 use AutoMapper\Transformer\PropertyTransformer\PropertyTransformerRegistry;
-use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
@@ -31,7 +31,7 @@
         ->set(MapperListener::class)
             ->tag('kernel.event_listener', ['event' => GenerateMapperEvent::class, 'priority' => 256])
 
-        ->set(AdvancedNameConverterListener::class)
-            ->args([service(AdvancedNameConverterInterface::class)])
+        ->set(NameConverterListener::class)
+            ->args([service(NameConverterInterface::class)])
     ;
 };
diff --git a/src/Symfony/Bundle/Resources/config/event_serializer.php b/src/Symfony/Bundle/Resources/config/event_serializer.php
@@ -5,7 +5,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use AutoMapper\Event\PropertyMetadataEvent;
-use AutoMapper\EventListener\Symfony\AdvancedNameConverterListener;
+use AutoMapper\EventListener\Symfony\NameConverterListener;
 use AutoMapper\EventListener\Symfony\SerializerGroupListener;
 use AutoMapper\EventListener\Symfony\SerializerIgnoreListener;
 use AutoMapper\EventListener\Symfony\SerializerMaxDepthListener;
@@ -36,7 +36,7 @@
         ->set('automapper.mapping.metadata_aware_name_converter', MetadataAwareNameConverter::class)
             ->args([service('serializer.mapping.class_metadata_factory')])
 
-        ->set(AdvancedNameConverterListener::class)
+        ->set(NameConverterListener::class)
             ->args([service('automapper.mapping.metadata_aware_name_converter')])
             ->tag('kernel.event_listener', ['event' => PropertyMetadataEvent::class, 'priority' => -64])
     ;
diff --git a/tests/AutoMapperTest/GroupOverride/map.php b/tests/AutoMapperTest/GroupOverride/map.php
@@ -6,8 +6,8 @@
 
 use AutoMapper\Attribute\MapTo;
 use AutoMapper\Tests\AutoMapperBuilder;
-use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Annotation\Ignore;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\Ignore;
 
 class GroupOverride
 {
diff --git a/tests/AutoMapperTest/Ignore/map.php b/tests/AutoMapperTest/Ignore/map.php
@@ -5,7 +5,7 @@
 namespace AutoMapper\Tests\AutoMapperTest\Ignore;
 
 use AutoMapper\Tests\AutoMapperBuilder;
-use Symfony\Component\Serializer\Annotation\Ignore;
+use Symfony\Component\Serializer\Attribute\Ignore;
 
 class FooIgnore
 {
diff --git a/tests/AutoMapperTest/MaxDepth/map.php b/tests/AutoMapperTest/MaxDepth/map.php
@@ -5,7 +5,7 @@
 namespace AutoMapper\Tests\AutoMapperTest\MaxDepth;
 
 use AutoMapper\Tests\AutoMapperBuilder;
-use Symfony\Component\Serializer\Annotation\MaxDepth;
+use Symfony\Component\Serializer\Attribute\MaxDepth;
 
 class FooMaxDepth
 {
diff --git a/tests/Bundle/Resources/App/Entity/Pet.php b/tests/Bundle/Resources/App/Entity/Pet.php
@@ -4,7 +4,7 @@
 
 namespace AutoMapper\Tests\Bundle\Resources\App\Entity;
 
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
 
 #[
     DiscriminatorMap(typeProperty: 'type', mapping: [
diff --git a/tests/Fixtures/Bar.php b/tests/Fixtures/Bar.php
@@ -4,7 +4,7 @@
 
 namespace AutoMapper\Tests\Fixtures;
 
-use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 class Bar
 {
diff --git a/tests/Fixtures/Foo.php b/tests/Fixtures/Foo.php
@@ -4,7 +4,7 @@
 
 namespace AutoMapper\Tests\Fixtures;
 
-use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 class Foo
 {
diff --git a/tests/Fixtures/Pet.php b/tests/Fixtures/Pet.php
@@ -4,7 +4,7 @@
 
 namespace AutoMapper\Tests\Fixtures;
 
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
 
 #[DiscriminatorMap(typeProperty: 'type', mapping: [
     'cat' => Cat::class,
diff --git a/tests/Fixtures/UserWithYearOfBirth.php b/tests/Fixtures/UserWithYearOfBirth.php
@@ -4,7 +4,7 @@
 
 namespace AutoMapper\Tests\Fixtures;
 
-use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 class UserWithYearOfBirth
 {

Original file line number	Diff line number	Diff line change
`@@ -5,24 +5,29 @@`
`5`	`5`	`namespace AutoMapper\EventListener\Symfony;`
`6`	`6`
`7`	`7`	`use AutoMapper\Event\PropertyMetadataEvent;`
`8`		`-use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;`
`9`	`8`	`use Symfony\Component\Serializer\NameConverter\NameConverterInterface;`
`10`	`9`
`11`		`-final readonly class AdvancedNameConverterListener`
	`10`	`+final readonly class NameConverterListener`
`12`	`11`	`{`
`13`	`12`	`public function __construct(`
`14`		`- private AdvancedNameConverterInterface\|NameConverterInterface $nameConverter,`
	`13`	`+ private NameConverterInterface $nameConverter,`
`15`	`14`	`) {`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`public function __invoke(PropertyMetadataEvent $event): void`
`19`	`18`	`{`
`20`	`19`	`if (($event->mapperMetadata->source === 'array' \|\| $event->mapperMetadata->source === \stdClass::class) && $event->source->property === $event->target->property) {`
`21`		`- $event->source->property = $this->nameConverter->normalize($event->target->property, $event->mapperMetadata->target);`
	`20`	`+ /** @var class-string $target */`
	`21`	`+ $target = $event->mapperMetadata->target;`
	`22`	`+`
	`23`	`+ $event->source->property = $this->nameConverter->normalize($event->target->property, $target);`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`if (($event->mapperMetadata->target === 'array' \|\| $event->mapperMetadata->target === \stdClass::class) && $event->source->property === $event->target->property) {`
`25`		`- $event->target->property = $this->nameConverter->normalize($event->source->property, $event->mapperMetadata->source);`
	`27`	`+ /** @var class-string $source */`
	`28`	`+ $source = $event->mapperMetadata->source;`
	`29`	`+`
	`30`	`+ $event->target->property = $this->nameConverter->normalize($event->source->property, $source);`
`26`	`31`	`}`
`27`	`32`	`}`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@`
`19`	`19`	`*/`
`20`	`20`	`final class FromSourceMappingExtractor extends MappingExtractor`
`21`	`21`	`{`
	`22`	`+ /**`
	`23`	`+ * @param class-string $source`
	`24`	`+ * @param 'array' $target`
	`25`	`+ */`
`22`	`26`	`public function getTypes(string $source, SourcePropertyMetadata $sourceProperty, string $target, TargetPropertyMetadata $targetProperty, bool $extractTypesFromGetter): array`
`23`	`27`	`{`
`24`	`28`	`$sourceType = $this->sourceTypeExtractor->getType($source, $sourceProperty->property) ?? Type::mixed();`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@`
`17`	`17`	`*/`
`18`	`18`	`class SourceTargetMappingExtractor extends MappingExtractor`
`19`	`19`	`{`
	`20`	`+ /**`
	`21`	`+ * @param class-string $source`
	`22`	`+ * @param class-string $target`
	`23`	`+ */`
`20`	`24`	`public function getTypes(string $source, SourcePropertyMetadata $sourceProperty, string $target, TargetPropertyMetadata $targetProperty, bool $extractTypesFromGetter): array`
`21`	`25`	`{`
`22`	`26`	`$sourceType = $this->sourceTypeExtractor->getType($source, $sourceProperty->property) ?? Type::mixed();`