Merge branch '2.6' into 2.7
* 2.6: [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader [Form] Fixed: Filter non-integers when selecting entities by int ID Fix merge Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
This commit is contained in:
commit
338cd02ede
@ -108,6 +108,9 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
|
||||
} else {
|
||||
$parameterType = Connection::PARAM_STR_ARRAY;
|
||||
}
|
||||
if (!$values) {
|
||||
return array();
|
||||
}
|
||||
|
||||
return $qb->andWhere($where)
|
||||
->getQuery()
|
||||
|
@ -56,7 +56,7 @@ class ORMQueryBuilderLoaderTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
$query->expects($this->once())
|
||||
->method('setParameter')
|
||||
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array(), $expectedType)
|
||||
->with('ORMQueryBuilderLoader_getEntitiesByIds_id', array(1, 2), $expectedType)
|
||||
->willReturn($query);
|
||||
|
||||
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
|
||||
@ -72,7 +72,7 @@ class ORMQueryBuilderLoaderTest extends \PHPUnit_Framework_TestCase
|
||||
->from($classname, 'e');
|
||||
|
||||
$loader = new ORMQueryBuilderLoader($qb);
|
||||
$loader->getEntitiesByIds('id', array());
|
||||
$loader->getEntitiesByIds('id', array(1, 2));
|
||||
}
|
||||
|
||||
public function testFilterNonIntegerValues()
|
||||
|
Reference in New Issue
Block a user