Merge 2cc2ce4 into dcdea86

Author: bendavies

src/Hal/Serializer/ItemNormalizer.php

@@ -174,24 +174,29 @@ private function populateRelation(array $data, $object, string $format = null, a
                 continue;
             }
 
+            $relationName = $relation['name'];
+            if ($this->nameConverter) {
+                $relationName = $this->nameConverter->normalize($relationName);
+            }
+
             if ('one' === $relation['cardinality']) {
                 if ('links' === $type) {
-                    $data[$key][$relation['name']]['href'] = $this->getRelationIri($attributeValue);
+                    $data[$key][$relationName]['href'] = $this->getRelationIri($attributeValue);
                     continue;
                 }
 
-                $data[$key][$relation['name']] = $attributeValue;
+                $data[$key][$relationName] = $attributeValue;
                 continue;
             }
 
             // many
-            $data[$key][$relation['name']] = [];
+            $data[$key][$relationName] = [];
             foreach ($attributeValue as $rel) {
                 if ('links' === $type) {
                     $rel = ['href' => $this->getRelationIri($rel)];
                 }
 
-                $data[$key][$relation['name']][] = $rel;
+                $data[$key][$relationName][] = $rel;
             }
         }
 

tests/Hal/Serializer/ItemNormalizerTest.php

@@ -24,6 +24,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
@@ -41,12 +42,15 @@ public function testDonTSupportDenormalization()
         $propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class);
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
+        $nameConverter = $this->prophesize(NameConverterInterface::class);
 
         $normalizer = new ItemNormalizer(
             $propertyNameCollectionFactoryProphecy->reveal(),
             $propertyMetadataFactoryProphecy->reveal(),
             $iriConverterProphecy->reveal(),
-            $resourceClassResolverProphecy->reveal()
+            $resourceClassResolverProphecy->reveal(),
+            null,
+            $nameConverter->reveal()
         );
 
         $this->assertFalse($normalizer->supportsDenormalization('foo', ItemNormalizer::FORMAT));
@@ -67,11 +71,15 @@ public function testSupportNormalization()
         $resourceClassResolverProphecy->getResourceClass($dummy)->willReturn(Dummy::class)->shouldBeCalled();
         $resourceClassResolverProphecy->getResourceClass($std)->willThrow(new InvalidArgumentException())->shouldBeCalled();
 
+        $nameConverter = $this->prophesize(NameConverterInterface::class);
+
         $normalizer = new ItemNormalizer(
             $propertyNameCollectionFactoryProphecy->reveal(),
             $propertyMetadataFactoryProphecy->reveal(),
             $iriConverterProphecy->reveal(),
-            $resourceClassResolverProphecy->reveal()
+            $resourceClassResolverProphecy->reveal(),
+            null,
+            $nameConverter->reveal()
         );
 
         $this->assertTrue($normalizer->supportsNormalization($dummy, 'jsonhal'));
@@ -103,11 +111,16 @@ public function testNormalize()
         $serializerProphecy->willImplement(NormalizerInterface::class);
         $serializerProphecy->normalize('hello', null, Argument::type('array'))->willReturn('hello')->shouldBeCalled();
 
+        $nameConverter = $this->prophesize(NameConverterInterface::class);
+        $nameConverter->normalize('name')->shouldBeCalled()->willReturn('name');
+
         $normalizer = new ItemNormalizer(
             $propertyNameCollectionFactoryProphecy->reveal(),
             $propertyMetadataFactoryProphecy->reveal(),
             $iriConverterProphecy->reveal(),
-            $resourceClassResolverProphecy->reveal()
+            $resourceClassResolverProphecy->reveal(),
+            null,
+            $nameConverter->reveal()
         );
         $normalizer->setSerializer($serializerProphecy->reveal());
 
@@ -146,11 +159,16 @@ public function testNormalizeWithoutCache()
         $serializerProphecy->willImplement(NormalizerInterface::class);
         $serializerProphecy->normalize('hello', null, Argument::type('array'))->willReturn('hello')->shouldBeCalled();
 
+        $nameConverter = $this->prophesize(NameConverterInterface::class);
+        $nameConverter->normalize('name')->shouldBeCalled()->willReturn('name');
+
         $normalizer = new ItemNormalizer(
             $propertyNameCollectionFactoryProphecy->reveal(),
             $propertyMetadataFactoryProphecy->reveal(),
             $iriConverterProphecy->reveal(),
-            $resourceClassResolverProphecy->reveal()
+            $resourceClassResolverProphecy->reveal(),
+            null,
+            $nameConverter->reveal()
         );
         $normalizer->setSerializer($serializerProphecy->reveal());