Feature : Catch wrong identifier type

Change catch and message

Fix : Changed message

Change InvalidArgument in InvalidIdentifier

Adding test

Author: Zowac

src/Bridge/Doctrine/Common/Util/IdentifierManagerTrait.php

@@ -13,8 +13,10 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\Common\Util;
 
+use ApiPlatform\Core\Exception\InvalidIdentifierException;
 use ApiPlatform\Core\Exception\PropertyNotFoundException;
 use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Types\Type as MongoDbType;
@@ -34,6 +36,7 @@ trait IdentifierManagerTrait
      * @param int|string $id
      *
      * @throws PropertyNotFoundException
+     * @throws InvalidIdentifierException
      */
     private function normalizeIdentifiers($id, ObjectManager $manager, string $resourceClass): array
     {
@@ -76,11 +79,15 @@ private function normalizeIdentifiers($id, ObjectManager $manager, string $resou
 
             $doctrineTypeName = $doctrineClassMetadata->getTypeOfField($propertyName);
 
-            if ($isOrm && null !== $doctrineTypeName && DBALType::hasType($doctrineTypeName)) {
-                $identifier = DBALType::getType($doctrineTypeName)->convertToPHPValue($identifier, $platform);
-            }
-            if ($isOdm && null !== $doctrineTypeName && MongoDbType::hasType($doctrineTypeName)) {
-                $identifier = MongoDbType::getType($doctrineTypeName)->convertToPHPValue($identifier);
+            try {
+                if ($isOrm && null !== $doctrineTypeName && DBALType::hasType($doctrineTypeName)) {
+                    $identifier = DBALType::getType($doctrineTypeName)->convertToPHPValue($identifier, $platform);
+                }
+                if ($isOdm && null !== $doctrineTypeName && MongoDbType::hasType($doctrineTypeName)) {
+                    $identifier = MongoDbType::getType($doctrineTypeName)->convertToPHPValue($identifier);
+                }
+            } catch (ConversionException $e) {
+                throw new InvalidIdentifierException(sprintf('Invalid value "%s" provided for an identifier.', $propertyName), $e->getCode(), $e);
             }
 
             $identifiers[$propertyName] = $identifier;

tests/Bridge/Doctrine/Common/Util/IdentifierManagerTraitTest.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Common\Util;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Util\IdentifierManagerTrait;
+use ApiPlatform\Core\Exception\InvalidIdentifierException;
 use ApiPlatform\Core\Exception\PropertyNotFoundException;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
@@ -31,6 +32,7 @@
 use Doctrine\ODM\MongoDB\Types\Type as MongoDbType;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
+use Ramsey\Uuid\Doctrine\UuidType;
 
 class IdentifierManagerTraitTest extends TestCase
 {
@@ -204,4 +206,28 @@ private function getDocumentManager(string $resourceClass, array $identifierFiel
 
         return $managerProphecy->reveal();
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidIdentifierConversion()
+    {
+        DBALType::addType('uuid', UuidType::class);
+
+        $this->expectException(InvalidIdentifierException::class);
+        $this->expectExceptionMessage('Invalid value "ida" provided for an identifier.');
+
+        [$propertyNameCollectionFactory, $propertyMetadataFactory] = $this->getMetadataFactories(Dummy::class, [
+            'ida',
+        ]);
+        $objectManager = $this->getEntityManager(Dummy::class, [
+            'ida' => [
+                'type' => 'uuid',
+            ],
+        ]);
+
+        $identifierManager = $this->getIdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
+
+        $identifierManager->normalizeIdentifiers('notanuuid', $objectManager, Dummy::class);
+    }
 }