Merge e2c7ddb into 21f4cf0

api-platform · Feb 2, 2021 · fea1613 · fea1613
2 parents 21f4cf0 + e2c7ddb
commit fea1613
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/api.xml b/src/Bridge/Symfony/Bundle/Resources/config/api.xml
@@ -275,11 +275,11 @@
         </service>
 
         <service id="api_platform.identifier.integer" class="ApiPlatform\Core\Identifier\Normalizer\IntegerDenormalizer" public="false">
-            <tag name="api_platform.identifier.denormalizer" />
+            <tag name="api_platform.identifier.denormalizer" priority="-100" />
         </service>
 
         <service id="api_platform.identifier.date_normalizer" class="ApiPlatform\Core\Identifier\Normalizer\DateTimeIdentifierDenormalizer" public="false">
-            <tag name="api_platform.identifier.denormalizer" />
+            <tag name="api_platform.identifier.denormalizer" priority="-100" />
         </service>
 
         <!-- Subresources -->

diff --git a/src/Bridge/Symfony/Bundle/Resources/config/ramsey_uuid.xml b/src/Bridge/Symfony/Bundle/Resources/config/ramsey_uuid.xml
@@ -6,7 +6,7 @@
 
     <services>
         <service id="api_platform.identifier.uuid_normalizer" class="ApiPlatform\Core\Bridge\RamseyUuid\Identifier\Normalizer\UuidNormalizer" public="false">
-            <tag name="api_platform.identifier.denormalizer" />
+            <tag name="api_platform.identifier.denormalizer" priority="-100" />
         </service>
 
         <service id="api_platform.serializer.uuid_denormalizer" class="ApiPlatform\Core\Bridge\RamseyUuid\Serializer\UuidDenormalizer" public="false">

diff --git a/src/Identifier/IdentifierConverter.php b/src/Identifier/IdentifierConverter.php
@@ -69,6 +69,7 @@ public function convert($data, string $class, array $context = []): array
 
                 try {
                     $identifiers[$identifier] = $identifierTransformer->denormalize($value, $type);
+                    break;
                 } catch (InvalidIdentifierException $e) {
                     throw new InvalidIdentifierException(sprintf('Identifier "%s" could not be denormalized.', $identifier), $e->getCode(), $e);
                 }

diff --git a/tests/Identifier/IdentifierConverterTest.php b/tests/Identifier/IdentifierConverterTest.php
@@ -22,6 +22,7 @@
 use ApiPlatform\Core\Tests\ProphecyTrait;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Type;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
  * @author Antoine Bluchet <soyuka@gmail.com>
@@ -98,4 +99,26 @@ public function testIntegerIdentifier()
 
         $this->assertSame(['id' => 42], $identifierDenormalizer->convert($identifier, $class));
     }
+
+    public function testShouldBreakAfterTransforming()
+    {
+        $identifier = ['id' => '42'];
+        $class = 'Dummy';
+
+        $integerIdentifierPropertyMetadata = (new PropertyMetadata())->withIdentifier(true)->withType(new Type(Type::BUILTIN_TYPE_INT));
+
+        $propertyMetadataFactory = $this->prophesize(PropertyMetadataFactoryInterface::class);
+        $propertyMetadataFactory->create($class, 'id')->shouldBeCalled()->willReturn($integerIdentifierPropertyMetadata);
+
+        $identifiersExtractor = $this->prophesize(IdentifiersExtractorInterface::class);
+        $identifiersExtractor->getIdentifiersFromResourceClass($class)->willReturn(['id']);
+
+        $shouldNotBeCalled = $this->prophesize(DenormalizerInterface::class);
+        $shouldNotBeCalled->supportsDenormalization()->shouldNotBeCalled();
+
+        $identifierDenormalizers = [new IntegerDenormalizer(), $shouldNotBeCalled->reveal()];
+        $identifierDenormalizer = new IdentifierConverter($identifiersExtractor->reveal(), $propertyMetadataFactory->reveal(), $identifierDenormalizers);
+
+        $this->assertSame(['id' => 42], $identifierDenormalizer->convert($identifier, $class));
+    }
 }