Fix MetadataAwareNameConverterPass condition

Author: meyerbaptiste

src/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php

@@ -36,15 +36,15 @@ public function __construct(?NameConverterInterface $decorated = null)
     /**
      * {@inheritdoc}
      */
-    public function normalize($propertyName, string $class = null, string $format = null, $context = [])
+    public function normalize($propertyName, string $class = null, string $format = null, array $context = [])
     {
         return $this->convertInnerFields($propertyName, true, $class, $format, $context);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function denormalize($propertyName, string $class = null, string $format = null, $context = [])
+    public function denormalize($propertyName, string $class = null, string $format = null, array $context = [])
     {
         return $this->convertInnerFields($propertyName, false, $class, $format, $context);
     }

src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php

@@ -33,8 +33,16 @@ final class MetadataAwareNameConverterPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasAlias('api_platform.name_converter') && $container->hasDefinition('serializer.name_converter.metadata_aware')) {
-            $container->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware');
+        if ($container->hasAlias('api_platform.name_converter') || !$container->hasDefinition('serializer.name_converter.metadata_aware')) {
+            return;
         }
+
+        $definition = $container->getDefinition('serializer.name_converter.metadata_aware');
+
+        if (1 >= \count($definition->getArguments()) || null === $definition->getArgument(1)) {
+            return;
+        }
+
+        $container->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware');
     }
 }

tests/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPassTest.php

@@ -17,20 +17,33 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * @author Antoine Bluchet <[email protected]>
  */
 class MetadataAwareNameConverterPassTest extends TestCase
 {
+    public function testConstruct()
+    {
+        $this->assertInstanceOf(CompilerPassInterface::class, new MetadataAwareNameConverterPass());
+    }
+
     public function testProcess()
     {
         $pass = new MetadataAwareNameConverterPass();
-        $this->assertInstanceOf(CompilerPassInterface::class, $pass);
+
+        $arguments = [new Reference('serializer.mapping.class_metadata_factory'), new Reference('app.name_converter')];
+
+        $definition = $this->prophesize(Definition::class);
+        $definition->getArguments()->willReturn($arguments)->shouldBeCalled();
+        $definition->getArgument(1)->willReturn($arguments[1])->shouldBeCalled();
 
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->shouldBeCalled()->willReturn(false);
-        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->shouldBeCalled()->willReturn(true);
+        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->willReturn(false)->shouldBeCalled();
+        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->willReturn(true)->shouldBeCalled();
+        $containerBuilderProphecy->getDefinition('serializer.name_converter.metadata_aware')->willReturn($definition)->shouldBeCalled();
         $containerBuilderProphecy->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware')->shouldBeCalled();
 
         $pass->process($containerBuilderProphecy->reveal());
@@ -39,11 +52,11 @@ public function testProcess()
     public function testProcessWithNameConverter()
     {
         $pass = new MetadataAwareNameConverterPass();
-        $this->assertInstanceOf(CompilerPassInterface::class, $pass);
 
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->shouldBeCalled()->willReturn(true);
-        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->shouldNotBeCalled()->willReturn(true);
+        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->willReturn(true)->shouldBeCalled();
+        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->shouldNotBeCalled();
+        $containerBuilderProphecy->getDefinition('serializer.name_converter.metadata_aware')->shouldNotBeCalled();
         $containerBuilderProphecy->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware')->shouldNotBeCalled();
 
         $pass->process($containerBuilderProphecy->reveal());
@@ -52,11 +65,29 @@ public function testProcessWithNameConverter()
     public function testProcessWithoutMetadataAwareDefinition()
     {
         $pass = new MetadataAwareNameConverterPass();
-        $this->assertInstanceOf(CompilerPassInterface::class, $pass);
 
         $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
-        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->shouldBeCalled()->willReturn(false);
-        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->shouldBeCalled()->willReturn(false);
+        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->willReturn(false)->shouldBeCalled();
+        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->willReturn(false)->shouldBeCalled();
+        $containerBuilderProphecy->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware')->shouldNotBeCalled();
+
+        $pass->process($containerBuilderProphecy->reveal());
+    }
+
+    public function testProcessWithMetadataAwareDefinitionSecondArgumentNull()
+    {
+        $pass = new MetadataAwareNameConverterPass();
+
+        $arguments = [new Reference('serializer.mapping.class_metadata_factory'), null];
+
+        $definition = $this->prophesize(Definition::class);
+        $definition->getArguments()->willReturn($arguments)->shouldBeCalled();
+        $definition->getArgument(1)->willReturn($arguments[1])->shouldBeCalled();
+
+        $containerBuilderProphecy = $this->prophesize(ContainerBuilder::class);
+        $containerBuilderProphecy->hasAlias('api_platform.name_converter')->willReturn(false)->shouldBeCalled();
+        $containerBuilderProphecy->hasDefinition('serializer.name_converter.metadata_aware')->willReturn(true)->shouldBeCalled();
+        $containerBuilderProphecy->getDefinition('serializer.name_converter.metadata_aware')->willReturn($definition)->shouldBeCalled();
         $containerBuilderProphecy->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware')->shouldNotBeCalled();
 
         $pass->process($containerBuilderProphecy->reveal());