[Bridge/Doctrine] fix review

Author: nicolas-grekas

Form/ChoiceList/ORMQueryBuilderLoader.php

@@ -89,6 +89,6 @@ public function getEntitiesByIds($identifier, array $values)
         return $qb->andWhere($where)
                   ->getQuery()
                   ->setParameter($parameter, $values, $parameterType)
-                  ->getResult() ?: [];
+                  ->getResult();
     }
 }

Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php

@@ -37,6 +37,10 @@ protected function checkIdentifierType($classname, $expectedType)
             ->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 @@ public function testFilterNonIntegerValues()
             ->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 @@ public function testFilterEmptyUuids($entityClass)
             ->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 @@ public function testEmbeddedIdentifierName()
             ->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)