merged branch chmielot/3446-empty-multiple-entity-choice (PR #3734)

fabpot · fabpot · commit d967d39d27b4 · 2012-04-07T08:22:05.000+02:00
Commits ------- a430f3d [#3446] [Form] Fix getChoicesForValues of EntityChoiceList on empty values Discussion ---------- [Form] Fix reverseTransform on multiple entity form type Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #3446, #3727 Todo: - --------------------------------------------------------------------------- by stof at 2012-04-03T23:05:55Z @bschussek ping --------------------------------------------------------------------------- by stof at 2012-04-03T23:06:45Z This is an alternate implementation for #3727 --------------------------------------------------------------------------- by chmielot at 2012-04-04T13:47:27Z OK, this is another possibility to fix this issue with working tests. What do you think about this? --------------------------------------------------------------------------- by chmielot at 2012-04-04T13:51:27Z OK, just done. --------------------------------------------------------------------------- by stof at 2012-04-04T13:51:39Z @beberlei @bschussek ping --------------------------------------------------------------------------- by bschussek at 2012-04-06T18:50:37Z @fabpot 👍
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -175,6 +175,9 @@ public function getChoicesForValues(array $values)
             // Optimize performance in case we have an entity loader and
             // a single-field identifier
             if (count($this->identifier) === 1 && $this->entityLoader) {
+                if (empty($values)) {
+                    return array();
+                }
                 return $this->entityLoader->getEntitiesByIds(current($this->identifier), $values);
             }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Form\ChoiceList;
 
+use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\ItemGroupEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity;
@@ -250,4 +251,19 @@ public function testPossibleToProvideShorthandEntityName()
         $this->assertEquals(array(1, 2), $choiceList->getValuesForChoices(array($item1, $item2)));
         $this->assertEquals(array(1, 2), $choiceList->getIndicesForChoices(array($item1, $item2)));
     }
+    
+    // Ticket #3446
+    public function testGetEmptyArrayChoicesForEmptyValues()
+    {
+        $qb = $this->em->createQueryBuilder()->select('s')->from(self::SINGLE_IDENT_CLASS, 's');
+        $entityLoader = new ORMQueryBuilderLoader($qb);
+        $choiceList = new EntityChoiceList(
+            $this->em,
+            self::SINGLE_IDENT_CLASS,
+            null,
+            $entityLoader
+        );
+        
+        $this->assertEquals(array(), $choiceList->getChoicesForValues(array()));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,9 @@ public function getChoicesForValues(array $values)`
`175`	`175`	`// Optimize performance in case we have an entity loader and`
`176`	`176`	`// a single-field identifier`
`177`	`177`	`if (count($this->identifier) === 1 && $this->entityLoader) {`
	`178`	`+ if (empty($values)) {`
	`179`	`+ return array();`
	`180`	`+ }`
`178`	`181`	`return $this->entityLoader->getEntitiesByIds(current($this->identifier), $values);`
`179`	`182`	`}`
`180`	`183`