Merge branch '2.0'

Author: dunglas

src/Hal/Serializer/ItemNormalizer.php

@@ -44,6 +44,8 @@ public function supportsNormalization($data, $format = null)
     public function normalize($object, $format = null, array $context = [])
     {
         $context['cache_key'] = $this->getHalCacheKey($format, $context);
+        $resourceClass = $this->resourceClassResolver->getResourceClass($object, $context['resource_class'] ?? null, true);
+        $context = $this->initContext($resourceClass, $context);
 
         $rawData = parent::normalize($object, $format, $context);
         if (!is_array($rawData)) {

tests/Fixtures/TestBundle/Doctrine/Generator/Uuid.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Doctrine\Generator;
 
-class Uuid
+class Uuid implements \JsonSerializable
 {
     private $id;
 
@@ -26,4 +26,9 @@ public function __toString()
     {
         return $this->id;
     }
+
+    public function jsonSerialize()
+    {
+        return (string) $this->id;
+    }
 }

tests/Fixtures/TestBundle/Entity/CustomGeneratedIdentifier.php

@@ -37,6 +37,6 @@ class CustomGeneratedIdentifier
 
     public function getId()
     {
-        return (string) $this->id;
+        return $this->id;
     }
 }

tests/Hal/Serializer/ItemNormalizerTest.php

@@ -96,6 +96,7 @@ public function testNormalize()
 
         $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
         $resourceClassResolverProphecy->getResourceClass($dummy, null, true)->willReturn(Dummy::class)->shouldBeCalled();
+        $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class, true)->willReturn(Dummy::class)->shouldBeCalled();
 
         $serializerProphecy = $this->prophesize(SerializerInterface::class);
         $serializerProphecy->willImplement(NormalizerInterface::class);
@@ -119,4 +120,47 @@ public function testNormalize()
         ];
         $this->assertEquals($expected, $normalizer->normalize($dummy));
     }
+
+    public function testNormalizeWithoutCache()
+    {
+        $dummy = new Dummy();
+        $dummy->setName('hello');
+
+        $propertyNameCollection = new PropertyNameCollection(['name']);
+        $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
+        $propertyNameCollectionFactoryProphecy->create(Dummy::class, [])->willReturn($propertyNameCollection)->shouldBeCalled();
+
+        $propertyMetadataFactory = new PropertyMetadata(null, null, true);
+        $propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class);
+        $propertyMetadataFactoryProphecy->create(Dummy::class, 'name', [])->willReturn($propertyMetadataFactory)->shouldBeCalled();
+
+        $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
+        $iriConverterProphecy->getIriFromItem($dummy)->willReturn('/dummies/1988')->shouldBeCalled();
+
+        $resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
+        $resourceClassResolverProphecy->getResourceClass($dummy, null, true)->willReturn(Dummy::class)->shouldBeCalled();
+        $resourceClassResolverProphecy->getResourceClass($dummy, Dummy::class, true)->willReturn(Dummy::class)->shouldBeCalled();
+
+        $serializerProphecy = $this->prophesize(SerializerInterface::class);
+        $serializerProphecy->willImplement(NormalizerInterface::class);
+        $serializerProphecy->normalize('hello', null, Argument::type('array'))->willReturn('hello')->shouldBeCalled();
+
+        $normalizer = new ItemNormalizer(
+            $propertyNameCollectionFactoryProphecy->reveal(),
+            $propertyMetadataFactoryProphecy->reveal(),
+            $iriConverterProphecy->reveal(),
+            $resourceClassResolverProphecy->reveal()
+        );
+        $normalizer->setSerializer($serializerProphecy->reveal());
+
+        $expected = [
+            '_links' => [
+                'self' => [
+                    'href' => '/dummies/1988',
+                ],
+            ],
+            'name' => 'hello',
+        ];
+        $this->assertEquals($expected, $normalizer->normalize($dummy, null, ['not_serializable' => function () {}]));
+    }
 }