Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 937a195147e0 · 2024-01-23T16:02:46.000+01:00
* 6.4:
  Fix implicitly-required parameters
  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
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2
diff --git a/ExecutableFinder.php b/ExecutableFinder.php
@@ -44,7 +44,7 @@ public function addSuffix(string $suffix): void
      * @param string|null $default   The default to return if no executable is found
      * @param array       $extraDirs Additional dirs to check into
      */
-    public function find(string $name, string $default = null, array $extraDirs = []): ?string
+    public function find(string $name, ?string $default = null, array $extraDirs = []): ?string
     {
         $dirs = array_merge(
             explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
diff --git a/InputStream.php b/InputStream.php
@@ -29,7 +29,7 @@ class InputStream implements \IteratorAggregate
     /**
      * Sets a callback that is called when the write buffer becomes empty.
      */
-    public function onEmpty(callable $onEmpty = null): void
+    public function onEmpty(?callable $onEmpty = null): void
     {
         $this->onEmpty = null !== $onEmpty ? $onEmpty(...) : null;
     }
diff --git a/PhpProcess.php b/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
      */
-    public function __construct(string $script, string $cwd = null, array $env = null, int $timeout = 60, array $php = null)
+    public function __construct(string $script, ?string $cwd = null, ?array $env = null, int $timeout = 60, ?array $php = null)
     {
         if (null === $php) {
             $executableFinder = new PhpExecutableFinder();
@@ -50,12 +50,12 @@ public function __construct(string $script, string $cwd = null, array $env = nul
         parent::__construct($php, $cwd, $env, $script, $timeout);
     }
 
-    public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static
     {
         throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
     }
 
-    public function start(callable $callback = null, array $env = []): void
+    public function start(?callable $callback = null, array $env = []): void
     {
         if (null === $this->getCommandLine()) {
             throw new RuntimeException('Unable to find the PHP executable.');
diff --git a/PhpSubprocess.php b/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
      */
-    public function __construct(array $command, string $cwd = null, array $env = null, int $timeout = 60, array $php = null)
+    public function __construct(array $command, ?string $cwd = null, ?array $env = null, int $timeout = 60, ?array $php = null)
     {
         if (null === $php) {
             $executableFinder = new PhpExecutableFinder();
@@ -73,12 +73,12 @@ public function __construct(array $command, string $cwd = null, array $env = nul
         parent::__construct($command, $cwd, $env, null, $timeout);
     }
 
-    public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static
     {
         throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
     }
 
-    public function start(callable $callback = null, array $env = []): void
+    public function start(?callable $callback = null, array $env = []): void
     {
         if (null === $this->getCommandLine()) {
             throw new RuntimeException('Unable to find the PHP executable.');
diff --git a/Process.php b/Process.php
@@ -140,7 +140,7 @@ class Process implements \IteratorAggregate
      *
      * @throws LogicException When proc_open is not installed
      */
-    public function __construct(array $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60)
+    public function __construct(array $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60)
     {
         if (!\function_exists('proc_open')) {
             throw new LogicException('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
      */
-    public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static
     {
         $process = new static([], $cwd, $env, $input, $timeout);
         $process->commandline = $command;
@@ -241,7 +241,7 @@ public function __clone()
      *
      * @final
      */
-    public function run(callable $callback = null, array $env = []): int
+    public function run(?callable $callback = null, array $env = []): int
     {
         $this->start($callback, $env);
 
@@ -260,7 +260,7 @@ public function run(callable $callback = null, array $env = []): int
      *
      * @final
      */
-    public function mustRun(callable $callback = null, array $env = []): static
+    public function mustRun(?callable $callback = null, array $env = []): static
     {
         if (0 !== $this->run($callback, $env)) {
             throw new ProcessFailedException($this);
@@ -288,7 +288,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
      */
-    public function start(callable $callback = null, array $env = []): void
+    public function start(?callable $callback = null, array $env = []): void
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running.');
@@ -373,7 +373,7 @@ public function start(callable $callback = null, array $env = []): void
      *
      * @final
      */
-    public function restart(callable $callback = null, array $env = []): static
+    public function restart(?callable $callback = null, array $env = []): static
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running.');
@@ -400,7 +400,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
      */
-    public function wait(callable $callback = null): int
+    public function wait(?callable $callback = null): int
     {
         $this->requireProcessIsStarted(__FUNCTION__);
 
@@ -873,7 +873,7 @@ public function getStatus(): string
      *
      * @return int|null The exit-code of the process or null if it's not running
      */
-    public function stop(float $timeout = 10, int $signal = null): ?int
+    public function stop(float $timeout = 10, ?int $signal = null): ?int
     {
         $timeoutMicro = microtime(true) + $timeout;
         if ($this->isRunning()) {
@@ -1247,7 +1247,7 @@ private function getDescriptors(bool $hasCallback): array
      *
      * @param callable|null $callback The user defined PHP callback
      */
-    protected function buildCallback(callable $callback = null): \Closure
+    protected function buildCallback(?callable $callback = null): \Closure
     {
         if ($this->outputDisabled) {
             return fn ($type, $data): bool => null !== $callback && $callback($type, $data);
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -1566,7 +1566,7 @@ public function testNotTerminableInputPipe()
         $this->assertFalse($process->isRunning());
     }
 
-    private function getProcess(string|array $commandline, string $cwd = null, array $env = null, mixed $input = null, ?int $timeout = 60): Process
+    private function getProcess(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
         return self::$process = $process;
     }
 
-    private function getProcessForCode(string $code, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process
+    private function getProcessForCode(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);
     }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function addSuffix(string $suffix): void`
`44`	`44`	`* @param string\|null $default The default to return if no executable is found`
`45`	`45`	`* @param array $extraDirs Additional dirs to check into`
`46`	`46`	`*/`
`47`		`- public function find(string $name, string $default = null, array $extraDirs = []): ?string`
	`47`	`+ public function find(string $name, ?string $default = null, array $extraDirs = []): ?string`
`48`	`48`	`{`
`49`	`49`	`$dirs = array_merge(`
`50`	`50`	`explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class InputStream implements \IteratorAggregate`
`29`	`29`	`/**`
`30`	`30`	`* Sets a callback that is called when the write buffer becomes empty.`
`31`	`31`	`*/`
`32`		`- public function onEmpty(callable $onEmpty = null): void`
	`32`	`+ public function onEmpty(?callable $onEmpty = null): void`
`33`	`33`	`{`
`34`	`34`	`$this->onEmpty = null !== $onEmpty ? $onEmpty(...) : null;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class PhpProcess extends Process`
`32`	`32`	`* @param int $timeout The timeout in seconds`
`33`	`33`	`* @param array\|null $php Path to the PHP binary to use with any additional arguments`
`34`	`34`	`*/`
`35`		`- public function __construct(string $script, string $cwd = null, array $env = null, int $timeout = 60, array $php = null)`
	`35`	`+ public function __construct(string $script, ?string $cwd = null, ?array $env = null, int $timeout = 60, ?array $php = null)`
`36`	`36`	`{`
`37`	`37`	`if (null === $php) {`
`38`	`38`	`$executableFinder = new PhpExecutableFinder();`
`@@ -50,12 +50,12 @@ public function __construct(string $script, string $cwd = null, array $env = nul`
`50`	`50`	`parent::__construct($php, $cwd, $env, $script, $timeout);`
`51`	`51`	`}`
`52`	`52`
`53`		`- public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static`
	`53`	`+ public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static`
`54`	`54`	`{`
`55`	`55`	`throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function start(callable $callback = null, array $env = []): void`
	`58`	`+ public function start(?callable $callback = null, array $env = []): void`
`59`	`59`	`{`
`60`	`60`	`if (null === $this->getCommandLine()) {`
`61`	`61`	`throw new RuntimeException('Unable to find the PHP executable.');`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class PhpSubprocess extends Process`
`51`	`51`	`* @param int $timeout The timeout in seconds`
`52`	`52`	`* @param array\|null $php Path to the PHP binary to use with any additional arguments`
`53`	`53`	`*/`
`54`		`- public function __construct(array $command, string $cwd = null, array $env = null, int $timeout = 60, array $php = null)`
	`54`	`+ public function __construct(array $command, ?string $cwd = null, ?array $env = null, int $timeout = 60, ?array $php = null)`
`55`	`55`	`{`
`56`	`56`	`if (null === $php) {`
`57`	`57`	`$executableFinder = new PhpExecutableFinder();`
`@@ -73,12 +73,12 @@ public function __construct(array $command, string $cwd = null, array $env = nul`
`73`	`73`	`parent::__construct($command, $cwd, $env, null, $timeout);`
`74`	`74`	`}`
`75`	`75`
`76`		`- public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static`
	`76`	`+ public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static`
`77`	`77`	`{`
`78`	`78`	`throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function start(callable $callback = null, array $env = []): void`
	`81`	`+ public function start(?callable $callback = null, array $env = []): void`
`82`	`82`	`{`
`83`	`83`	`if (null === $this->getCommandLine()) {`
`84`	`84`	`throw new RuntimeException('Unable to find the PHP executable.');`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class Process implements \IteratorAggregate`
`140`	`140`	`*`
`141`	`141`	`* @throws LogicException When proc_open is not installed`
`142`	`142`	`*/`
`143`		`- public function __construct(array $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60)`
	`143`	`+ public function __construct(array $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60)`
`144`	`144`	`{`
`145`	`145`	`if (!\function_exists('proc_open')) {`
`146`	`146`	`throw new LogicException('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`
`186`	`186`	`*`
`187`	`187`	`* @throws LogicException When proc_open is not installed`
`188`	`188`	`*/`
`189`		`- public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static`
	`189`	`+ public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static`
`190`	`190`	`{`
`191`	`191`	`$process = new static([], $cwd, $env, $input, $timeout);`
`192`	`192`	`$process->commandline = $command;`
`@@ -241,7 +241,7 @@ public function __clone()`
`241`	`241`	`*`
`242`	`242`	`* @final`
`243`	`243`	`*/`
`244`		`- public function run(callable $callback = null, array $env = []): int`
	`244`	`+ public function run(?callable $callback = null, array $env = []): int`
`245`	`245`	`{`
`246`	`246`	`$this->start($callback, $env);`
`247`	`247`
`@@ -260,7 +260,7 @@ public function run(callable $callback = null, array $env = []): int`
`260`	`260`	`*`
`261`	`261`	`* @final`
`262`	`262`	`*/`
`263`		`- public function mustRun(callable $callback = null, array $env = []): static`
	`263`	`+ public function mustRun(?callable $callback = null, array $env = []): static`
`264`	`264`	`{`
`265`	`265`	`if (0 !== $this->run($callback, $env)) {`
`266`	`266`	`throw new ProcessFailedException($this);`
`@@ -288,7 +288,7 @@ public function mustRun(callable $callback = null, array $env = []): static`
`288`	`288`	`* @throws RuntimeException When process is already running`
`289`	`289`	`* @throws LogicException In case a callback is provided and output has been disabled`
`290`	`290`	`*/`
`291`		`- public function start(callable $callback = null, array $env = []): void`
	`291`	`+ public function start(?callable $callback = null, array $env = []): void`
`292`	`292`	`{`
`293`	`293`	`if ($this->isRunning()) {`
`294`	`294`	`throw new RuntimeException('Process is already running.');`
`@@ -373,7 +373,7 @@ public function start(callable $callback = null, array $env = []): void`
`373`	`373`	`*`
`374`	`374`	`* @final`
`375`	`375`	`*/`
`376`		`- public function restart(callable $callback = null, array $env = []): static`
	`376`	`+ public function restart(?callable $callback = null, array $env = []): static`
`377`	`377`	`{`
`378`	`378`	`if ($this->isRunning()) {`
`379`	`379`	`throw new RuntimeException('Process is already running.');`
`@@ -400,7 +400,7 @@ public function restart(callable $callback = null, array $env = []): static`
`400`	`400`	`* @throws ProcessSignaledException When process stopped after receiving signal`
`401`	`401`	`* @throws LogicException When process is not yet started`
`402`	`402`	`*/`
`403`		`- public function wait(callable $callback = null): int`
	`403`	`+ public function wait(?callable $callback = null): int`
`404`	`404`	`{`
`405`	`405`	`$this->requireProcessIsStarted(__FUNCTION__);`
`406`	`406`
`@@ -873,7 +873,7 @@ public function getStatus(): string`
`873`	`873`	`*`
`874`	`874`	`* @return int\|null The exit-code of the process or null if it's not running`
`875`	`875`	`*/`
`876`		`- public function stop(float $timeout = 10, int $signal = null): ?int`
	`876`	`+ public function stop(float $timeout = 10, ?int $signal = null): ?int`
`877`	`877`	`{`
`878`	`878`	`$timeoutMicro = microtime(true) + $timeout;`
`879`	`879`	`if ($this->isRunning()) {`
`@@ -1247,7 +1247,7 @@ private function getDescriptors(bool $hasCallback): array`
`1247`	`1247`	`*`
`1248`	`1248`	`* @param callable\|null $callback The user defined PHP callback`
`1249`	`1249`	`*/`
`1250`		`- protected function buildCallback(callable $callback = null): \Closure`
	`1250`	`+ protected function buildCallback(?callable $callback = null): \Closure`
`1251`	`1251`	`{`
`1252`	`1252`	`if ($this->outputDisabled) {`
`1253`	`1253`	`return fn ($type, $data): bool => null !== $callback && $callback($type, $data);`
Original file line number	Diff line number	Diff line change
`@@ -1566,7 +1566,7 @@ public function testNotTerminableInputPipe()`
`1566`	`1566`	`$this->assertFalse($process->isRunning());`
`1567`	`1567`	`}`
`1568`	`1568`
`1569`		`- private function getProcess(string\|array $commandline, string $cwd = null, array $env = null, mixed $input = null, ?int $timeout = 60): Process`
	`1569`	`+ private function getProcess(string\|array $commandline, ?string $cwd = null, ?array $env = null, mixed $input = null, ?int $timeout = 60): Process`
`1570`	`1570`	`{`
`1571`	`1571`	`if (\is_string($commandline)) {`
`1572`	`1572`	`$process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout);`
`@@ -1579,7 +1579,7 @@ private function getProcess(string\|array $commandline, string $cwd = null, array`
`1579`	`1579`	`return self::$process = $process;`
`1580`	`1580`	`}`
`1581`	`1581`
`1582`		`- private function getProcessForCode(string $code, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process`
	`1582`	`+ private function getProcessForCode(string $code, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process`
`1583`	`1583`	`{`
`1584`	`1584`	`return $this->getProcess([self::$phpBin, '-r', $code], $cwd, $env, $input, $timeout);`
`1585`	`1585`	`}`