[Form] Allow empty choices array for ChoiceType

Thomas Chmielowiec · Thomas Chmielowiec · commit dbaddbb7a89e · 2012-02-11T10:04:40.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -37,7 +37,7 @@ public function buildForm(FormBuilder $builder, array $options)
             throw new FormException('The "choice_list" must be an instance of "Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface".');
         }
 
-        if (!$options['choice_list'] && !$options['choices']) {
+        if (!$options['choice_list'] && !is_array($options['choices']) && !$options['choices'] instanceof \Traversable) {
             throw new FormException('Either the option "choices" or "choice_list" must be set.');
         }
 
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/ChoiceTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/ChoiceTypeTest.php
@@ -662,4 +662,12 @@ public function testAdjustFullNameForMultipleNonExpanded()
 
         $this->assertSame('name[]', $view->get('full_name'));
     }
+
+    // https://github.com/symfony/symfony/issues/3298
+    public function testInitializeWithEmptyChoices()
+    {
+        $this->factory->createNamed('choice', 'name', null, array(
+            'choices' => array(),
+        ));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function buildForm(FormBuilder $builder, array $options)`
`37`	`37`	`throw new FormException('The "choice_list" must be an instance of "Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface".');`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (!$options['choice_list'] && !$options['choices']) {`
	`40`	`+ if (!$options['choice_list'] && !is_array($options['choices']) && !$options['choices'] instanceof \Traversable) {`
`41`	`41`	`throw new FormException('Either the option "choices" or "choice_list" must be set.');`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -662,4 +662,12 @@ public function testAdjustFullNameForMultipleNonExpanded()`
`662`	`662`
`663`	`663`	`$this->assertSame('name[]', $view->get('full_name'));`
`664`	`664`	`}`
	`665`	`+`
	`666`	`+ // https://github.com/symfony/symfony/issues/3298`
	`667`	`+ public function testInitializeWithEmptyChoices()`
	`668`	`+ {`
	`669`	`+ $this->factory->createNamed('choice', 'name', null, array(`
	`670`	`+ 'choices' => array(),`
	`671`	`+ ));`
	`672`	`+ }`
`665`	`673`	`}`