bug #5944 Fix ChoiceField when entity is enumType and no choices were…

… given (Uplink03, Radu Cristescu)

This PR was merged into the 4.x branch.

Discussion
----------

Fix ChoiceField when entity is enumType and no choices were given

Fix ChoiceField when entity is enumType and no choices were given explicitly

## Bugs

BUG: if `setChoices` is not called on the ChoiceField, and the backing entity field is an Enum, the dropdown displays 0, 1, 2, 3, etc., because the `$choices` array ends up like this:

```
array:2 [
  0 => App\Enum\ProjectTypeEnum {
    +name: "PHP"
    +value: "php"
  }
  1 => App\Enum\ProjectTypeEnum {
    +name: "DOCKER"
    +value: "docker"
  }
]
```

BUG: Symfony Forms attempts to convert the enum to string.

## Fixes

### Fix the ChoiceConfigurator

This PR fixes the ChoiceConfigurator to behave as if `->setChoices(MyEnum::cases())` were called.

Related to commit 65a422b of PR #5879 by `@SerheyDolgushev`

### Fix the forms

Although closed, bug #5641 was not addressed by PR #5879. Without the change suggested by the original reported, the following errors are thrown:

The EDIT action of a CRUD that contains a ChoiceField with an enum:

`Object of class App\Enum\ProjectTypeEnum could not be converted to string`

The Create action of a CRUD that contains a ChoiceField with an enum (the NEW page doesn't complain until submitted):

`Expected argument of type "App\Enum\ProjectTypeEnum", "string" given at property path "type".`

<!--
Thanks for your contribution! If you are proposing a new feature that is complex,
please open an issue first so we can discuss about it.

Note: all your contributions adhere implicitly to the MIT license
-->

Commits
-------

81175ac Updated ChoiceConfiguratorTest to work with the ChoiceConfigurator fixes
8774da3 Fix ChoiceConfigurator with enums
a91ca47 Fix ChoiceField when entity is enumType and no choices have been given explicitly

src/Field/Configurator/ChoiceConfigurator.php

@@ -52,14 +52,13 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
             $enumTypeClass = $field->getDoctrineMetadata()->get('enumType');
             if (0 === \count($choices) && null !== $enumTypeClass && enum_exists($enumTypeClass)) {
                 $choices = $enumTypeClass::cases();
-            } elseif ($allChoicesAreEnums) {
+                $allChoicesAreEnums = true;
+            }
+
+            if ($allChoicesAreEnums) {
                 $processedEnumChoices = [];
                 foreach ($choices as $choice) {
-                    if ($choice instanceof \BackedEnum) {
-                        $processedEnumChoices[$choice->name] = $choice->value;
-                    } else {
-                        $processedEnumChoices[$choice->name] = $choice->name;
-                    }
+                    $processedEnumChoices[$choice->name] = $choice;
                 }
 
                 $choices = $processedEnumChoices;

tests/Field/Configurator/ChoiceConfiguratorTest.php

@@ -51,7 +51,12 @@ public function testBackedEnumTypeChoices(): void
         $field = ChoiceField::new(self::PROPERTY_NAME);
         $field->getAsDto()->setDoctrineMetadata(['enumType' => StatusBackedEnum::class]);
 
-        $this->assertSame($this->configure($field)->getFormTypeOption('choices'), StatusBackedEnum::cases());
+        $formChoices = array_combine(
+            array_column(StatusBackedEnum::cases(), 'name'),
+            StatusBackedEnum::cases(),
+        );
+
+        $this->assertSame($this->configure($field)->getFormTypeOption('choices'), $formChoices);
     }
 
     public function testBackedEnumChoices(): void
@@ -63,7 +68,7 @@ public function testBackedEnumChoices(): void
 
         $expected = [];
         foreach (StatusBackedEnum::cases() as $case) {
-            $expected[$case->name] = $case->value;
+            $expected[$case->name] = $case;
         }
 
         $this->assertSame($this->configure($field)->getFormTypeOption('choices'), $expected);
@@ -76,7 +81,12 @@ public function testUnitEnumTypeChoices(): void
         $field = ChoiceField::new(self::PROPERTY_NAME);
         $field->getAsDto()->setDoctrineMetadata(['enumType' => PriorityUnitEnum::class]);
 
-        $this->assertSame($this->configure($field)->getFormTypeOption('choices'), PriorityUnitEnum::cases());
+        $formChoices = array_combine(
+            array_column(PriorityUnitEnum::cases(), 'name'),
+            PriorityUnitEnum::cases(),
+        );
+
+        $this->assertSame($this->configure($field)->getFormTypeOption('choices'), $formChoices);
     }
 
     public function testUnitEnumChoices(): void
@@ -88,7 +98,7 @@ public function testUnitEnumChoices(): void
 
         $expected = [];
         foreach (PriorityUnitEnum::cases() as $case) {
-            $expected[$case->name] = $case->name;
+            $expected[$case->name] = $case;
         }
 
         $this->assertSame($this->configure($field)->getFormTypeOption('choices'), $expected);