Merge branch '7.4' into 8.0

* 7.4: (28 commits)
  [Messenger] Allow Pheanstalk v8
  [TypeInfo] Fix resolving constructor type with templates
  fix compatibility with RelayCluster 0.12
  fix type alias with template resolving
  fix compatibility with RelayCluster 0.11 and 0.12
  [DependencyInjection] Register a custom autoloader to generate `*Config` classes when they don't exist yet
  [Security] Add security:oidc-token:generate command
  [PropertyInfo][TypeInfo] Fix resolving constructor type with templates
  [WebProfilerBundle] ”finish” errored requests
  Add support for union types on AsEventListener
  [Console] Update CHANGELOG to reflect attribute name changes for interactive invokable commands
  bump ext-redis to 6.2 and ext-relay to 0.12 minimum
  [TypeInfo] Fix type alias with template resolving
  [Console] Add support for interactive invokable commands with `#[Interact]` and `#[Ask]` attributes
  bump ext-relay to 0.12+
  fix merge
  [Config] Generate the array-shape of the current node instead of the whole root node in Config classes
  [HttpFoundation] Deprecate Request::get() in favor of using properties ->attributes, query or request directly
  fix Relay Cluster 0.12 compatibility
  [TypeInfo] ArrayShape can resolve key type as callable instead of string
  ...

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

@@ -267,6 +267,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];