bug #40137 [Form] forward the label_html option to expanded choice fi…

…elds (xabbuh) This PR was merged into the 5.2 branch. Discussion ---------- [Form] forward the label_html option to expanded choice fields | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- fbe49cf forward the label_html option to expanded choice fields
symfony · Feb 9, 2021 · ec38bab · ec38bab
2 parents 7866a0f + fbe49cf
commit ec38bab
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -395,6 +395,7 @@ private function addSubForm(FormBuilderInterface $builder, string $name, ChoiceV
         $choiceOpts = [
             'value' => $choiceView->value,
             'label' => $choiceView->label,
+            'label_html' => $options['label_html'],
             'attr' => $choiceView->attr,
             'translation_domain' => $options['choice_translation_domain'],
             'block_name' => 'entry',

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -392,6 +392,20 @@ public function testExpandedCheckboxesAreNeverRequired()
         }
     }
 
+    public function testExpandedCheckboxesInhertLabelHtmlOption()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'choices' => $this->choices,
+            'expanded' => true,
+            'label_html' => true,
+            'multiple' => true,
+        ]);
+
+        foreach ($form as $child) {
+            $this->assertTrue($child->getConfig()->getOption('label_html'));
+        }
+    }
+
     public function testExpandedRadiosAreRequiredIfChoiceChildIsRequired()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
@@ -420,6 +434,20 @@ public function testExpandedRadiosAreNotRequiredIfChoiceChildIsNotRequired()
         }
     }
 
+    public function testExpandedRadiosInhertLabelHtmlOption()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'choices' => $this->choices,
+            'expanded' => true,
+            'label_html' => true,
+            'multiple' => false,
+        ]);
+
+        foreach ($form as $child) {
+            $this->assertTrue($child->getConfig()->getOption('label_html'));
+        }
+    }
+
     public function testSubmitSingleNonExpanded()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [