Merge branch '6.4' into 7.0

* 6.4:
  fix typo
  Add types to private and internal properties
  [Workflow] Cleaning code
  [Scheduler] Fix NPE in debug:scheduler command

Author: nicolas-grekas

Internal/ComposerPlugin.php

@@ -27,17 +27,10 @@
  */
 class ComposerPlugin implements PluginInterface, EventSubscriberInterface
 {
-    /**
-     * @var Composer
-     */
-    private $composer;
+    private Composer $composer;
+    private IOInterface $io;
 
-    /**
-     * @var IOInterface
-     */
-    private $io;
-
-    private static $activated = false;
+    private static bool $activated = false;
 
     public function activate(Composer $composer, IOInterface $io): void
     {

Resolver/ClosureResolver.php

@@ -18,13 +18,10 @@
  */
 class ClosureResolver implements ResolverInterface
 {
-    private $closure;
-    private $arguments;
-
-    public function __construct(\Closure $closure, \Closure $arguments)
-    {
-        $this->closure = $closure;
-        $this->arguments = $arguments;
+    public function __construct(
+        private readonly \Closure $closure,
+        private readonly \Closure $arguments,
+    ) {
     }
 
     public function resolve(): array

Runner/ClosureRunner.php

@@ -18,11 +18,9 @@
  */
 class ClosureRunner implements RunnerInterface
 {
-    private $closure;
-
-    public function __construct(\Closure $closure)
-    {
-        $this->closure = $closure;
+    public function __construct(
+        private readonly \Closure $closure,
+    ) {
     }
 
     public function run(): int

Runner/Symfony/ConsoleApplicationRunner.php

@@ -22,17 +22,12 @@
  */
 class ConsoleApplicationRunner implements RunnerInterface
 {
-    private $application;
-    private $defaultEnv;
-    private $input;
-    private $output;
-
-    public function __construct(Application $application, ?string $defaultEnv, InputInterface $input, OutputInterface $output = null)
-    {
-        $this->application = $application;
-        $this->defaultEnv = $defaultEnv;
-        $this->input = $input;
-        $this->output = $output;
+    public function __construct(
+        private readonly Application $application,
+        private readonly ?string $defaultEnv,
+        private readonly InputInterface $input,
+        private readonly ?OutputInterface $output = null,
+    ) {
     }
 
     public function run(): int

Runner/Symfony/HttpKernelRunner.php

@@ -21,13 +21,10 @@
  */
 class HttpKernelRunner implements RunnerInterface
 {
-    private $kernel;
-    private $request;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request)
-    {
-        $this->kernel = $kernel;
-        $this->request = $request;
+    public function __construct(
+        private readonly HttpKernelInterface $kernel,
+        private readonly Request $request,
+    ) {
     }
 
     public function run(): int

Runner/Symfony/ResponseRunner.php

@@ -19,11 +19,9 @@
  */
 class ResponseRunner implements RunnerInterface
 {
-    private $response;
-
-    public function __construct(Response $response)
-    {
-        $this->response = $response;
+    public function __construct(
+        private readonly Response $response,
+    ) {
     }
 
     public function run(): int

SymfonyRuntime.php

@@ -66,10 +66,10 @@ class_exists(MissingDotenv::class, false) || class_exists(Dotenv::class) || clas
  */
 class SymfonyRuntime extends GenericRuntime
 {
-    private $input;
-    private $output;
-    private $console;
-    private $command;
+    private readonly ArgvInput $input;
+    private readonly ConsoleOutput $output;
+    private readonly Application $console;
+    private readonly Command $command;
 
     /**
      * @param array {
@@ -165,7 +165,7 @@ public function getRunner(?object $application): RunnerInterface
             return new ConsoleApplicationRunner($application, $defaultEnv, $this->getInput(), $output);
         }
 
-        if ($this->command) {
+        if (isset($this->command)) {
             $this->getInput()->bind($this->command->getDefinition());
         }
 
@@ -203,7 +203,7 @@ protected static function register(GenericRuntime $runtime): GenericRuntime
 
     private function getInput(): ArgvInput
     {
-        if (null !== $this->input) {
+        if (isset($this->input)) {
             return $this->input;
         }