Merge branch '5.4' into 6.0

* 5.4: (21 commits)
  [Finder] Fix finding VCS re-included files in excluded directory
  [Yaml] Improve the deprecation warnings for octal numbers to suggest migrating
  Fix Choice constraint with associative choices array
  [Form] UrlType should not add protocol to emails
  [Dotenv] Fix bootEnv() override with .env.local.php when the env key already exists
  Silence isatty warnings during tty detection
  [Serializer] Fix AbstractObjectNormalizer not considering pseudo type false
  [Notifier] Fix encoding of messages with FreeMobileTransport
  [Cache] workaround PHP crash
  [Console] Fix PHP 8.1 deprecation in ChoiceQuestion
  [HttpKernel] Fix compatibility with php bridge and already started php sessions
  [Notifier] smsapi-notifier - correct encoding
  Replaced full CoC text with link to documentation
  Making the parser stateless
  [Console] fix restoring stty mode on CTRL+C
  fix merge (bis)
  fix merge
  [Process] Avoid calling fclose on an already closed resource
  [GHA] test tty group
  [DI] Fix tests on PHP 7.1
  ...

Author: nicolas-grekas

Constraints/Choice.php

@@ -52,7 +52,8 @@ public function getDefaultOption(): ?string
     }
 
     public function __construct(
-        string|array $choices = null,
+        string|array $options = [],
+        array $choices = null,
         callable|string $callback = null,
         bool $multiple = null,
         bool $strict = null,
@@ -63,12 +64,13 @@ public function __construct(
         string $minMessage = null,
         string $maxMessage = null,
         array $groups = null,
-        mixed $payload = null,
-        array $options = []
+        mixed $payload = null
     ) {
-        if (\is_array($choices) && \is_string(key($choices))) {
-            $options = array_merge($choices, $options);
-        } elseif (null !== $choices) {
+        if (\is_array($options) && $options && array_is_list($options)) {
+            $choices ??= $options;
+            $options = [];
+        }
+        if (null !== $choices) {
             $options['value'] = $choices;
         }
 

Tests/Constraints/ChoiceTest.php

@@ -12,6 +12,9 @@
 namespace Symfony\Component\Validator\Tests\Constraints;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Constraints\Choice;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintChoiceWithPreset;
 
 class ChoiceTest extends TestCase
@@ -22,4 +25,47 @@ public function testSetDefaultPropertyChoice()
 
         self::assertEquals(['A', 'B', 'C'], $constraint->choices);
     }
+
+    public function testAttributes()
+    {
+        $metadata = new ClassMetadata(ChoiceDummy::class);
+        $loader = new AnnotationLoader();
+        self::assertTrue($loader->loadClassMetadata($metadata));
+
+        /** @var Choice $aConstraint */
+        [$aConstraint] = $metadata->properties['a']->getConstraints();
+        self::assertSame([1, 2], $aConstraint->choices);
+        self::assertSame(['Default', 'ChoiceDummy'], $aConstraint->groups);
+
+        /** @var Choice $bConstraint */
+        [$bConstraint] = $metadata->properties['b']->getConstraints();
+        self::assertSame(['foo', 'bar'], $bConstraint->choices);
+        self::assertSame('myMessage', $bConstraint->message);
+        self::assertSame(['Default', 'ChoiceDummy'], $bConstraint->groups);
+
+        /** @var Choice $cConstraint */
+        [$cConstraint] = $metadata->properties['c']->getConstraints();
+        self::assertSame([1, 2], $aConstraint->choices);
+        self::assertSame(['my_group'], $cConstraint->groups);
+        self::assertSame('some attached data', $cConstraint->payload);
+
+        /** @var Choice $stringIndexedConstraint */
+        [$stringIndexedConstraint] = $metadata->properties['stringIndexed']->getConstraints();
+        self::assertSame(['one' => 1, 'two' => 2], $stringIndexedConstraint->choices);
+    }
+}
+
+class ChoiceDummy
+{
+    #[Choice(choices: [1, 2])]
+    private $a;
+
+    #[Choice(choices: ['foo', 'bar'], message: 'myMessage')]
+    private $b;
+
+    #[Choice([1, 2], groups: ['my_group'], payload: 'some attached data')]
+    private $c;
+
+    #[Choice(choices: ['one' => 1, 'two' => 2])]
+    private $stringIndexed;
 }

composer.json

@@ -19,6 +19,7 @@
         "php": ">=8.0.2",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php81": "^1.22",
         "symfony/translation-contracts": "^1.1|^2|^3"
     },
     "require-dev": {