feat(name): support metadata aware name converter

Author: joelwurtz

src/EventListener/Symfony/AdvancedNameConverterListener.php

@@ -18,7 +18,7 @@ public function __construct(
     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->denormalize($event->target->property, $event->mapperMetadata->target);
+            $event->source->property = $this->nameConverter->normalize($event->target->property, $event->mapperMetadata->target);
         }
 
         if (($event->mapperMetadata->target === 'array' || $event->mapperMetadata->target === \stdClass::class) && $event->source->property === $event->target->property) {

src/Metadata/MetadataFactory.php

@@ -51,6 +51,7 @@
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 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;
 
@@ -343,14 +344,13 @@ public static function create(
         $reflectionExtractor = new ReflectionExtractor(accessFlags: $flags);
         $phpStanExtractor = new PhpStanExtractor();
 
-        if (null !== $nameConverter) {
-            $eventDispatcher->addListener(PropertyMetadataEvent::class, new AdvancedNameConverterListener($nameConverter));
-        }
-
         if (null !== $classMetadataFactory) {
+            $eventDispatcher->addListener(PropertyMetadataEvent::class, new AdvancedNameConverterListener(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));
+        } elseif (null !== $nameConverter) {
+            $eventDispatcher->addListener(PropertyMetadataEvent::class, new AdvancedNameConverterListener($nameConverter));
         }
 
         $eventDispatcher->addListener(PropertyMetadataEvent::class, new MapToContextListener($reflectionExtractor));

src/Symfony/Bundle/DependencyInjection/AutoMapperExtension.php

@@ -136,10 +136,15 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         if (null !== $config['name_converter']) {
-            $container
-                ->getDefinition(AdvancedNameConverterListener::class)
-                ->replaceArgument(0, new Reference($config['name_converter']))
-                ->addTag('kernel.event_listener', ['event' => PropertyMetadataEvent::class, 'priority' => -64]);
+            if ($container->has('automapper.mapping.metadata_aware_name_converter')) {
+                $container->getDefinition('automapper.mapping.metadata_aware_name_converter')
+                    ->setArgument(1, new Reference($config['name_converter']));
+            } else {
+                $container
+                    ->getDefinition(AdvancedNameConverterListener::class)
+                    ->replaceArgument(0, new Reference($config['name_converter']))
+                    ->addTag('kernel.event_listener', ['event' => PropertyMetadataEvent::class, 'priority' => -64]);
+            }
         }
 
         $configMappingRegistry = $container->getDefinition('automapper.config_mapping_registry');

src/Symfony/Bundle/Resources/config/event_serializer.php

@@ -5,11 +5,13 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use AutoMapper\Event\PropertyMetadataEvent;
+use AutoMapper\EventListener\Symfony\AdvancedNameConverterListener;
 use AutoMapper\EventListener\Symfony\SerializerGroupListener;
 use AutoMapper\EventListener\Symfony\SerializerIgnoreListener;
 use AutoMapper\EventListener\Symfony\SerializerMaxDepthListener;
 use AutoMapper\Generator\Shared\ClassDiscriminatorResolver;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
+use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
@@ -30,5 +32,12 @@
 
         ->set('automapper.mapping.class_discriminator_from_class_metadata', ClassDiscriminatorFromClassMetadata::class)
             ->args([service('serializer.mapping.class_metadata_factory')])
+
+        ->set('automapper.mapping.metadata_aware_name_converter', MetadataAwareNameConverter::class)
+            ->args([service('serializer.mapping.class_metadata_factory')])
+
+        ->set(AdvancedNameConverterListener::class)
+            ->args([service('automapper.mapping.metadata_aware_name_converter')])
+            ->tag('kernel.event_listener', ['event' => PropertyMetadataEvent::class, 'priority' => -64])
     ;
 };

tests/AutoMapperTest/ConstructorWithSerializedName/expected.from_array.data

@@ -0,0 +1,4 @@
+AutoMapper\Tests\AutoMapperTest\ConstructorWithSerializedName\Bar {
+  +isStatic: true
+}
+

tests/AutoMapperTest/ConstructorWithSerializedName/map.php

@@ -16,9 +16,6 @@ public function __construct(
     }
 }
 
-$autoMapper = AutoMapperBuilder::buildAutoMapper();
-
-
 return (function () {
     $autoMapper = AutoMapperBuilder::buildAutoMapper();