symfony · bamarni · Jun 21, 2015 · Feb 2, 2016 · Feb 2, 2016 · Feb 3, 2016
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -14,6 +14,42 @@ Form
 
  * The `choices_as_values` option of the `ChoiceType` has been removed.
 
+ * The `expanded` option of the `ChoiceType` has been removed.
+   Use instead the `widget` option with `select`, `checkbox`, `radio`, `text` or `hidden`.
+
+   Before:
+
+   ```php
+   use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+
+   $form = $this->createFormBuilder()
+      ->add('isAttending', ChoiceType::class, array(
+         'choices'  => array(
+            'Yes' => true,
+            'No' => false,
+         ),
+         'expanded' => true,
+         'multiple' => false,
+      ))
+      ->getForm();
+   ```
+
+   After:
+
+   ```php
+   use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+
+   $form = $this->createFormBuilder()
+      ->add('isAttending', ChoiceType::class, array(
+         'choices'  => array(
+            'Yes' => true,
+            'No' => false,
+         ),
+         'widget' => 'radio',
+      ))
+      ->getForm();
+   ```
+
 Serializer
 ----------
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -34,6 +34,9 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleAssociationToIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
 
+/**
+ * @group legacy
+ */
 class EntityTypeTest extends TypeTestCase
 {
     const ITEM_GROUP_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\GroupableEntity';

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,7 +35,11 @@
 {%- endblock textarea_widget -%}
 
 {%- block choice_widget -%}
-    {% if expanded %}
+    {% if widget is defined and 'hidden' == widget %}
+        {{- block('hidden_widget') -}}
+    {% elseif widget is defined and 'text' == widget %}
+        {{- block('form_widget_simple') -}}
+    {% elseif expanded %}
         {{- block('choice_widget_expanded') -}}
     {% else %}
         {{- block('choice_widget_collapsed') -}}

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * deprecated the "choices_as_values" option of ChoiceType
+ * deprecated the "expanded" option of ChoiceType
 
 3.0.0
 -----

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValuesToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValuesToStringTransformer.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Extension\Core\DataTransformer;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * Converts an array of values to a string with multiple values separated by a delimiter.
+ *
+ * @author Bilal Amarni <[email protected]>
+ */
+class ValuesToStringTransformer implements DataTransformerInterface
+{
+    /**
+     * @var string
+     */
+    private $delimiter;
+
+    /**
+     * @var bool
+     */
+    private $trim;
+
+    /**
+     * @param string $delimiter
+     * @param bool   $trim
+     */
+    public function __construct($delimiter, $trim)
+    {
+        $this->delimiter = $delimiter;
+        $this->trim = $trim;
+    }
+
+    /**
+     * @param array $array
+     *
+     * @return string
+     *
+     * @throws UnexpectedTypeException if the given value is not an array
+     */
+    public function transform($array)
+    {
+        if (null === $array) {
+            return '';
+        }
+
+        if (!is_array($array)) {
+            throw new TransformationFailedException('Expected an array');
+        }
+
+        return implode($this->delimiter, $array);
+    }
+
+    /**
+     * @param string $string
+     *
+     * @return array
+     *
+     * @throws UnexpectedTypeException if the given value is not a string
+     */
+    public function reverseTransform($string)
+    {
+        if (empty($string)) {
+            return array();
+        }
+
+        if (!is_string($string)) {
+            throw new TransformationFailedException('Expected a string');
+        }
+
+        $values = explode($this->delimiter, $string);
+
+        if ($this->trim) {
+            $values = array_map('trim', $values);
+        }
+
+        return $values;
+    }
+}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -31,6 +31,7 @@
 use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToValueTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
+use Symfony\Component\Form\Extension\Core\DataTransformer\ValuesToStringTransformer;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -60,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $choiceList = $this->createChoiceList($options);
         $builder->setAttribute('choice_list', $choiceList);
 
-        if ($options['expanded']) {
+        if ($options['expanded'] && !in_array($options['widget'], array('text', 'hidden'), true)) {
             $builder->setDataMapper($options['multiple']
                 ? new CheckboxListMapper($choiceList)
                 : new RadioListMapper($choiceList));
@@ -146,10 +147,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 });
             }
         } elseif ($options['multiple']) {
-            // <select> tag with "multiple" option
+            // "select", "text" or "hidden" widget with "multiple" option
             $builder->addViewTransformer(new ChoicesToValuesTransformer($choiceList));
+
+            // for "text" / "hidden" widget, view data uses a delimiter
+            if (in_array($options['widget'], array('text', 'hidden'), true)) {
+                $builder->addViewTransformer(new ValuesToStringTransformer($options['delimiter'], $options['trim']));
+            }
         } else {
-            // <select> tag without "multiple" option
+            // "select", "text" or "hidden" tag without "multiple" option
             $builder->addViewTransformer(new ChoiceToValueTransformer($choiceList));
         }
 
@@ -179,15 +185,20 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             : $this->createChoiceListView($choiceList, $options);
 
         $view->vars = array_replace($view->vars, array(
+            'widget' => $options['widget'],
             'multiple' => $options['multiple'],
-            'expanded' => $options['expanded'],
+            'expanded' => $options['expanded'], // BC
             'preferred_choices' => $choiceListView->preferredChoices,
             'choices' => $choiceListView->choices,
             'separator' => '-------------------',
             'placeholder' => null,
             'choice_translation_domain' => $choiceTranslationDomain,
         ));
 
+        if (in_array($options['widget'], array('text', 'hidden'), true)) {
+            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
@@ -226,6 +237,10 @@ 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'), true)) {
+            return;
+        }
+
         if ($options['expanded']) {
             // Radio buttons should have the same name as the parent
             $childName = $view->vars['full_name'];
@@ -302,9 +317,30 @@ public function configureOptions(OptionsResolver $resolver)
             return $choiceTranslationDomain;
         };
 
+        $multipleNormalizer = function (Options $options, $multiple) {
+            if (in_array($options['widget'], array('radio', 'checkbox'), true)) {
+                return 'checkbox' === $options['widget'];
+            }
+
+            return $multiple;
+        };
+
+        $expandedNomalizer = function (Options $options, $expanded) {
+            if (null !== $expanded) {
+                @trigger_error('The "expanded" option is deprecated since version 3.1 and will be removed in 4.0. You should use "widget" instead.', E_USER_DEPRECATED);
+            } else {
+                $expanded = false;
+            }
+
+            return in_array($options['widget'], array('radio', 'checkbox'), true) ?: $expanded;
+        };
+
         $resolver->setDefaults(array(
+            'widget' => null,
             'multiple' => false,
-            'expanded' => false,
+            'delimiter' => ',',
+            'expanded' => null, // deprecated
+            'choice_list' => null, // deprecated
             'choices' => array(),
             'choices_as_values' => null, // deprecated since 3.1
             'choice_loader' => null,
@@ -325,6 +361,8 @@ public function configureOptions(OptionsResolver $resolver)
             'choice_translation_domain' => true,
         ));
 
+        $resolver->setNormalizer('expanded', $expandedNomalizer);
+        $resolver->setNormalizer('multiple', $multipleNormalizer);
         $resolver->setNormalizer('placeholder', $placeholderNormalizer);
         $resolver->setNormalizer('choice_translation_domain', $choiceTranslationDomainNormalizer);
         $resolver->setNormalizer('choices_as_values', $choicesAsValuesNormalizer);
@@ -338,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', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
+        $resolver->setAllowedValues('widget', array(null, 'hidden', 'text', 'select', 'checkbox', 'radio'));
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ CHANGELOG @@
     -----
      * deprecated the "choices_as_values" option of ChoiceType
+     * deprecated the "expanded" option of ChoiceType
 .0.0
     -----
@@ Expand Down @@