symfony
diff --git a/‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Lines changed: 8 additions & 7 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Lines changed: 8 additions & 7 deletions
@@ -35,9 +35,9 @@
 {%- endblock textarea_widget -%}
 
 {%- block choice_widget -%}
-    {% if 'hidden' == widget %}
+    {% if widget is defined and 'hidden' == widget %}
         {{- block('hidden_widget') -}}
-    {% elseif 'text' == widget %}
+    {% elseif widget is defined and 'text' == widget %}
         {{- block('form_widget_simple') -}}
     {% elseif expanded %}
         {{- block('choice_widget_expanded') -}}
 
@@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $choiceList = $this->createChoiceList($options);
         $builder->setAttribute('choice_list', $choiceList);
 
-        if ($options['expanded'] && !in_array($options['widget'], array('text', 'hidden'))) {
+        if ($options['expanded'] && !in_array($options['widget'], array('text', 'hidden'), true)) {
             $builder->setDataMapper($options['multiple']
                 ? new CheckboxListMapper($choiceList)
                 : new RadioListMapper($choiceList));
@@ -151,7 +151,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->addViewTransformer(new ChoicesToValuesTransformer($choiceList));
 
             // for "text" / "hidden" widget, view data uses a delimiter
-            if (in_array($options['widget'], array('text', 'hidden'))) {
+            if (in_array($options['widget'], array('text', 'hidden'), true)) {
                 $builder->addViewTransformer(new ValuesToStringTransformer($options['delimiter'], $options['trim']));
             }
         } else {
@@ -195,7 +195,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'choice_translation_domain' => $choiceTranslationDomain,
         ));
 
-        if (in_array($options['widget'], array('text', 'hidden'))) {
+        if (in_array($options['widget'], array('text', 'hidden'), true)) {
             return;
         }
 
@@ -237,7 +237,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
-        if (in_array($options['widget'], array('text', 'hidden'))) {
+        if (in_array($options['widget'], array('text', 'hidden'), true)) {
             return;
         }
 
@@ -318,8 +318,8 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $multipleNormalizer = function (Options $options, $multiple) {
-            if (in_array($options['widget'], array('radio', 'checkbox'))) {
-                return 'checkbox' == $options['widget'];
+            if (in_array($options['widget'], array('radio', 'checkbox'), true)) {
+                return 'checkbox' === $options['widget'];
             }
 
             return $multiple;
@@ -332,7 +332,7 @@ public function configureOptions(OptionsResolver $resolver)
                 $expanded = false;
             }
 
-            return in_array($options['widget'], array('radio', 'checkbox')) ?: $expanded;
+            return in_array($options['widget'], array('radio', 'checkbox'), true) ?: $expanded;
         };
 
         $resolver->setDefaults(array(
@@ -376,6 +376,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('choice_attr', array('null', 'array', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
         $resolver->setAllowedTypes('preferred_choices', array('array', '\Traversable', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
         $resolver->setAllowedTypes('group_by', array('null', 'array', '\Traversable', 'string', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
+        $resolver->setAllowedValues('widget', array(null, 'hidden', 'text', 'select', 'checkbox', 'radio'));
     }
 
     /**