[Form] Fix EnumType choice_label logic for grouped choices

yoeunes · yoeunes · commit 85ff6f496ac4 · 2025-10-30T18:24:05.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EnumType.php b/src/Symfony/Component/Form/Extension/Core/Type/EnumType.php
@@ -31,8 +31,21 @@ public function configureOptions(OptionsResolver $resolver): void
             ->setAllowedValues('class', enum_exists(...))
             ->setDefault('choices', static fn (Options $options): array => $options['class']::cases())
             ->setDefault('choice_label', static function (Options $options) {
-                if (\is_array($options['choices']) && !array_is_list($options['choices'])) {
-                    return null;
+                $choices = $options['choices'];
+
+                if (\is_array($choices) && !array_is_list($choices)) {
+                    // Check for grouped choices
+                    $isGrouped = false;
+                    foreach ($choices as $value) {
+                        if (\is_array($value) && array_is_list($value)) {
+                            $isGrouped = true;
+                            break;
+                        }
+                    }
+                    if (!$isGrouped) {
+                        // Associative array = custom labels
+                        return null;
+                    }
                 }
 
                 return static fn (\UnitEnum $choice) => $choice instanceof TranslatableInterface ? $choice : $choice->name;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php
@@ -311,6 +311,69 @@ public function testChoicesWithLabels()
         $this->assertSame('no', $view->children[1]->vars['label']);
     }
 
+    public function testGroupedEnumChoices()
+    {
+        $form = $this->factory->create($this->getTestedType(), null, [
+            'multiple' => false,
+            'expanded' => true,
+            'class' => Answer::class,
+            'choices' => [
+                'Group 1' => [Answer::Yes, Answer::No],
+                'Group 2' => [Answer::FourtyTwo],
+            ],
+        ]);
+        $view = $form->createView();
+        $this->assertCount(2, $view->vars['choices']['Group 1']->choices);
+        $this->assertSame('Yes', $view->vars['choices']['Group 1']->choices[0]->label);
+        $this->assertSame('No', $view->vars['choices']['Group 1']->choices[1]->label);
+        $this->assertCount(1, $view->vars['choices']['Group 2']->choices);
+        $this->assertSame('FourtyTwo', $view->vars['choices']['Group 2']->choices[2]->label);
+    }
+
+    public function testEnumChoicesWithCustomLabels()
+    {
+        $form = $this->factory->create($this->getTestedType(), null, [
+            'multiple' => false,
+            'expanded' => true,
+            'class' => Answer::class,
+            'choices' => [
+                'Custom Yes' => Answer::Yes,
+                'Custom No' => Answer::No,
+            ],
+        ]);
+        $view = $form->createView();
+        $this->assertSame('Custom Yes', $view->children[0]->vars['label']);
+        $this->assertSame('Custom No', $view->children[1]->vars['label']);
+    }
+
+    public function testGroupedEnumChoicesWithCustomLabels()
+    {
+        $form = $this->factory->create($this->getTestedType(), null, [
+            'multiple' => false,
+            'expanded' => true,
+            'class' => Answer::class,
+            'choices' => [
+                'Group 1' => [
+                    'Custom Yes' => Answer::Yes,
+                    'Custom No' => Answer::No,
+                ],
+                'Group 2' => [
+                    'Custom 42' => Answer::FourtyTwo,
+                ],
+            ],
+        ]);
+        $view = $form->createView();
+
+        // Test Group 1
+        $this->assertCount(2, $view->vars['choices']['Group 1']->choices);
+        $this->assertSame('Custom Yes', $view->vars['choices']['Group 1']->choices[0]->label);
+        $this->assertSame('Custom No', $view->vars['choices']['Group 1']->choices[1]->label);
+
+        // Test Group 2
+        $this->assertCount(1, $view->vars['choices']['Group 2']->choices);
+        $this->assertSame('Custom 42', $view->vars['choices']['Group 2']->choices[2]->label);
+    }
+
     protected function getTestOptions(): array
     {
         return ['class' => Suit::class];
