Merge branch '7.4' into 8.0

* 7.4:
  fix merge
  skip hidden question tests on Windows
  fix compatibility with symfony/dependency-injection 8
  Issue #51941 galician translation
  RedisTagAwareAdapter Add Predis2 Interface checks (fix #60050)
  fix deprecation version
  fixup! [Console] Specify types of interactive question choices
  fix using lock from service when previous locks used env vars

Author: xabbuh

Question/ChoiceQuestion.php

@@ -25,9 +25,9 @@ class ChoiceQuestion extends Question
     private string $errorMessage = 'Value "%s" is invalid';
 
     /**
-     * @param string                       $question The question to ask to the user
-     * @param array<string|bool|int|float> $choices  The list of available choices
-     * @param string|bool|int|float|null   $default  The default answer to return
+     * @param string                                   $question The question to ask to the user
+     * @param array<string|bool|int|float|\Stringable> $choices  The list of available choices
+     * @param string|bool|int|float|null               $default  The default answer to return
      */
     public function __construct(
         string $question,
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * @return array<string|bool|int|float>
+     * @return array<string|bool|int|float|\Stringable>
      */
     public function getChoices(): array
     {

Tests/Fixtures/InvokableWithInteractiveAttributesTestCommand.php

@@ -56,7 +56,7 @@ class DummyDto
     public Arg2 $arg2;
 
     #[Argument]
-    #[Ask('Enter arg3', hidden: true)]
+    #[Ask('Enter arg3')]
     public string $arg3;
 
     #[Argument]

Tests/Fixtures/InvokableWithInteractiveHiddenQuestionAttributeTestCommand.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Attribute\Argument;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Attribute\Ask;
+use Symfony\Component\Console\Attribute\MapInput;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+#[AsCommand('invokable:interactive:question')]
+class InvokableWithInteractiveHiddenQuestionAttributeTestCommand
+{
+    public function __invoke(
+        SymfonyStyle $io,
+        #[MapInput] DtoWithHiddenQuestionArg $dto,
+    ): int {
+        $io->writeln('Arg1: '.$dto->arg1);
+
+        return Command::SUCCESS;
+    }
+}
+
+class DtoWithHiddenQuestionArg
+{
+    #[Argument]
+    #[Ask('Enter arg1', hidden: true)]
+    public string $arg1;
+}

Tests/Tester/CommandTesterTest.php

@@ -30,6 +30,7 @@
 use Symfony\Component\Console\Tests\Fixtures\InvokableTestCommand;
 use Symfony\Component\Console\Tests\Fixtures\InvokableWithInputTestCommand;
 use Symfony\Component\Console\Tests\Fixtures\InvokableWithInteractiveAttributesTestCommand;
+use Symfony\Component\Console\Tests\Fixtures\InvokableWithInteractiveHiddenQuestionAttributeTestCommand;
 
 class CommandTesterTest extends TestCase
 {
@@ -490,4 +491,19 @@ public function testInvokableWithInteractiveQuestionParameter()
         self::assertStringContainsString('Enter arg5', $tester->getDisplay());
         self::assertStringContainsString('Arg5: arg5-value', $tester->getDisplay());
     }
+
+    public function testInvokableWithInteractiveHiddenQuestionParameter()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Cannot test hidden questions on Windows');
+        }
+
+        $tester = new CommandTester(new InvokableWithInteractiveHiddenQuestionAttributeTestCommand());
+        $tester->setInputs(['arg1-value']);
+        $tester->execute([], ['interactive' => true]);
+        $tester->assertCommandIsSuccessful();
+
+        self::assertStringContainsString('Enter arg1', $tester->getDisplay());
+        self::assertStringContainsString('Arg1: arg1-value', $tester->getDisplay());
+    }
 }