symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+7Lines changed: 7 additions & 0 deletions
@@ -239,7 +239,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         ));
 
         $resolver->setAllowedTypes(array(
-            'choices' => array('null', 'array'),
+            'choices' => array('null', 'array', 'Traversable'),
             'choice_list' => array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'),
             'preferred_choices' => 'array',
         ));
 
@@ -1672,6 +1672,13 @@ public function testInitializeWithDefaultObjectChoice()
         $form->getViewData();
     }
 
+    public function testChoicesOptionSupportsTraversable()
+    {
+        $this->factory->create('choice', null, array(
+            'choices' => new \ArrayObject($this->choices),
+        ));
+    }
+
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */