using radio/checkbox instead of expanded widget

bamarni · bamarni · commit b1337728b9da · 2015-07-05T12:45:29.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -35,14 +35,14 @@
 {%- endblock textarea_widget -%}
 
 {%- block choice_widget -%}
-    {% if 'expanded' == widget %}
-        {{- block('choice_widget_expanded') -}}
-    {% elseif 'select' == widget %}
-        {{- block('choice_widget_collapsed') -}}
-    {% elseif 'hidden' == widget %}
+    {% if 'hidden' == widget %}
         {{- block('hidden_widget') -}}
-    {% else %}
+    {% elseif 'text' == widget %}
         {{- block('form_widget_simple') -}}
+    {% elseif expanded %}
+        {{- block('choice_widget_expanded') -}}
+    {% else %}
+        {{- block('choice_widget_collapsed') -}}
     {% endif %}
 {%- endblock choice_widget -%}
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -55,7 +55,7 @@ public function __construct(ChoiceListFactoryInterface $choiceListFactory = null
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        if ('expanded' == $options['widget']) {
+        if ($options['expanded'] && !in_array($options['widget'], array('text', 'hidden'))) {
             $builder->setDataMapper($options['multiple']
                 ? new CheckboxListMapper($options['choice_list'])
                 : new RadioListMapper($options['choice_list']));
@@ -186,6 +186,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'choice_translation_domain' => $choiceTranslationDomain,
         ));
 
+        if (in_array($options['widget'], array('text', 'hidden'))) {
+            return;
+        }
+
         // The decision, whether a choice is selected, is potentially done
         // thousand of times during the rendering of a template. Provide a
         // closure here that is optimized for the value of the form, to
@@ -212,7 +216,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['empty_value'] = $view->vars['placeholder'];
         $view->vars['empty_value_in_choices'] = $view->vars['placeholder_in_choices'];
 
-        if ('select' == $options['widget'] && $options['multiple']) {
+        if ($options['multiple'] && !$options['expanded']) {
             // Add "[]" to the name in case a select tag with multiple options is
             // displayed. Otherwise only one of the selected options is sent in the
             // POST request.
@@ -225,7 +229,11 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
-        if ('expanded' == $options['widget']) {
+        if (in_array($options['widget'], array('text', 'hidden'))) {
+            return;
+        }
+
+        if ($options['expanded']) {
             // Radio buttons should have the same name as the parent
             $childName = $view->vars['full_name'];
 
@@ -247,10 +255,6 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $choiceListFactory = $this->choiceListFactory;
 
-        $widget = function (Options $options) {
-            return $options['expanded'] ? 'expanded' : 'select';
-        };
-
         $emptyData = function (Options $options) {
             if ($options['multiple'] || $options['expanded']) {
                 return array();
@@ -268,6 +272,18 @@ public function configureOptions(OptionsResolver $resolver)
             return $options['empty_value'];
         };
 
+        $multipleNormalizer = function (Options $options, $multiple) {
+            if (in_array($options['widget'], array('radio', 'checkbox'))) {
+                return 'checkbox' == $options['widget'];
+            }
+
+            return $multiple;
+        };
+
+        $expandedNomalizer = function (Options $options, $expanded) {
+            return in_array($options['widget'], array('radio', 'checkbox')) ?: $expanded;
+        };
+
         $choiceListNormalizer = function (Options $options, $choiceList) use ($choiceListFactory) {
             if ($choiceList) {
                 @trigger_error('The "choice_list" option is deprecated since version 2.7 and will be removed in 3.0. Use "choice_loader" instead.', E_USER_DEPRECATED);
@@ -314,7 +330,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $compound = function (Options $options) {
-            return 'expanded' == $options['widget'];
+            return $options['expanded'];
         };
 
         $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
@@ -326,7 +342,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $resolver->setDefaults(array(
-            'widget' => $widget,
+            'widget' => null,
             'multiple' => false,
             'delimiter' => ',',
             'expanded' => false, // deprecated
@@ -352,6 +368,8 @@ public function configureOptions(OptionsResolver $resolver)
             'choice_translation_domain' => true,
         ));
 
+        $resolver->setNormalizer('expanded', $expandedNomalizer);
+        $resolver->setNormalizer('multiple', $multipleNormalizer);
         $resolver->setNormalizer('choice_list', $choiceListNormalizer);
         $resolver->setNormalizer('empty_value', $placeholderNormalizer);
         $resolver->setNormalizer('placeholder', $placeholderNormalizer);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
