Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit bf2a95a35479 · 2024-01-23T16:06:13.000+01:00
* 7.0:
  List CS fix in .git-blame-ignore-revs
  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
@@ -141,7 +141,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.');
@@ -187,7 +187,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;
@@ -242,7 +242,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);
 
@@ -261,7 +261,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);
@@ -289,7 +289,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.');
@@ -384,7 +384,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.');
@@ -411,7 +411,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__);
 
@@ -884,7 +884,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()) {
@@ -1258,7 +1258,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
@@ -1609,7 +1609,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);
@@ -1622,7 +1622,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
`@@ -141,7 +141,7 @@ class Process implements \IteratorAggregate`
`141`	`141`	`*`
`142`	`142`	`* @throws LogicException When proc_open is not installed`
`143`	`143`	`*/`
`144`		`- public function __construct(array $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60)`
	`144`	`+ public function __construct(array $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60)`
`145`	`145`	`{`
`146`	`146`	`if (!\function_exists('proc_open')) {`
`147`	`147`	`throw new LogicException('The Process class relies on proc_open, which is not available on your PHP installation.');`
`@@ -187,7 +187,7 @@ public function __construct(array $command, string $cwd = null, array $env = nul`
`187`	`187`	`*`
`188`	`188`	`* @throws LogicException When proc_open is not installed`
`189`	`189`	`*/`
`190`		`- public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, mixed $input = null, ?float $timeout = 60): static`
	`190`	`+ public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, mixed $input = null, ?float $timeout = 60): static`
`191`	`191`	`{`
`192`	`192`	`$process = new static([], $cwd, $env, $input, $timeout);`
`193`	`193`	`$process->commandline = $command;`
`@@ -242,7 +242,7 @@ public function __clone()`
`242`	`242`	`*`
`243`	`243`	`* @final`
`244`	`244`	`*/`
`245`		`- public function run(callable $callback = null, array $env = []): int`
	`245`	`+ public function run(?callable $callback = null, array $env = []): int`
`246`	`246`	`{`
`247`	`247`	`$this->start($callback, $env);`
`248`	`248`
`@@ -261,7 +261,7 @@ public function run(callable $callback = null, array $env = []): int`
`261`	`261`	`*`
`262`	`262`	`* @final`
`263`	`263`	`*/`
`264`		`- public function mustRun(callable $callback = null, array $env = []): static`
	`264`	`+ public function mustRun(?callable $callback = null, array $env = []): static`
`265`	`265`	`{`
`266`	`266`	`if (0 !== $this->run($callback, $env)) {`
`267`	`267`	`throw new ProcessFailedException($this);`
`@@ -289,7 +289,7 @@ public function mustRun(callable $callback = null, array $env = []): static`
`289`	`289`	`* @throws RuntimeException When process is already running`
`290`	`290`	`* @throws LogicException In case a callback is provided and output has been disabled`
`291`	`291`	`*/`
`292`		`- public function start(callable $callback = null, array $env = []): void`
	`292`	`+ public function start(?callable $callback = null, array $env = []): void`
`293`	`293`	`{`
`294`	`294`	`if ($this->isRunning()) {`
`295`	`295`	`throw new RuntimeException('Process is already running.');`
`@@ -384,7 +384,7 @@ public function start(callable $callback = null, array $env = []): void`
`384`	`384`	`*`
`385`	`385`	`* @final`
`386`	`386`	`*/`
`387`		`- public function restart(callable $callback = null, array $env = []): static`
	`387`	`+ public function restart(?callable $callback = null, array $env = []): static`
`388`	`388`	`{`
`389`	`389`	`if ($this->isRunning()) {`
`390`	`390`	`throw new RuntimeException('Process is already running.');`
`@@ -411,7 +411,7 @@ public function restart(callable $callback = null, array $env = []): static`
`411`	`411`	`* @throws ProcessSignaledException When process stopped after receiving signal`
`412`	`412`	`* @throws LogicException When process is not yet started`
`413`	`413`	`*/`
`414`		`- public function wait(callable $callback = null): int`
	`414`	`+ public function wait(?callable $callback = null): int`
`415`	`415`	`{`
`416`	`416`	`$this->requireProcessIsStarted(__FUNCTION__);`
`417`	`417`
`@@ -884,7 +884,7 @@ public function getStatus(): string`
`884`	`884`	`*`
`885`	`885`	`* @return int\|null The exit-code of the process or null if it's not running`
`886`	`886`	`*/`
`887`		`- public function stop(float $timeout = 10, int $signal = null): ?int`
	`887`	`+ public function stop(float $timeout = 10, ?int $signal = null): ?int`
`888`	`888`	`{`
`889`	`889`	`$timeoutMicro = microtime(true) + $timeout;`
`890`	`890`	`if ($this->isRunning()) {`
`@@ -1258,7 +1258,7 @@ private function getDescriptors(bool $hasCallback): array`
`1258`	`1258`	`*`
`1259`	`1259`	`* @param callable\|null $callback The user defined PHP callback`
`1260`	`1260`	`*/`
`1261`		`- protected function buildCallback(callable $callback = null): \Closure`
	`1261`	`+ protected function buildCallback(?callable $callback = null): \Closure`
`1262`	`1262`	`{`
`1263`	`1263`	`if ($this->outputDisabled) {`
`1264`	`1264`	`return fn ($type, $data): bool => null !== $callback && $callback($type, $data);`
Original file line number	Diff line number	Diff line change
`@@ -1609,7 +1609,7 @@ public function testNotTerminableInputPipe()`
`1609`	`1609`	`$this->assertFalse($process->isRunning());`
`1610`	`1610`	`}`
`1611`	`1611`
`1612`		`- private function getProcess(string\|array $commandline, string $cwd = null, array $env = null, mixed $input = null, ?int $timeout = 60): Process`
	`1612`	`+ private function getProcess(string\|array $commandline, ?string $cwd = null, ?array $env = null, mixed $input = null, ?int $timeout = 60): Process`
`1613`	`1613`	`{`
`1614`	`1614`	`if (\is_string($commandline)) {`
`1615`	`1615`	`$process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout);`
`@@ -1622,7 +1622,7 @@ private function getProcess(string\|array $commandline, string $cwd = null, array`
`1622`	`1622`	`return self::$process = $process;`
`1623`	`1623`	`}`
`1624`	`1624`
`1625`		`- private function getProcessForCode(string $code, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process`
	`1625`	`+ private function getProcessForCode(string $code, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process`
`1626`	`1626`	`{`
`1627`	`1627`	`return $this->getProcess([self::$phpBin, '-r', $code], $cwd, $env, $input, $timeout);`
`1628`	`1628`	`}`