fix: allowed composite identifiers with differents types

Sarahshr · soyuka · commit 502234cf55d6 · 2023-05-23T23:46:49.000+02:00
fixes #5396
diff --git a/features/main/composite.feature b/features/main/composite.feature
@@ -132,3 +132,8 @@ Feature: Retrieve data with Composite identifiers
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+
+  Scenario: Get identifiers with different types
+    Given there are Composite identifier objects
+    When I send a "GET" request to "/composite_key_with_different_types/id=82133;verificationKey=7d75af772e637e45c36d041696e1128d"
+    Then the response status code should be 200
diff --git a/src/Api/UriVariablesConverter.php b/src/Api/UriVariablesConverter.php
@@ -44,7 +44,9 @@ public function convert(array $uriVariables, string $class, array $context = [])
 
         foreach ($uriVariables as $parameterName => $value) {
             $uriVariableDefinition = $uriVariablesDefinitions[$parameterName] ?? $uriVariablesDefinitions['id'] ?? new Link();
-            if ([] === $types = $this->getIdentifierTypes($uriVariableDefinition->getFromClass() ?? $class, $uriVariableDefinition->getIdentifiers() ?? [$parameterName])) {
+
+            $identifierTypes = $this->getIdentifierTypes($uriVariableDefinition->getFromClass() ?? $class, $uriVariableDefinition->getIdentifiers() ?? [$parameterName]);
+            if (!($types = $identifierTypes[$parameterName] ?? false)) {
                 continue;
             }
 
@@ -71,7 +73,7 @@ private function getIdentifierTypes(string $resourceClass, array $properties): a
         foreach ($properties as $property) {
             $propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $property);
             foreach ($propertyMetadata->getBuiltinTypes() as $type) {
-                $types[] = Type::BUILTIN_TYPE_OBJECT === ($builtinType = $type->getBuiltinType()) ? $type->getClassName() : $builtinType;
+                $types[$property][] = Type::BUILTIN_TYPE_OBJECT === ($builtinType = $type->getBuiltinType()) ? $type->getClassName() : $builtinType;
             }
         }
 
diff --git a/tests/Fixtures/TestBundle/ApiResource/Issue5396/CompositeKeyWithDifferentType.php b/tests/Fixtures/TestBundle/ApiResource/Issue5396/CompositeKeyWithDifferentType.php
@@ -0,0 +1,33 @@
+<?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\Tests\Fixtures\TestBundle\ApiResource\Issue5396;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Operation;
+
+#[ApiResource(provider: [CompositeKeyWithDifferentType::class, 'provide'])]
+class CompositeKeyWithDifferentType
+{
+    #[ApiProperty(identifier: true)]
+    public ?int $id;
+
+    #[ApiProperty(identifier: true)]
+    public ?string $verificationKey;
+
+    public static function provide(Operation $operation, array $uriVariables = [], array $context = []): array
+    {
+        return $context;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,9 @@ public function convert(array $uriVariables, string $class, array $context = [])`
`44`	`44`
`45`	`45`	`foreach ($uriVariables as $parameterName => $value) {`
`46`	`46`	`$uriVariableDefinition = $uriVariablesDefinitions[$parameterName] ?? $uriVariablesDefinitions['id'] ?? new Link();`
`47`		`- if ([] === $types = $this->getIdentifierTypes($uriVariableDefinition->getFromClass() ?? $class, $uriVariableDefinition->getIdentifiers() ?? [$parameterName])) {`
	`47`	`+`
	`48`	`+ $identifierTypes = $this->getIdentifierTypes($uriVariableDefinition->getFromClass() ?? $class, $uriVariableDefinition->getIdentifiers() ?? [$parameterName]);`
	`49`	`+ if (!($types = $identifierTypes[$parameterName] ?? false)) {`
`48`	`50`	`continue;`
`49`	`51`	`}`
`50`	`52`
`@@ -71,7 +73,7 @@ private function getIdentifierTypes(string $resourceClass, array $properties): a`
`71`	`73`	`foreach ($properties as $property) {`
`72`	`74`	`$propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $property);`
`73`	`75`	`foreach ($propertyMetadata->getBuiltinTypes() as $type) {`
`74`		`- $types[] = Type::BUILTIN_TYPE_OBJECT === ($builtinType = $type->getBuiltinType()) ? $type->getClassName() : $builtinType;`
	`76`	`+ $types[$property][] = Type::BUILTIN_TYPE_OBJECT === ($builtinType = $type->getBuiltinType()) ? $type->getClassName() : $builtinType;`
`75`	`77`	`}`
`76`	`78`	`}`
`77`	`79`