Fixed self deprecation of undefined form option

Author: yann-eugone

src/Form/Type/EnumType.php

@@ -39,30 +39,16 @@ function (string $name): bool {
                 function (Options $options): array {
                     /** @var string $name */
                     $name = $options['enum'];
-                    $choices = $this->enumRegistry->get($name)->getChoices();
 
-                    if ($options['enum_choice_value'] === null) {
-                        foreach ($choices as $value) {
-                            if (!\is_scalar($value)) {
-                                @\trigger_error(
-                                    'Not configuring the "enum_choice_value" option is deprecated.' .
-                                    ' It will default to "true" in 5.0.',
-                                    \E_USER_DEPRECATED
-                                );
-                                break;
-                            }
-                        }
-                    }
-
-                    return $choices;
+                    return $this->enumRegistry->get($name)->getChoices();
                 }
             )
-            ->setAllowedTypes('enum_choice_value', ['bool', 'null'])
-            ->setDefault('enum_choice_value', null)
+            ->setAllowedTypes('enum_choice_value', ['bool'])
+            ->setDefault('enum_choice_value', true)
             ->setDefault(
                 'choice_value',
                 static function (Options $options) {
-                    if ($options['enum_choice_value'] !== true) {
+                    if (!$options['enum_choice_value']) {
                         return null;
                     }
 

src/Validator/Constraints/Enum.php

@@ -32,8 +32,8 @@ public function __construct(
         array|null $groups = null,
         mixed $payload = null,
     ) {
-        if (\is_array($options) && [] !== $options) {
-            trigger_deprecation(
+        if (\is_array($options) && $options !== []) {
+            \trigger_deprecation(
                 'symfony/validator',
                 '7.3',
                 'Passing an array of options to configure the "%s" constraint is deprecated, use named arguments instead.',

tests/Integration/tests/PullRequestFormTest.php

@@ -108,13 +108,13 @@ public function valid(): Generator
     {
         foreach ($this->classes() as [$class]) {
             yield [
-                ['status' => 0, 'labels' => ['bugfix', '1.x']],
+                ['status' => 'opened', 'labels' => ['bugfix', '1.x']],
                 self::pullRequest($class),
                 self::pullRequest($class, 'opened', ['bugfix', '1.x']),
             ];
 
             yield [
-                ['status' => 2, 'labels' => ['bugfix', '2.x']],
+                ['status' => 'closed', 'labels' => ['bugfix', '2.x']],
                 self::pullRequest($class, 'opened', ['bugfix', '1.x']),
                 self::pullRequest($class, 'closed', ['bugfix', '2.x']),
             ];
@@ -171,7 +171,7 @@ public function invalid(): Generator
 
     private static function pullRequest(
         string $class,
-        string $status = null,
+        string|null $status = null,
         array $labels = [],
     ): MyCLabsPullRequest|NativeEnumPullRequest {
         return (match ($class) {

tests/Unit/Form/Type/EnumTypeTest.php

@@ -61,65 +61,65 @@ public static function submit(): \Generator
     {
         yield [
             StateEnum::class,
-            [],
+            ['enum_choice_value' => false],
             'new',
             'new',
         ];
         yield [
             StateEnum::class,
-            ['enum_choice_value' => true],
+            [],
             'new',
             'new',
         ];
 
         yield [
             ActionEnum::class,
-            [],
+            ['enum_choice_value' => false],
             1,
             Action::EDIT(),
         ];
         yield [
             ActionEnum::class,
-            ['enum_choice_value' => true],
+            [],
             'edit',
             Action::EDIT(),
         ];
 
         yield [
             Picture::class,
-            [],
+            ['enum_choice_value' => false],
             0,
             Picture::Landscape,
         ];
         yield [
             Picture::class,
-            ['enum_choice_value' => true],
+            [],
             'Landscape',
             Picture::Landscape,
         ];
 
         yield [
             HTTPMethod::class,
-            [],
+            ['enum_choice_value' => false],
             0,
             HTTPMethod::GET,
         ];
         yield [
             HTTPMethod::class,
-            ['enum_choice_value' => true],
+            [],
             'get',
             HTTPMethod::GET,
         ];
 
         yield [
             HTTPStatus::class,
-            ['enum_choice_value' => true],
+            [],
             200,
             HTTPStatus::OK,
         ];
         yield [
             HTTPStatus::class,
-            [],
+            ['enum_choice_value' => false],
             0,
             HTTPStatus::OK,
         ];