Merge branch '6.4' into 7.3

* 6.4:
  fix compatibility with Relay 0.12
  [Translation] Update Danish (da) translations - Remove needs-review-translation state from validated translations in security.da.xlf and validators.da.xlf
  keep labels from configured choices

Author: nicolas-grekas

Extension/Core/Type/EnumType.php

@@ -30,7 +30,13 @@ public function configureOptions(OptionsResolver $resolver): void
             ->setAllowedTypes('class', 'string')
             ->setAllowedValues('class', enum_exists(...))
             ->setDefault('choices', static fn (Options $options): array => $options['class']::cases())
-            ->setDefault('choice_label', static fn (\UnitEnum $choice) => $choice instanceof TranslatableInterface ? $choice : $choice->name)
+            ->setDefault('choice_label', static function (Options $options) {
+                if (\is_array($options['choices']) && !array_is_list($options['choices'])) {
+                    return null;
+                }
+
+                return static fn (\UnitEnum $choice) => $choice instanceof TranslatableInterface ? $choice : $choice->name;
+            })
             ->setDefault('choice_value', static function (Options $options): ?\Closure {
                 if (!is_a($options['class'], \BackedEnum::class, true)) {
                     return null;

Tests/Extension/Core/Type/EnumTypeTest.php

@@ -274,6 +274,43 @@ public function testChoiceLabelTranslatable()
         $this->assertEquals('Left', $view->children[0]->vars['label']->trans(new IdentityTranslator()));
     }
 
+    public function testChoices()
+    {
+        $form = $this->factory->create($this->getTestedType(), null, [
+            'multiple' => false,
+            'expanded' => true,
+            'class' => Answer::class,
+            'choices' => [
+                Answer::Yes,
+                Answer::No,
+            ],
+        ]);
+
+        $view = $form->createView();
+
+        $this->assertCount(2, $view->children);
+        $this->assertSame('Yes', $view->children[0]->vars['label']);
+        $this->assertSame('No', $view->children[1]->vars['label']);
+    }
+
+    public function testChoicesWithLabels()
+    {
+        $form = $this->factory->create($this->getTestedType(), null, [
+            'multiple' => false,
+            'expanded' => true,
+            'class' => Answer::class,
+            'choices' => [
+                'yes' => Answer::Yes,
+                'no' => Answer::No,
+            ],
+        ]);
+
+        $view = $form->createView();
+
+        $this->assertSame('yes', $view->children[0]->vars['label']);
+        $this->assertSame('no', $view->children[1]->vars['label']);
+    }
+
     protected function getTestOptions(): array
     {
         return ['class' => Suit::class];