Fix "[Form] Add flexibility for EntityType"

nicolas-grekas · nicolas-grekas · commit eb08baa9fcb6 · 2015-08-02T10:01:14.000+02:00
This fixes commit e0a1294.
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -30,7 +30,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
      *
      * This property should only be accessed through queryBuilder.
      *
-     * @var QueryBuilder|null
+     * @var QueryBuilder
      */
     private $queryBuilder;
 
@@ -68,7 +68,7 @@ public function __construct($queryBuilder, $manager = null, $class = null)
 
             $queryBuilder = $queryBuilder($manager->getRepository($class));
 
-            if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {
+            if (!$queryBuilder instanceof QueryBuilder) {
                 throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
             }
         }
@@ -81,10 +81,6 @@ public function __construct($queryBuilder, $manager = null, $class = null)
      */
     public function getEntities()
     {
-        if (null === $this->queryBuilder) {
-            return array();
-        }
-        
         return $this->queryBuilder->getQuery()->execute();
     }
 
@@ -93,10 +89,6 @@ public function getEntities()
      */
     public function getEntitiesByIds($identifier, array $values)
     {
-        if (null === $this->queryBuilder) {
-            return array();
-        }
-        
         $qb = clone ($this->queryBuilder);
         $alias = current($qb->getRootAliases());
         $parameter = 'ORMQueryBuilderLoader_getEntitiesByIds_'.$identifier;
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -30,7 +30,7 @@ public function configureOptions(OptionsResolver $resolver)
             if (is_callable($queryBuilder)) {
                 $queryBuilder = call_user_func($queryBuilder, $options['em']->getRepository($options['class']));
 
-                if (!$queryBuilder instanceof QueryBuilder) {
+                if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {
                     throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');
                 }
             }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -215,7 +215,7 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
     
     public function testConfigureQueryBuilderWithClosureReturningNull()
     {
-        $field = $this->factory->createNamed('name', 'entity', null, array(
+        $field = $this->factory->createNamed('name', 'Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => function () {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface`
`30`	`30`	`*`
`31`	`31`	`* This property should only be accessed through queryBuilder.`
`32`	`32`	`*`
`33`		`- * @var QueryBuilder\|null`
	`33`	`+ * @var QueryBuilder`
`34`	`34`	`*/`
`35`	`35`	`private $queryBuilder;`
`36`	`36`
`@@ -68,7 +68,7 @@ public function __construct($queryBuilder, $manager = null, $class = null)`
`68`	`68`
`69`	`69`	`$queryBuilder = $queryBuilder($manager->getRepository($class));`
`70`	`70`
`71`		`- if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {`
	`71`	`+ if (!$queryBuilder instanceof QueryBuilder) {`
`72`	`72`	`throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -81,10 +81,6 @@ public function __construct($queryBuilder, $manager = null, $class = null)`
`81`	`81`	`*/`
`82`	`82`	`public function getEntities()`
`83`	`83`	`{`
`84`		`- if (null === $this->queryBuilder) {`
`85`		`- return array();`
`86`		`- }`
`87`		`-`
`88`	`84`	`return $this->queryBuilder->getQuery()->execute();`
`89`	`85`	`}`
`90`	`86`
`@@ -93,10 +89,6 @@ public function getEntities()`
`93`	`89`	`*/`
`94`	`90`	`public function getEntitiesByIds($identifier, array $values)`
`95`	`91`	`{`
`96`		`- if (null === $this->queryBuilder) {`
`97`		`- return array();`
`98`		`- }`
`99`		`-`
`100`	`92`	`$qb = clone ($this->queryBuilder);`
`101`	`93`	`$alias = current($qb->getRootAliases());`
`102`	`94`	`$parameter = 'ORMQueryBuilderLoader_getEntitiesByIds_'.$identifier;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function configureOptions(OptionsResolver $resolver)`
`30`	`30`	`if (is_callable($queryBuilder)) {`
`31`	`31`	`$queryBuilder = call_user_func($queryBuilder, $options['em']->getRepository($options['class']));`
`32`	`32`
`33`		`- if (!$queryBuilder instanceof QueryBuilder) {`
	`33`	`+ if (null !== $queryBuilder && !$queryBuilder instanceof QueryBuilder) {`
`34`	`34`	`throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder');`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()`
`215`	`215`
`216`	`216`	`public function testConfigureQueryBuilderWithClosureReturningNull()`
`217`	`217`	`{`
`218`		`- $field = $this->factory->createNamed('name', 'entity', null, array(`
	`218`	`+ $field = $this->factory->createNamed('name', 'Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(`
`219`	`219`	`'em' => 'default',`
`220`	`220`	`'class' => self::SINGLE_IDENT_CLASS,`
`221`	`221`	`'query_builder' => function () {`