[Form] Add TranslatableMessage support to choice_label option of ChoiceType

Author: alexandre-daubois

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -20,6 +20,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Translation\TranslatableMessage;
 
 /**
  * Default implementation of {@link ChoiceListFactoryInterface}.
@@ -177,7 +178,14 @@ private static function addChoiceView($choice, string $value, $label, array $key
             // If "choice_label" is set to false and "expanded" is true, the value false
             // should be passed on to the "label" option of the checkboxes/radio buttons
             $dynamicLabel = $label($choice, $key, $value);
-            $label = false === $dynamicLabel ? false : (string) $dynamicLabel;
+
+            if (false === $dynamicLabel) {
+                $label = false;
+            } elseif ($dynamicLabel instanceof TranslatableMessage) {
+                $label = $dynamicLabel;
+            } else {
+                $label = (string) $dynamicLabel;
+            }
         }
 
         $view = new ChoiceView(

ChoiceList/View/ChoiceView.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Form\ChoiceList\View;
 
+use Symfony\Component\Translation\TranslatableMessage;
+
 /**
  * Represents a choice in templates.
  *
@@ -30,10 +32,10 @@ class ChoiceView
     /**
      * Creates a new choice view.
      *
-     * @param mixed        $data  The original choice
-     * @param string       $value The view representation of the choice
-     * @param string|false $label The label displayed to humans; pass false to discard the label
-     * @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|TranslatableMessage|false $label The label displayed to humans; pass false to discard the label
+     * @param array                            $attr  Additional attributes for the HTML tag
      */
     public function __construct($data, string $value, $label, array $attr = [])
     {

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -21,6 +21,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Translation\TranslatableMessage;
 
 class DefaultChoiceListFactoryTest extends TestCase
 {
@@ -754,6 +755,24 @@ function ($object, $key, $value) {
         $this->assertFlatViewWithAttr($view);
     }
 
+    /**
+     * @requires function Symfony\Component\Translation\TranslatableMessage::__construct
+     */
+    public function testPassTranslatableMessageAsLabelDoesntCastItToString()
+    {
+        $view = $this->factory->createView(
+            $this->list,
+            [$this->obj1],
+            static function ($choice, $key, $value) {
+                return new TranslatableMessage('my_message', ['param1' => 'value1']);
+            }
+        );
+
+        $this->assertInstanceOf(TranslatableMessage::class, $view->choices[0]->label);
+        $this->assertEquals('my_message', $view->choices[0]->label->getMessage());
+        $this->assertArrayHasKey('param1', $view->choices[0]->label->getParameters());
+    }
+
     private function assertScalarListWithChoiceValues(ChoiceListInterface $list)
     {
         $this->assertSame(['a', 'b', 'c', 'd'], $list->getValues());