Skip to content

Commit 7d9bd23

Browse files
[DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader
1 parent 79ab816 commit 7d9bd23

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Form/ChoiceList/ORMQueryBuilderLoader.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ public function getEntitiesByIds($identifier, array $values)
9595
} else {
9696
$parameterType = Connection::PARAM_STR_ARRAY;
9797
}
98+
if (!$values) {
99+
return array();
100+
}
98101

99102
return $qb->andWhere($where)
100103
->getQuery()

Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected function checkIdentifierType($classname, $expectedType)
5656

5757
$query->expects($this->once())
5858
->method('setParameter')
59-
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array(), $expectedType)
59+
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array(1, 2), $expectedType)
6060
->willReturn($query);
6161

6262
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
@@ -72,7 +72,7 @@ protected function checkIdentifierType($classname, $expectedType)
7272
->from($classname, 'e');
7373

7474
$loader = new ORMQueryBuilderLoader($qb);
75-
$loader->getEntitiesByIds('id', array());
75+
$loader->getEntitiesByIds('id', array(1, 2));
7676
}
7777

7878
public function testFilterNonIntegerValues()

0 commit comments

Comments
 (0)