symfony · HeahDude · Mar 25, 2016 · Sep 25, 2016 · Mar 25, 2016 · Mar 26, 2017
diff --git a/UPGRADE-3.3.md b/UPGRADE-3.3.md
@@ -127,6 +127,71 @@ Finder
 
  * The `ExceptionInterface` has been deprecated and will be removed in 4.0.
 
+Form
+----
+
+ * Using `choice_attr` option as an array of nested arrays has been deprecated
+   and indexes will be considered as attributes in 4.0. Use a unique array for
+   all choices or a `callable` instead.
+
+   Before:
+
+   ```php
+   // Single array for all choices using callable
+   'choice_attr' => function () {
+       return array('class' => 'choice-options');
+   },
+
+   // Different arrays per choices using array
+   'choices' => array(
+       'Yes' => true,
+       'No' => false,
+       'Maybe' => null,
+   'choice_attr' => array(
+       'Yes' => array('class' => 'option-green'),
+       'No' => array('class' => 'option-red'),
+   ),
+   ```
+
+   After:
+
+   ```php
+   // Single array for all choices using array
+   'choice_attr' => array('class' => 'choice-options'),
+
+   // Different arrays per choices using callable
+   'choices' => array(
+       'Yes' => true,
+       'No' => false,
+       'Maybe' => null,
+   'choice_attr' => function ($choice, $index, $value) {
+       if ('Yes' === $index) {
+           return array('class' => 'option-green');
+       }
+       if ('No' === $index) {
+           return array('class' => 'option-red');
+       }
+
+       return array();
+   },
+   ```
+
+ * Using `choice_attr` option as a string or a `ProprertyPath` instance has been
+   deprecated and will throw an exception in 4.0. Use a `callable` instead.
+
+   Before:
+
+   ```php
+   'choice_attr' => 'htmlAttributes',
+   ```
+
+   After:
+
+   ```php
+   'choice_attr' => function ($choice, $value, $index) {
+       return $choice->getHtmlAttributes();
+   ```
+
 FrameworkBundle
 ---------------
 

diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -187,6 +187,69 @@ Form
    }
    ```
 
+ * Usage of `choice_attr` option as an array of nested arrays has been removed
+   and indexes will be considered as attributes in 4.0. Use a unique array for
+   all choices or a `callable` instead.
+
+   Before:
+
+   ```php
+   // Single array for all choices using callable
+   'choice_attr' => function () {
+       return array('class' => 'choice-options');
+   },
+
+   // Different arrays per choices using array
+   'choices' => array(
+       'Yes' => true,
+       'No' => false,
+       'Maybe' => null,
+   'choice_attr' => array(
+       'Yes' => array('class' => 'option-green'),
+       'No' => array('class' => 'option-red'),
+   ),
+   ```
+
+   After:
+
+   ```php
+   // Single array for all choices using array
+   'choice_attr' => array('class' => 'choice-options'),
+
+   // Different arrays per choices using callable
+   'choices' => array(
+       'Yes' => true,
+       'No' => false,
+       'Maybe' => null,
+   'choice_attr' => function ($choice, $index, $value) {
+       if ('Yes' === $index) {
+           return array('class' => 'option-green');
+       }
+       if ('No' === $index) {
+           return array('class' => 'option-red');
+       }
+
+       return array();
+   },
+   ```
+
+ * Using `choice_attr` option as a string or a `ProprertyPath` instance will
+   throw an exception. Use a `callable` instead.
+
+   Before:
+
+   ```php
+   'choice_attr' => 'htmlAttributes',
+   ```
+
+   After:
+
+   ```php
+   'choice_attr' => function ($choice, $value, $index) {
+       return $choice->getHtmlAttributes();
+   },
+   ```
+
 FrameworkBundle
 ---------------
 

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -26,6 +26,7 @@ class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3Hori
 
     protected $testableFeatures = array(
         'choice_attr',
+        'choice_label_attr',
     );
 
     private $renderer;

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/asset": "~2.8|~3.0",
         "symfony/finder": "~2.8|~3.0",
-        "symfony/form": "^3.2.5",
+        "symfony/form": "~3.3",
         "symfony/http-kernel": "~3.2",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~2.8|~3.0",

diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -7,6 +7,9 @@ CHANGELOG
  * added `Symfony\Component\Form\FormErrorIterator::findByCodes()`
  * added `getTypedExtensions`, `getTypes`, and `getTypeGuessers` to `Symfony\Component\Form\Test\FormIntegrationTestCase`
  * added `FormPass`
+ * deprecated `choice_attr` option as array of nested arrays mapped by indexes
+ * deprecated `choice_attr` option as string or `PropertyPath` instance
+ * added `choice_label_attr` option to `ChoiceType` to use when expanded
 
 3.2.0
 -----

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -152,7 +152,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
     /**
      * {@inheritdoc}
      */
-    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
+    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null, $labelAttr = null)
     {
         // The input is not validated on purpose. This way, the decorated
         // factory may decide which input to accept and which not.
@@ -165,7 +165,8 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
                 $label,
                 $index,
                 $groupBy,
-                $attr
+                $attr,
+                $labelAttr
             );
         }
 

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -45,7 +45,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
     /**
      * {@inheritdoc}
      */
-    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
+    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null, $labelAttr = null)
     {
         $preferredViews = array();
         $otherViews = array();
@@ -76,6 +76,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
                     $keys,
                     $index,
                     $attr,
+                    $labelAttr,
                     $preferredChoices,
                     $preferredViews,
                     $otherViews
@@ -90,6 +91,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
                 $keys,
                 $index,
                 $attr,
+                $labelAttr,
                 $preferredChoices,
                 $preferredViews,
                 $otherViews
@@ -113,7 +115,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         return new ChoiceListView($otherViews, $preferredViews);
     }
 
-    private static function addChoiceView($choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
+    private static function addChoiceView($choice, $value, $label, $keys, &$index, $attr, $labelAttr, $isPreferred, &$preferredViews, &$otherViews)
     {
         // $value may be an integer or a string, since it's stored in the array
         // keys. We want to guarantee it's a string though.
@@ -131,13 +133,32 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
             $label = false === $dynamicLabel ? false : (string) $dynamicLabel;
         }
 
+        // BC
+        if (is_array($attr)) {
+            if (isset($attr[$key])) {
+                @trigger_error('Passing an array of arrays to the "choice_attr" option with choice keys as keys is deprecated since version 3.3 and will no longer be supported in 4.0. Use a "\Closure" instead.', E_USER_DEPRECATED);
+                $attr = $attr[$key];
+            } else {
+                foreach ($attr as $a) {
+                    if (is_array($a)) {
+                        // Using the deprecated way of choice keys as keys allows to not define all choices.
+                        // When $attr[$key] is not set for this one but is for another we need to
+                        // prevent using an array as HTML attribute
+                        $attr = array();
+
+                        break;
+                    }
+                }
+            }
+        }
+
         $view = new ChoiceView(
             $choice,
             $value,
             $label,
-            // The attributes may be a callable or a mapping from choice indices
-            // to nested arrays
-            is_callable($attr) ? call_user_func($attr, $choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : array())
+            // The attributes may be a callable or an array
+            is_callable($attr) ? call_user_func($attr, $choice, $key, $value) : (null !== $attr ? $attr : array()),
+            is_callable($labelAttr) ? call_user_func($labelAttr, $choice, $key, $value) : (null !== $labelAttr ? $labelAttr : array())
         );
 
         // $isPreferred may be null if no choices are preferred
@@ -148,7 +169,7 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
         }
     }
 
-    private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
+    private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $keys, &$index, $attr, $labelAttr, $isPreferred, &$preferredViews, &$otherViews)
     {
         foreach ($groupBy as $key => $value) {
             if (null === $value) {
@@ -167,6 +188,7 @@ private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $key
                     $keys,
                     $index,
                     $attr,
+                    $labelAttr,
                     $isPreferred,
                     $preferredViewsForGroup,
                     $otherViewsForGroup
@@ -191,14 +213,15 @@ private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $key
                 $keys,
                 $index,
                 $attr,
+                $labelAttr,
                 $isPreferred,
                 $preferredViews,
                 $otherViews
             );
         }
     }
 
-    private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
+    private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $labelAttr, $isPreferred, &$preferredViews, &$otherViews)
     {
         $groupLabel = call_user_func($groupBy, $choice, $keys[$value], $value);
 
@@ -211,6 +234,7 @@ private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label
                 $keys,
                 $index,
                 $attr,
+                $labelAttr,
                 $isPreferred,
                 $preferredViews,
                 $otherViews
@@ -235,6 +259,7 @@ private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label
             $keys,
             $index,
             $attr,
+            $labelAttr,
             $isPreferred,
             $preferredViews[$groupLabel]->choices,
             $otherViews[$groupLabel]->choices

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -148,10 +148,11 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      * @param null|callable|string|PropertyPath       $index            The callable or path generating the view indices
      * @param null|callable|string|PropertyPath       $groupBy          The callable or path generating the group names
      * @param null|array|callable|string|PropertyPath $attr             The callable or path generating the HTML attributes
+     * @param null|array|callable                     $labelAttr        The array or callable generating the label HTML attributes
      *
      * @return ChoiceListView The choice list view
      */
-    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
+    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null, $labelAttr = null)
     {
         $accessor = $this->propertyAccessor;
 
@@ -218,12 +219,13 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             @trigger_error('Passing callable strings is deprecated since version 3.1 and PropertyAccessDecorator will treat them as property paths in 4.0. You should use a "\Closure" instead.', E_USER_DEPRECATED);
         }
 
+        // Deprecated since 3.3 and to be removed in 4.0 with the condition above
         if ($attr instanceof PropertyPath) {
             $attr = function ($choice) use ($accessor, $attr) {
                 return $accessor->getValue($choice, $attr);
             };
         }
 
-        return $this->decoratedFactory->createView($list, $preferredChoices, $label, $index, $groupBy, $attr);
+        return $this->decoratedFactory->createView($list, $preferredChoices, $label, $index, $groupBy, $attr, $labelAttr);
     }
 }
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
@@ -46,19 +46,28 @@ class ChoiceView
      */
     public $attr;
 
+    /**
+     * Additional label attributes for the HTML tag.
+     *
+     * @var array
+     */
+    public $labelAttr;
+
     /**
      * Creates a new choice view.
      *
-     * @param mixed  $data  The original choice
-     * @param string $value The view representation of the choice
-     * @param string $label The label displayed to humans
-     * @param array  $attr  Additional attributes for the HTML tag
+     * @param mixed  $data      The original choice
+     * @param string $value     The view representation of the choice
+     * @param string $label     The label displayed to humans
+     * @param array  $attr      Additional attributes for the HTML tag
+     * @param array  $labelAttr Additional label attributes for the HTML tag
      */
-    public function __construct($data, $value, $label, array $attr = array())
+    public function __construct($data, $value, $label, array $attr = array(), array $labelAttr = array())
     {
         $this->data = $data;
         $this->value = $value;
         $this->label = $label;
         $this->attr = $attr;
+        $this->labelAttr = $labelAttr;
     }
 }