Add unit tests. Fix a bug in DateTimeIdentifierNormalizer.

dunglas · dunglas · commit 414c5bc3e2f5 · 2018-05-31T17:31:53.000+02:00
diff --git a/src/Hydra/Serializer/PartialCollectionViewNormalizer.php b/src/Hydra/Serializer/PartialCollectionViewNormalizer.php
@@ -108,7 +108,7 @@ public function supportsNormalization($data, $format = null)
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return true;
+        return $this->collectionNormalizer instanceof CacheableSupportsMethodInterface && $this->collectionNormalizer->hasCacheableSupportsMethod();
     }
 
     /**
diff --git a/src/Identifier/Normalizer/DateTimeIdentifierDenormalizer.php b/src/Identifier/Normalizer/DateTimeIdentifierDenormalizer.php
@@ -14,18 +14,16 @@
 namespace ApiPlatform\Core\Identifier\Normalizer;
 
 use ApiPlatform\Core\Exception\InvalidIdentifierException;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-final class DateTimeIdentifierDenormalizer extends DateTimeNormalizer implements DenormalizerInterface, CacheableSupportsMethodInterface
+final class DateTimeIdentifierDenormalizer extends DateTimeNormalizer
 {
     public function denormalize($data, $class, $format = null, array $context = [])
     {
         try {
             return parent::denormalize($data, $class, $format, $context);
-        } catch (InvalidArgumentException $e) {
+        } catch (NotNormalizableValueException $e) {
             throw new InvalidIdentifierException($e->getMessage(), $e->getCode(), $e);
         }
     }
diff --git a/src/Identifier/Normalizer/IntegerDenormalizer.php b/src/Identifier/Normalizer/IntegerDenormalizer.php
@@ -14,9 +14,10 @@
 namespace ApiPlatform\Core\Identifier\Normalizer;
 
 use Symfony\Component\PropertyInfo\Type;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-final class IntegerDenormalizer implements DenormalizerInterface
+final class IntegerDenormalizer implements DenormalizerInterface, CacheableSupportsMethodInterface
 {
     public function denormalize($data, $class, $format = null, array $context = []): int
     {
@@ -30,4 +31,12 @@ public function supportsDenormalization($data, $type, $format = null): bool
     {
         return Type::BUILTIN_TYPE_INT === $type && \is_string($data);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasCacheableSupportsMethod(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Swagger/Serializer/ApiGatewayNormalizer.php b/src/Swagger/Serializer/ApiGatewayNormalizer.php
@@ -115,6 +115,6 @@ public function supportsNormalization($data, $format = null)
      */
     public function hasCacheableSupportsMethod(): bool
     {
-        return true;
+        return $this->documentationNormalizer instanceof CacheableSupportsMethodInterface && $this->documentationNormalizer->hasCacheableSupportsMethod();
     }
 }
diff --git a/tests/Hal/Serializer/CollectionNormalizerTest.php b/tests/Hal/Serializer/CollectionNormalizerTest.php
@@ -34,6 +34,7 @@ public function testSupportsNormalize()
         $this->assertTrue($normalizer->supportsNormalization(new \ArrayObject(), CollectionNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization([], 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \ArrayObject(), 'xml'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalizeApiSubLevel()
diff --git a/tests/Hal/Serializer/EntrypointNormalizerTest.php b/tests/Hal/Serializer/EntrypointNormalizerTest.php
@@ -42,6 +42,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization($entrypoint, EntrypointNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization($entrypoint, 'json'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), EntrypointNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Hal/Serializer/ItemNormalizerTest.php b/tests/Hal/Serializer/ItemNormalizerTest.php
@@ -86,6 +86,7 @@ public function testSupportsNormalization()
         $this->assertTrue($normalizer->supportsNormalization($dummy, 'jsonhal'));
         $this->assertFalse($normalizer->supportsNormalization($dummy, 'xml'));
         $this->assertFalse($normalizer->supportsNormalization($std, 'jsonhal'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php b/tests/Hydra/Serializer/CollectionFiltersNormalizerTest.php
@@ -22,6 +22,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
@@ -32,7 +33,9 @@ class CollectionFiltersNormalizerTest extends TestCase
     public function testSupportsNormalization()
     {
         $decoratedProphecy = $this->prophesize(NormalizerInterface::class);
+        $decoratedProphecy->willImplement(CacheableSupportsMethodInterface::class);
         $decoratedProphecy->supportsNormalization('foo', 'abc')->willReturn(true)->shouldBeCalled();
+        $decoratedProphecy->hasCacheableSupportsMethod()->willReturn(true)->shouldBeCalled();
 
         $normalizer = new CollectionFiltersNormalizer(
             $decoratedProphecy->reveal(),
@@ -42,6 +45,7 @@ public function testSupportsNormalization()
         );
 
         $this->assertTrue($normalizer->supportsNormalization('foo', 'abc'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testDoNothingIfSubLevel()
diff --git a/tests/Hydra/Serializer/CollectionNormalizerTest.php b/tests/Hydra/Serializer/CollectionNormalizerTest.php
@@ -44,6 +44,7 @@ public function testSupportsNormalize()
         $this->assertTrue($normalizer->supportsNormalization(new \ArrayObject(), CollectionNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization([], 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \ArrayObject(), 'xml'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalizeApiSubLevel()
diff --git a/tests/Hydra/Serializer/ConstraintViolationNormalizerTest.php b/tests/Hydra/Serializer/ConstraintViolationNormalizerTest.php
@@ -37,6 +37,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization(new ConstraintViolationList(), ConstraintViolationListNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization(new ConstraintViolationList(), 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ConstraintViolationListNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Hydra/Serializer/DocumentationNormalizerTest.php b/tests/Hydra/Serializer/DocumentationNormalizerTest.php
@@ -89,7 +89,7 @@ public function testNormalize()
             ],
         ]);
 
-        $apiDocumentationBuilder = new DocumentationNormalizer(
+        $documentationNormalizer = new DocumentationNormalizer(
             $resourceMetadataFactoryProphecy->reveal(),
             $propertyNameCollectionFactoryProphecy->reveal(),
             $propertyMetadataFactoryProphecy->reveal(),
@@ -347,6 +347,9 @@ public function testNormalize()
             ],
             'hydra:entrypoint' => '/',
         ];
-        $this->assertEquals($expected, $apiDocumentationBuilder->normalize($documentation));
+        $this->assertEquals($expected, $documentationNormalizer->normalize($documentation));
+        $this->assertTrue($documentationNormalizer->supportsNormalization($documentation, 'jsonld'));
+        $this->assertFalse($documentationNormalizer->supportsNormalization($documentation, 'hal'));
+        $this->assertTrue($documentationNormalizer->hasCacheableSupportsMethod());
     }
 }
diff --git a/tests/Hydra/Serializer/EntrypointNormalizerTest.php b/tests/Hydra/Serializer/EntrypointNormalizerTest.php
@@ -42,6 +42,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization($entrypoint, EntrypointNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization($entrypoint, 'json'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), EntrypointNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Hydra/Serializer/ErrorNormalizerTest.php b/tests/Hydra/Serializer/ErrorNormalizerTest.php
@@ -37,6 +37,7 @@ public function testSupportsNormalization()
         $this->assertTrue($normalizer->supportsNormalization(new FlattenException(), ErrorNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization(new FlattenException(), 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ErrorNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     /**
diff --git a/tests/Hydra/Serializer/ItemNormalizerTest.php b/tests/Hydra/Serializer/ItemNormalizerTest.php
@@ -48,6 +48,7 @@ public function testDontSupportDenormalization()
         $normalizer = new ItemNormalizer($resourceMetadataFactoryProphecy->reveal(), $propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $iriConverterProphecy->reveal(), $resourceClassResolverProphecy->reveal(), $contextBuilderProphecy->reveal());
 
         $this->assertFalse($normalizer->supportsDenormalization('foo', ItemNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testSupportNormalization()
@@ -78,6 +79,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization($dummy, 'jsonld'));
         $this->assertFalse($normalizer->supportsNormalization($dummy, 'xml'));
         $this->assertFalse($normalizer->supportsNormalization($std, 'jsonld'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php b/tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php
@@ -18,6 +18,7 @@
 use ApiPlatform\Core\Hydra\Serializer\PartialCollectionViewNormalizer;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -105,10 +106,13 @@ private function normalizePaginator($partial = false)
     public function testSupportsNormalization()
     {
         $decoratedNormalizerProphecy = $this->prophesize(NormalizerInterface::class);
+        $decoratedNormalizerProphecy->willImplement(CacheableSupportsMethodInterface::class);
         $decoratedNormalizerProphecy->supportsNormalization(Argument::any(), null)->willReturn(true)->shouldBeCalled();
+        $decoratedNormalizerProphecy->hasCacheableSupportsMethod()->willReturn(true)->shouldBeCalled();
 
         $normalizer = new PartialCollectionViewNormalizer($decoratedNormalizerProphecy->reveal());
         $this->assertTrue($normalizer->supportsNormalization(new \stdClass()));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testSetNormalizer()
diff --git a/tests/Identifier/Normalizer/DateTimeIdentifierNormalizerTest.php b/tests/Identifier/Normalizer/DateTimeIdentifierNormalizerTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Core\Tests\Identifier\Normalizer;
+
+use ApiPlatform\Core\Identifier\Normalizer\DateTimeIdentifierDenormalizer;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class DateTimeIdentifierNormalizerTest extends TestCase
+{
+    /**
+     * @expectedException \ApiPlatform\Core\Exception\InvalidIdentifierException
+     */
+    public function testDenormalize()
+    {
+        $normalizer = new DateTimeIdentifierDenormalizer();
+        $normalizer->denormalize('not valid', \DateTimeImmutable::class);
+    }
+
+    public function testHasCacheableSupportsMethod()
+    {
+        $this->assertTrue((new DateTimeIdentifierDenormalizer())->hasCacheableSupportsMethod());
+    }
+}
diff --git a/tests/Identifier/Normalizer/IntegerDenormalizerTest.php b/tests/Identifier/Normalizer/IntegerDenormalizerTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Core\Tests\Identifier\Normalizer;
+
+use ApiPlatform\Core\Identifier\Normalizer\IntegerDenormalizer;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class IntegerDenormalizerTest extends TestCase
+{
+    public function testDenormalize()
+    {
+        $this->assertSame(2, (new IntegerDenormalizer())->denormalize('2', 'int'));
+    }
+
+    public function testSupportsDenormalization()
+    {
+        $normalizer = new IntegerDenormalizer();
+        $this->assertTrue($normalizer->supportsDenormalization('1', 'int'));
+        $this->assertFalse($normalizer->supportsDenormalization([], 'int'));
+        $this->assertFalse($normalizer->supportsDenormalization('1', 'foo'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
+    }
+}
diff --git a/tests/JsonApi/Serializer/CollectionNormalizerTest.php b/tests/JsonApi/Serializer/CollectionNormalizerTest.php
@@ -36,6 +36,7 @@ public function testSupportsNormalize()
         $this->assertTrue($normalizer->supportsNormalization(new \ArrayObject(), CollectionNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization([], 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \ArrayObject(), 'xml'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalizePaginator()
diff --git a/tests/JsonApi/Serializer/ConstraintViolationNormalizerTest.php b/tests/JsonApi/Serializer/ConstraintViolationNormalizerTest.php
@@ -39,6 +39,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization(new ConstraintViolationList(), ConstraintViolationListNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization(new ConstraintViolationList(), 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ConstraintViolationListNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/JsonApi/Serializer/EntrypointNormalizerTest.php b/tests/JsonApi/Serializer/EntrypointNormalizerTest.php
@@ -45,6 +45,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization($entrypoint, EntrypointNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization($entrypoint, 'json'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), EntrypointNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/JsonApi/Serializer/ErrorNormalizerTest.php b/tests/JsonApi/Serializer/ErrorNormalizerTest.php
@@ -34,6 +34,7 @@ public function testSupportsNormalization()
         $this->assertTrue($normalizer->supportsNormalization(new FlattenException(), ErrorNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization(new FlattenException(), 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ErrorNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     /**
diff --git a/tests/JsonApi/Serializer/ItemNormalizerTest.php b/tests/JsonApi/Serializer/ItemNormalizerTest.php
@@ -58,6 +58,7 @@ public function testSupportDenormalization()
 
         $this->assertTrue($normalizer->supportsDenormalization(null, Dummy::class, ItemNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsDenormalization(null, \stdClass::class, ItemNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testSupportNormalization()
diff --git a/tests/Problem/Serializer/ConstraintViolationNormalizerTest.php b/tests/Problem/Serializer/ConstraintViolationNormalizerTest.php
@@ -34,6 +34,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization(new ConstraintViolationList(), ConstraintViolationListNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization(new ConstraintViolationList(), 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ConstraintViolationListNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Problem/Serializer/ErrorNormalizerTest.php b/tests/Problem/Serializer/ErrorNormalizerTest.php
@@ -34,6 +34,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsNormalization(new FlattenException(), ErrorNormalizer::FORMAT));
         $this->assertFalse($normalizer->supportsNormalization(new FlattenException(), 'xml'));
         $this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ErrorNormalizer::FORMAT));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Serializer/AbstractItemNormalizerTest.php b/tests/Serializer/AbstractItemNormalizerTest.php
@@ -67,6 +67,7 @@ public function testSupportNormalizationAndSupportDenormalization()
         $this->assertFalse($normalizer->supportsNormalization($std));
         $this->assertTrue($normalizer->supportsDenormalization($dummy, Dummy::class));
         $this->assertFalse($normalizer->supportsDenormalization($std, \stdClass::class));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Serializer/ItemNormalizerTest.php b/tests/Serializer/ItemNormalizerTest.php
@@ -60,6 +60,7 @@ public function testSupportNormalization()
         $this->assertTrue($normalizer->supportsDenormalization($dummy, Dummy::class));
         $this->assertTrue($normalizer->supportsDenormalization($dummy, Dummy::class));
         $this->assertFalse($normalizer->supportsDenormalization($std, \stdClass::class));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalize()
diff --git a/tests/Swagger/Serializer/ApiGatewayNormalizerTest.php b/tests/Swagger/Serializer/ApiGatewayNormalizerTest.php
@@ -16,6 +16,7 @@
 use ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
@@ -41,6 +42,8 @@ final class ApiGatewayNormalizerTest extends TestCase
     protected function setUp()
     {
         $this->documentationNormalizerMock = $this->prophesize(NormalizerInterface::class);
+        $this->documentationNormalizerMock->willImplement(CacheableSupportsMethodInterface::class);
+        $this->documentationNormalizerMock->hasCacheableSupportsMethod()->willReturn(true);
         $this->objectMock = $this->prophesize(\stdClass::class);
         $this->normalizer = new ApiGatewayNormalizer($this->documentationNormalizerMock->reveal());
     }
@@ -49,6 +52,7 @@ public function testSupportsNormalization()
     {
         $this->documentationNormalizerMock->supportsNormalization('foo', 'bar')->willReturn(true)->shouldBeCalledTimes(1);
         $this->assertTrue($this->normalizer->supportsNormalization('foo', 'bar'));
+        $this->assertTrue($this->normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNormalizeWithoutApiGateway()
diff --git a/tests/Swagger/Serializer/DocumentationNormalizerTest.php b/tests/Swagger/Serializer/DocumentationNormalizerTest.php
@@ -1304,6 +1304,7 @@ public function testSupports()
         $this->assertTrue($normalizer->supportsNormalization($documentation, 'json'));
         $this->assertFalse($normalizer->supportsNormalization($documentation));
         $this->assertFalse($normalizer->supportsNormalization(new Dummy(), 'json'));
+        $this->assertTrue($normalizer->hasCacheableSupportsMethod());
     }
 
     public function testNoOperations()

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function supportsNormalization($data, $format = null)`
`108`	`108`	`*/`
`109`	`109`	`public function hasCacheableSupportsMethod(): bool`
`110`	`110`	`{`
`111`		`- return true;`
	`111`	`+ return $this->collectionNormalizer instanceof CacheableSupportsMethodInterface && $this->collectionNormalizer->hasCacheableSupportsMethod();`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,18 +14,16 @@`
`14`	`14`	`namespace ApiPlatform\Core\Identifier\Normalizer;`
`15`	`15`
`16`	`16`	`use ApiPlatform\Core\Exception\InvalidIdentifierException;`
`17`		`-use Symfony\Component\Serializer\Exception\InvalidArgumentException;`
`18`		`-use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;`
	`17`	`+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;`
`19`	`18`	`use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;`
`20`		`-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;`
`21`	`19`
`22`		`-final class DateTimeIdentifierDenormalizer extends DateTimeNormalizer implements DenormalizerInterface, CacheableSupportsMethodInterface`
	`20`	`+final class DateTimeIdentifierDenormalizer extends DateTimeNormalizer`
`23`	`21`	`{`
`24`	`22`	`public function denormalize($data, $class, $format = null, array $context = [])`
`25`	`23`	`{`
`26`	`24`	`try {`
`27`	`25`	`return parent::denormalize($data, $class, $format, $context);`
`28`		`- } catch (InvalidArgumentException $e) {`
	`26`	`+ } catch (NotNormalizableValueException $e) {`
`29`	`27`	`throw new InvalidIdentifierException($e->getMessage(), $e->getCode(), $e);`
`30`	`28`	`}`
`31`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,10 @@`
`14`	`14`	`namespace ApiPlatform\Core\Identifier\Normalizer;`
`15`	`15`
`16`	`16`	`use Symfony\Component\PropertyInfo\Type;`
	`17`	`+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;`
`17`	`18`	`use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;`
`18`	`19`
`19`		`-final class IntegerDenormalizer implements DenormalizerInterface`
	`20`	`+final class IntegerDenormalizer implements DenormalizerInterface, CacheableSupportsMethodInterface`
`20`	`21`	`{`
`21`	`22`	`public function denormalize($data, $class, $format = null, array $context = []): int`
`22`	`23`	`{`
`@@ -30,4 +31,12 @@ public function supportsDenormalization($data, $type, $format = null): bool`
`30`	`31`	`{`
`31`	`32`	`return Type::BUILTIN_TYPE_INT === $type && \is_string($data);`
`32`	`33`	`}`
	`34`	`+`
	`35`	`+ /**`
	`36`	`+ * {@inheritdoc}`
	`37`	`+ */`
	`38`	`+ public function hasCacheableSupportsMethod(): bool`
	`39`	`+ {`
	`40`	`+ return true;`
	`41`	`+ }`
`33`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,6 @@ public function supportsNormalization($data, $format = null)`
`115`	`115`	`*/`
`116`	`116`	`public function hasCacheableSupportsMethod(): bool`
`117`	`117`	`{`
`118`		`- return true;`
	`118`	`+ return $this->documentationNormalizer instanceof CacheableSupportsMethodInterface && $this->documentationNormalizer->hasCacheableSupportsMethod();`
`119`	`119`	`}`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public function testSupportsNormalize()`
`34`	`34`	`$this->assertTrue($normalizer->supportsNormalization(new \ArrayObject(), CollectionNormalizer::FORMAT));`
`35`	`35`	`$this->assertFalse($normalizer->supportsNormalization([], 'xml'));`
`36`	`36`	`$this->assertFalse($normalizer->supportsNormalization(new \ArrayObject(), 'xml'));`
	`37`	`+ $this->assertTrue($normalizer->hasCacheableSupportsMethod());`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`public function testNormalizeApiSubLevel()`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function testSupportNormalization()`
`42`	`42`	`$this->assertTrue($normalizer->supportsNormalization($entrypoint, EntrypointNormalizer::FORMAT));`
`43`	`43`	`$this->assertFalse($normalizer->supportsNormalization($entrypoint, 'json'));`
`44`	`44`	`$this->assertFalse($normalizer->supportsNormalization(new \stdClass(), EntrypointNormalizer::FORMAT));`
	`45`	`+ $this->assertTrue($normalizer->hasCacheableSupportsMethod());`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`public function testNormalize()`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ public function testSupportsNormalization()`
`86`	`86`	`$this->assertTrue($normalizer->supportsNormalization($dummy, 'jsonhal'));`
`87`	`87`	`$this->assertFalse($normalizer->supportsNormalization($dummy, 'xml'));`
`88`	`88`	`$this->assertFalse($normalizer->supportsNormalization($std, 'jsonhal'));`
	`89`	`+ $this->assertTrue($normalizer->hasCacheableSupportsMethod());`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`public function testNormalize()`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public function testSupportsNormalize()`
`44`	`44`	`$this->assertTrue($normalizer->supportsNormalization(new \ArrayObject(), CollectionNormalizer::FORMAT));`
`45`	`45`	`$this->assertFalse($normalizer->supportsNormalization([], 'xml'));`
`46`	`46`	`$this->assertFalse($normalizer->supportsNormalization(new \ArrayObject(), 'xml'));`
	`47`	`+ $this->assertTrue($normalizer->hasCacheableSupportsMethod());`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`public function testNormalizeApiSubLevel()`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public function testSupportNormalization()`
`37`	`37`	`$this->assertTrue($normalizer->supportsNormalization(new ConstraintViolationList(), ConstraintViolationListNormalizer::FORMAT));`
`38`	`38`	`$this->assertFalse($normalizer->supportsNormalization(new ConstraintViolationList(), 'xml'));`
`39`	`39`	`$this->assertFalse($normalizer->supportsNormalization(new \stdClass(), ConstraintViolationListNormalizer::FORMAT));`
	`40`	`+ $this->assertTrue($normalizer->hasCacheableSupportsMethod());`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`public function testNormalize()`