Merge branch '2.1'

Author: dunglas

src/Bridge/Doctrine/Orm/ItemDataProvider.php

@@ -23,6 +23,7 @@
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 
@@ -83,8 +84,9 @@ public function getItem(string $resourceClass, $id, string $operationName = null
 
         $queryBuilder = $repository->createQueryBuilder('o');
         $queryNameGenerator = new QueryNameGenerator();
+        $doctrineClassMetadata = $manager->getClassMetadata($resourceClass);
 
-        $this->addWhereForIdentifiers($identifiers, $queryBuilder);
+        $this->addWhereForIdentifiers($identifiers, $queryBuilder, $doctrineClassMetadata);
 
         foreach ($this->itemExtensions as $extension) {
             $extension->applyToItem($queryBuilder, $queryNameGenerator, $resourceClass, $identifiers, $operationName, $context);
@@ -100,10 +102,11 @@ public function getItem(string $resourceClass, $id, string $operationName = null
     /**
      * Add WHERE conditions to the query for one or more identifiers (simple or composite).
      *
-     * @param array        $identifiers
-     * @param QueryBuilder $queryBuilder
+     * @param array         $identifiers
+     * @param QueryBuilder  $queryBuilder
+     * @param ClassMetadata $classMetadata
      */
-    private function addWhereForIdentifiers(array $identifiers, QueryBuilder $queryBuilder)
+    private function addWhereForIdentifiers(array $identifiers, QueryBuilder $queryBuilder, ClassMetadata $classMetadata)
     {
         foreach ($identifiers as $identifier => $value) {
             $placeholder = ':id_'.$identifier;
@@ -114,7 +117,7 @@ private function addWhereForIdentifiers(array $identifiers, QueryBuilder $queryB
 
             $queryBuilder->andWhere($expression);
 
-            $queryBuilder->setParameter($placeholder, $value);
+            $queryBuilder->setParameter($placeholder, $value, $classMetadata->getTypeOfField($identifier));
         }
     }
 }

tests/Bridge/Doctrine/Orm/ItemDataProviderTest.php

@@ -58,7 +58,7 @@ public function testGetItemSingleIdentifier()
         $queryBuilderProphecy->getQuery()->willReturn($queryProphecy->reveal())->shouldBeCalled();
         $queryBuilderProphecy->expr()->willReturn($exprProphecy->reveal())->shouldBeCalled();
         $queryBuilderProphecy->andWhere($comparison)->shouldBeCalled();
-        $queryBuilderProphecy->setParameter(':id_id', 1)->shouldBeCalled();
+        $queryBuilderProphecy->setParameter(':id_id', 1, DBALType::INTEGER)->shouldBeCalled();
 
         $queryBuilder = $queryBuilderProphecy->reveal();
 
@@ -96,8 +96,8 @@ public function testGetItemDoubleIdentifier()
         $queryBuilderProphecy->expr()->willReturn($exprProphecy->reveal())->shouldBeCalled();
         $queryBuilderProphecy->andWhere($comparison)->shouldBeCalled();
 
-        $queryBuilderProphecy->setParameter(':id_ida', 1)->shouldBeCalled();
-        $queryBuilderProphecy->setParameter(':id_idb', 2)->shouldBeCalled();
+        $queryBuilderProphecy->setParameter(':id_ida', 1, DBALType::INTEGER)->shouldBeCalled();
+        $queryBuilderProphecy->setParameter(':id_idb', 2, DBALType::INTEGER)->shouldBeCalled();
 
         $queryBuilder = $queryBuilderProphecy->reveal();
 
@@ -155,7 +155,7 @@ public function testQueryResultExtension()
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
         $queryBuilderProphecy->expr()->willReturn($exprProphecy->reveal())->shouldBeCalled();
         $queryBuilderProphecy->andWhere($comparison)->shouldBeCalled();
-        $queryBuilderProphecy->setParameter(':id_id', 1)->shouldBeCalled();
+        $queryBuilderProphecy->setParameter(':id_id', 1, DBALType::INTEGER)->shouldBeCalled();
 
         $queryBuilder = $queryBuilderProphecy->reveal();