From 0a00af2b77dc4d25e3aaf04daf4070933bf1fa9e Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 26 Aug 2019 13:01:58 +0200 Subject: [PATCH] [Bridge/Doctrine] fix review --- .../Form/ChoiceList/ORMQueryBuilderLoader.php | 2 +- .../ChoiceList/ORMQueryBuilderLoaderTest.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index 9da362a3fa..96f5e2f5f1 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -89,6 +89,6 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface return $qb->andWhere($where) ->getQuery() ->setParameter($parameter, $values, $parameterType) - ->getResult() ?: []; + ->getResult(); } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php index 3abdb3578a..d846df62c8 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php @@ -37,6 +37,10 @@ class ORMQueryBuilderLoaderTest extends TestCase ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute']) ->getMock(); + $query + ->method('getResult') + ->willReturn([]); + $query->expects($this->once()) ->method('setParameter') ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2], $expectedType) @@ -66,6 +70,10 @@ class ORMQueryBuilderLoaderTest extends TestCase ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute']) ->getMock(); + $query + ->method('getResult') + ->willReturn([]); + $query->expects($this->once()) ->method('setParameter') ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2, 3, '9223372036854775808'], Connection::PARAM_INT_ARRAY) @@ -98,6 +106,10 @@ class ORMQueryBuilderLoaderTest extends TestCase ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute']) ->getMock(); + $query + ->method('getResult') + ->willReturn([]); + $query->expects($this->once()) ->method('setParameter') ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', 'b98e8e11-2897-44df-ad24-d2627eb7f499'], Connection::PARAM_STR_ARRAY) @@ -133,6 +145,10 @@ class ORMQueryBuilderLoaderTest extends TestCase ->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute']) ->getMock(); + $query + ->method('getResult') + ->willReturn([]); + $query->expects($this->once()) ->method('setParameter') ->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', [1, 2, 3], Connection::PARAM_INT_ARRAY)