Merge branch '6.4' into 7.0

* 6.4:
  Use typed properties in tests as much as possible

Author: nicolas-grekas

Tester/TesterTrait.php

@@ -130,7 +130,7 @@ public function setInputs(array $inputs): static
      */
     private function initOutput(array $options): void
     {
-        $this->captureStreamsIndependently = \array_key_exists('capture_stderr_separately', $options) && $options['capture_stderr_separately'];
+        $this->captureStreamsIndependently = $options['capture_stderr_separately'] ?? false;
         if (!$this->captureStreamsIndependently) {
             $this->output = new StreamOutput(fopen('php://memory', 'w', false));
             if (isset($options['decorated'])) {

Tests/ApplicationTest.php

@@ -52,9 +52,9 @@
 
 class ApplicationTest extends TestCase
 {
-    protected static $fixturesPath;
+    protected static string $fixturesPath;
 
-    private $colSize;
+    private string|false $colSize;
 
     protected function setUp(): void
     {
@@ -2267,12 +2267,12 @@ public function isEnabled(): bool
 #[AsCommand(name: 'signal')]
 class BaseSignableCommand extends Command
 {
-    public $signaled = false;
-    public $exitCode = 1;
-    public $signalHandlers = [];
-    public $loop = 1000;
-    private $emitsSignal;
-    private $signal;
+    public bool $signaled = false;
+    public int $exitCode = 1;
+    public array $signalHandlers = [];
+    public int $loop = 1000;
+    private bool $emitsSignal;
+    private int $signal;
 
     public function __construct(bool $emitsSignal = true, int $signal = \SIGUSR1)
     {
@@ -2383,7 +2383,7 @@ public static function getSubscribedEvents(): array
 
 class SignalEventSubscriber implements EventSubscriberInterface
 {
-    public $signaled = false;
+    public bool $signaled = false;
 
     public function onSignal(ConsoleSignalEvent $event): void
     {

Tests/Command/CommandTest.php

@@ -28,7 +28,7 @@
 
 class CommandTest extends TestCase
 {
-    protected static $fixturesPath;
+    protected static string $fixturesPath;
 
     public static function setUpBeforeClass(): void
     {

Tests/Command/CompleteCommandTest.php

@@ -24,9 +24,9 @@
 
 class CompleteCommandTest extends TestCase
 {
-    private $command;
-    private $application;
-    private $tester;
+    private CompleteCommand $command;
+    private Application $application;
+    private CommandTester $tester;
 
     protected function setUp(): void
     {

Tests/Command/LockableTraitTest.php

@@ -19,7 +19,7 @@
 
 class LockableTraitTest extends TestCase
 {
-    protected static $fixturesPath;
+    protected static string $fixturesPath;
 
     public static function setUpBeforeClass(): void
     {

Tests/ConsoleEventsTest.php

@@ -73,7 +73,7 @@ public function testEventAliases()
 
 class EventTraceSubscriber implements EventSubscriberInterface
 {
-    public $observedEvents = [];
+    public array $observedEvents = [];
 
     public static function getSubscribedEvents(): array
     {

Tests/DependencyInjection/AddConsoleCommandPassTest.php

@@ -322,7 +322,7 @@ class EscapedDefaultsFromPhpCommand extends Command
 #[AsCommand(name: '|cmdname|cmdalias', description: 'Just testing')]
 class DescribedCommand extends Command
 {
-    public static $initCounter = 0;
+    public static int $initCounter = 0;
 
     public function __construct()
     {

Tests/Helper/ProgressBarTest.php

@@ -23,7 +23,7 @@
  */
 class ProgressBarTest extends TestCase
 {
-    private $colSize;
+    private string|false $colSize;
 
     protected function setUp(): void
     {

Tests/Helper/QuestionHelperTest.php

@@ -952,7 +952,7 @@ protected function createInputInterfaceMock($interactive = true)
 
 class AutocompleteValues implements \IteratorAggregate
 {
-    private $values;
+    private array $values;
 
     public function __construct(array $values)
     {

Tests/Input/InputDefinitionTest.php

@@ -18,7 +18,7 @@
 
 class InputDefinitionTest extends TestCase
 {
-    protected static $fixtures;
+    protected static string $fixtures;
 
     protected $multi;
     protected $foo;

Tests/Logger/ConsoleLoggerTest.php

@@ -26,10 +26,7 @@
  */
 class ConsoleLoggerTest extends TestCase
 {
-    /**
-     * @var DummyOutput
-     */
-    protected $output;
+    protected DummyOutput $output;
 
     public function getLogger(): LoggerInterface
     {

Tests/Output/OutputTest.php

@@ -175,7 +175,7 @@ public static function verbosityProvider()
 
 class TestOutput extends Output
 {
-    public $output = '';
+    public string $output = '';
 
     public function clear()
     {

Tests/Question/ChoiceQuestionTest.php

@@ -152,7 +152,7 @@ public function testSelectWithNonStringChoices()
 
 class StringChoice
 {
-    private $string;
+    private string $string;
 
     public function __construct(string $string)
     {

Tests/Question/QuestionTest.php

@@ -16,7 +16,7 @@
 
 class QuestionTest extends TestCase
 {
-    private $question;
+    private Question $question;
 
     protected function setUp(): void
     {

Tests/Style/SymfonyStyleTest.php

@@ -25,14 +25,13 @@
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Console\Tests\Command\CommandTest;
 
 class SymfonyStyleTest extends TestCase
 {
-    /** @var Command */
-    protected $command;
-    /** @var CommandTester */
-    protected $tester;
-    private $colSize;
+    protected Command $command;
+    protected CommandTester $tester;
+    private string|false $colSize;
 
     protected function setUp(): void
     {
@@ -45,8 +44,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
-        $this->command = null;
-        $this->tester = null;
     }
 
     /**

Tests/TerminalTest.php

@@ -17,9 +17,9 @@
 
 class TerminalTest extends TestCase
 {
-    private $colSize;
-    private $lineSize;
-    private $ansiCon;
+    private string|false $colSize;
+    private string|false $lineSize;
+    private string|false $ansiCon;
 
     protected function setUp(): void
     {

Tests/Tester/ApplicationTesterTest.php

@@ -20,8 +20,8 @@
 
 class ApplicationTesterTest extends TestCase
 {
-    protected $application;
-    protected $tester;
+    protected Application $application;
+    protected ApplicationTester $tester;
 
     protected function setUp(): void
     {
@@ -38,12 +38,6 @@ protected function setUp(): void
         $this->tester->run(['command' => 'foo', 'foo' => 'bar'], ['interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
     }
 
-    protected function tearDown(): void
-    {
-        $this->application = null;
-        $this->tester = null;
-    }
-
     public function testRun()
     {
         $this->assertFalse($this->tester->getInput()->isInteractive(), '->execute() takes an interactive option');

Tests/Tester/CommandTesterTest.php

@@ -24,8 +24,8 @@
 
 class CommandTesterTest extends TestCase
 {
-    protected $command;
-    protected $tester;
+    protected Command $command;
+    protected CommandTester $tester;
 
     protected function setUp(): void
     {
@@ -38,12 +38,6 @@ protected function setUp(): void
         $this->tester->execute(['foo' => 'bar'], ['interactive' => false, 'decorated' => false, 'verbosity' => Output::VERBOSITY_VERBOSE]);
     }
 
-    protected function tearDown(): void
-    {
-        $this->command = null;
-        $this->tester = null;
-    }
-
     public function testExecute()
     {
         $this->assertFalse($this->tester->getInput()->isInteractive(), '->execute() takes an interactive option');