Merge branch '6.3' into 6.4

* 6.3:
minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
Fix bad merge
List CS fix in .git-blame-ignore-revs
Fix implicitly-required parameters
List CS fix in .git-blame-ignore-revs
Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value

Author: nicolas-grekas

ExecutableFinder.php

@@ -48,7 +48,7 @@ public function addSuffix(string $suffix)
  * @param string|null $default The default to return if no executable is found
  * @param array $extraDirs Additional dirs to check into
  */
-publicfunctionfind(string$name, string$default = null, array$extraDirs = []): ?string
+publicfunctionfind(string$name, ?string$default = null, array$extraDirs = []): ?string
  {
 $dirs = array_merge(
 explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),

InputStream.php

@@ -31,7 +31,7 @@ class InputStream implements \IteratorAggregate
  *
  * @return void
  */
-publicfunctiononEmpty(callable$onEmpty = null)
+publicfunctiononEmpty(?callable$onEmpty = null)
  {
 $this->onEmpty = null !== $onEmpty ? $onEmpty(...) : null;
  }

PhpProcess.php

@@ -32,7 +32,7 @@ class PhpProcess extends Process
  * @param int $timeout The timeout in seconds
  * @param array|null $php Path to the PHP binary to use with any additional arguments
  */
-publicfunction__construct(string$script, string$cwd = null, array$env = null, int$timeout = 60, array$php = null)
+publicfunction__construct(string$script, ?string$cwd = null, ?array$env = null, int$timeout = 60, ?array$php = null)
  {
 if (null === $php) {
 $executableFinder = newPhpExecutableFinder();
@@ -50,15 +50,15 @@ public function __construct(string $script, string $cwd = null, array $env = nul
 parent::__construct($php, $cwd, $env, $script, $timeout);
  }
 
-publicstaticfunctionfromShellCommandline(string$command, string$cwd = null, array$env = null, mixed$input = null, ?float$timeout = 60): static
+publicstaticfunctionfromShellCommandline(string$command, ?string$cwd = null, ?array$env = null, mixed$input = null, ?float$timeout = 60): static
  {
 thrownewLogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
  }
 
 /**
  * @return void
  */
-publicfunctionstart(callable$callback = null, array$env = [])
+publicfunctionstart(?callable$callback = null, array$env = [])
  {
 if (null === $this->getCommandLine()) {
 thrownewRuntimeException('Unable to find the PHP executable.');

PhpSubprocess.php

@@ -51,7 +51,7 @@ class PhpSubprocess extends Process
  * @param int $timeout The timeout in seconds
  * @param array|null $php Path to the PHP binary to use with any additional arguments
  */
-publicfunction__construct(array$command, string$cwd = null, array$env = null, int$timeout = 60, array$php = null)
+publicfunction__construct(array$command, ?string$cwd = null, ?array$env = null, int$timeout = 60, ?array$php = null)
  {
 if (null === $php) {
 $executableFinder = newPhpExecutableFinder();
@@ -73,12 +73,12 @@ public function __construct(array $command, string $cwd = null, array $env = nul
 parent::__construct($command, $cwd, $env, null, $timeout);
  }
 
-publicstaticfunctionfromShellCommandline(string$command, string$cwd = null, array$env = null, mixed$input = null, ?float$timeout = 60): static
+publicstaticfunctionfromShellCommandline(string$command, ?string$cwd = null, ?array$env = null, mixed$input = null, ?float$timeout = 60): static
  {
 thrownewLogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
  }
 
-publicfunctionstart(callable$callback = null, array$env = []): void
+publicfunctionstart(?callable$callback = null, array$env = []): void
  {
 if (null === $this->getCommandLine()) {
 thrownewRuntimeException('Unable to find the PHP executable.');

Process.php

@@ -140,7 +140,7 @@ class Process implements \IteratorAggregate
  *
  * @throws LogicException When proc_open is not installed
  */
-publicfunction__construct(array$command, string$cwd = null, array$env = null, mixed$input = null, ?float$timeout = 60)
+publicfunction__construct(array$command, ?string$cwd = null, ?array$env = null, mixed$input = null, ?float$timeout = 60)
  {
 if (!\function_exists('proc_open')) {
 thrownewLogicException('The Process class relies on proc_open, which is not available on your PHP installation.');
@@ -186,7 +186,7 @@ public function __construct(array $command, string $cwd = null, array $env = nul
  *
  * @throws LogicException When proc_open is not installed
  */
-publicstaticfunctionfromShellCommandline(string$command, string$cwd = null, array$env = null, mixed$input = null, ?float$timeout = 60): static
+publicstaticfunctionfromShellCommandline(string$command, ?string$cwd = null, ?array$env = null, mixed$input = null, ?float$timeout = 60): static
  {
 $process = newstatic([], $cwd, $env, $input, $timeout);
 $process->commandline = $command;
@@ -244,7 +244,7 @@ public function __clone()
  *
  * @final
  */
-publicfunctionrun(callable$callback = null, array$env = []): int
+publicfunctionrun(?callable$callback = null, array$env = []): int
  {
 $this->start($callback, $env);
 
@@ -263,7 +263,7 @@ public function run(callable $callback = null, array $env = []): int
  *
  * @final
  */
-publicfunctionmustRun(callable$callback = null, array$env = []): static
+publicfunctionmustRun(?callable$callback = null, array$env = []): static
  {
 if (0 !== $this->run($callback, $env)) {
 thrownewProcessFailedException($this);
@@ -293,7 +293,7 @@ public function mustRun(callable $callback = null, array $env = []): static
  * @throws RuntimeException When process is already running
  * @throws LogicException In case a callback is provided and output has been disabled
  */
-publicfunctionstart(callable$callback = null, array$env = [])
+publicfunctionstart(?callable$callback = null, array$env = [])
  {
 if ($this->isRunning()) {
 thrownewRuntimeException('Process is already running.');
@@ -378,7 +378,7 @@ public function start(callable $callback = null, array $env = [])
  *
  * @final
  */
-publicfunctionrestart(callable$callback = null, array$env = []): static
+publicfunctionrestart(?callable$callback = null, array$env = []): static
  {
 if ($this->isRunning()) {
 thrownewRuntimeException('Process is already running.');
@@ -405,7 +405,7 @@ public function restart(callable $callback = null, array $env = []): static
  * @throws ProcessSignaledException When process stopped after receiving signal
  * @throws LogicException When process is not yet started
  */
-publicfunctionwait(callable$callback = null): int
+publicfunctionwait(?callable$callback = null): int
  {
 $this->requireProcessIsStarted(__FUNCTION__);
 
@@ -878,7 +878,7 @@ public function getStatus(): string
  *
  * @return int|null The exit-code of the process or null if it's not running
  */
-publicfunctionstop(float$timeout = 10, int$signal = null): ?int
+publicfunctionstop(float$timeout = 10, ?int$signal = null): ?int
  {
 $timeoutMicro = microtime(true) + $timeout;
 if ($this->isRunning()) {
@@ -1256,7 +1256,7 @@ private function getDescriptors(bool $hasCallback): array
  *
  * @param callable|null $callback The user defined PHP callback
  */
-protectedfunctionbuildCallback(callable$callback = null): \Closure
+protectedfunctionbuildCallback(?callable$callback = null): \Closure
  {
 if ($this->outputDisabled) {
 returnfn ($type, $data): bool => null !== $callback && $callback($type, $data);

Tests/ProcessTest.php

@@ -1566,7 +1566,7 @@ public function testNotTerminableInputPipe()
 $this->assertFalse($process->isRunning());
  }
 
-privatefunctiongetProcess(string|array$commandline, string$cwd = null, array$env = null, mixed$input = null, ?int$timeout = 60): Process
+privatefunctiongetProcess(string|array$commandline, ?string$cwd = null, ?array$env = null, mixed$input = null, ?int$timeout = 60): Process
  {
 if (\is_string($commandline)) {
 $process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout);
@@ -1579,7 +1579,7 @@ private function getProcess(string|array $commandline, string $cwd = null, array
 returnself::$process = $process;
  }
 
-privatefunctiongetProcessForCode(string$code, string$cwd = null, array$env = null, $input = null, ?int$timeout = 60): Process
+privatefunctiongetProcessForCode(string$code, ?string$cwd = null, ?array$env = null, $input = null, ?int$timeout = 60): Process
  {
 return$this->getProcess([self::$phpBin, '-r', $code], $cwd, $env, $input, $timeout);
  }