Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value

nicolas-grekas · nicolas-grekas · commit cbc28e34015a · 2024-01-23T14:51:25.000+01:00
diff --git a/ExecutableFinder.php b/ExecutableFinder.php
@@ -46,7 +46,7 @@ public function addSuffix(string $suffix)
      *
      * @return string|null
      */
-    public function find(string $name, string $default = null, array $extraDirs = [])
+    public function find(string $name, ?string $default = null, array $extraDirs = [])
     {
         if (\ini_get('open_basedir')) {
             $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
diff --git a/InputStream.php b/InputStream.php
@@ -30,7 +30,7 @@ class InputStream implements \IteratorAggregate
     /**
      * Sets a callback that is called when the write buffer becomes empty.
      */
-    public function onEmpty(callable $onEmpty = null)
+    public function onEmpty(?callable $onEmpty = null)
     {
         $this->onEmpty = $onEmpty;
     }
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();
@@ -53,15 +53,15 @@ public function __construct(string $script, string $cwd = null, array $env = nul
     /**
      * {@inheritdoc}
      */
-    public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
     {
         throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
     }
 
     /**
      * {@inheritdoc}
      */
-    public function start(callable $callback = null, array $env = [])
+    public function start(?callable $callback = null, array $env = [])
     {
         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, $input = null, ?float $timeout = 60)
+    public function __construct(array $command, ?string $cwd = null, ?array $env = null, $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.');
@@ -189,7 +189,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, $input = null, ?float $timeout = 60)
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
     {
         $process = new static([], $cwd, $env, $input, $timeout);
         $process->commandline = $command;
@@ -247,7 +247,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);
 
@@ -266,7 +266,7 @@ public function run(callable $callback = null, array $env = []): int
      *
      * @final
      */
-    public function mustRun(callable $callback = null, array $env = []): self
+    public function mustRun(?callable $callback = null, array $env = []): self
     {
         if (0 !== $this->run($callback, $env)) {
             throw new ProcessFailedException($this);
@@ -294,7 +294,7 @@ public function mustRun(callable $callback = null, array $env = []): self
      * @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 = [])
+    public function start(?callable $callback = null, array $env = [])
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running.');
@@ -385,7 +385,7 @@ public function start(callable $callback = null, array $env = [])
      *
      * @final
      */
-    public function restart(callable $callback = null, array $env = []): self
+    public function restart(?callable $callback = null, array $env = []): self
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running.');
@@ -412,7 +412,7 @@ public function restart(callable $callback = null, array $env = []): self
      * @throws ProcessSignaledException When process stopped after receiving signal
      * @throws LogicException           When process is not yet started
      */
-    public function wait(callable $callback = null)
+    public function wait(?callable $callback = null)
     {
         $this->requireProcessIsStarted(__FUNCTION__);
 
@@ -914,7 +914,7 @@ public function getStatus()
      *
      * @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)
+    public function stop(float $timeout = 10, ?int $signal = null)
     {
         $timeoutMicro = microtime(true) + $timeout;
         if ($this->isRunning()) {
@@ -1310,7 +1310,7 @@ private function getDescriptors(): array
      *
      * @return \Closure
      */
-    protected function buildCallback(callable $callback = null)
+    protected function buildCallback(?callable $callback = null)
     {
         if ($this->outputDisabled) {
             return function ($type, $data) use ($callback): bool {
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -1558,7 +1558,7 @@ public function testNotTerminableInputPipe()
      * @param string|array $commandline
      * @param mixed        $input
      */
-    private function getProcess($commandline, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process
+    private function getProcess($commandline, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process
     {
         if (\is_string($commandline)) {
             $process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout);
@@ -1573,7 +1573,7 @@ private function getProcess($commandline, string $cwd = null, array $env = null,
         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
`@@ -46,7 +46,7 @@ public function addSuffix(string $suffix)`
`46`	`46`	`*`
`47`	`47`	`* @return string\|null`
`48`	`48`	`*/`
`49`		`- public function find(string $name, string $default = null, array $extraDirs = [])`
	`49`	`+ public function find(string $name, ?string $default = null, array $extraDirs = [])`
`50`	`50`	`{`
`51`	`51`	`if (\ini_get('open_basedir')) {`
`52`	`52`	`$searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class InputStream implements \IteratorAggregate`
`30`	`30`	`/**`
`31`	`31`	`* Sets a callback that is called when the write buffer becomes empty.`
`32`	`32`	`*/`
`33`		`- public function onEmpty(callable $onEmpty = null)`
	`33`	`+ public function onEmpty(?callable $onEmpty = null)`
`34`	`34`	`{`
`35`	`35`	`$this->onEmpty = $onEmpty;`
`36`	`36`	`}`
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, $input = null, ?float $timeout = 60)`
	`143`	`+ public function __construct(array $command, ?string $cwd = null, ?array $env = null, $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.');`
`@@ -189,7 +189,7 @@ public function __construct(array $command, string $cwd = null, array $env = nul`
`189`	`189`	`*`
`190`	`190`	`* @throws LogicException When proc_open is not installed`
`191`	`191`	`*/`
`192`		`- public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)`
	`192`	`+ public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)`
`193`	`193`	`{`
`194`	`194`	`$process = new static([], $cwd, $env, $input, $timeout);`
`195`	`195`	`$process->commandline = $command;`
`@@ -247,7 +247,7 @@ public function __clone()`
`247`	`247`	`*`
`248`	`248`	`* @final`
`249`	`249`	`*/`
`250`		`- public function run(callable $callback = null, array $env = []): int`
	`250`	`+ public function run(?callable $callback = null, array $env = []): int`
`251`	`251`	`{`
`252`	`252`	`$this->start($callback, $env);`
`253`	`253`
`@@ -266,7 +266,7 @@ public function run(callable $callback = null, array $env = []): int`
`266`	`266`	`*`
`267`	`267`	`* @final`
`268`	`268`	`*/`
`269`		`- public function mustRun(callable $callback = null, array $env = []): self`
	`269`	`+ public function mustRun(?callable $callback = null, array $env = []): self`
`270`	`270`	`{`
`271`	`271`	`if (0 !== $this->run($callback, $env)) {`
`272`	`272`	`throw new ProcessFailedException($this);`
`@@ -294,7 +294,7 @@ public function mustRun(callable $callback = null, array $env = []): self`
`294`	`294`	`* @throws RuntimeException When process is already running`
`295`	`295`	`* @throws LogicException In case a callback is provided and output has been disabled`
`296`	`296`	`*/`
`297`		`- public function start(callable $callback = null, array $env = [])`
	`297`	`+ public function start(?callable $callback = null, array $env = [])`
`298`	`298`	`{`
`299`	`299`	`if ($this->isRunning()) {`
`300`	`300`	`throw new RuntimeException('Process is already running.');`
`@@ -385,7 +385,7 @@ public function start(callable $callback = null, array $env = [])`
`385`	`385`	`*`
`386`	`386`	`* @final`
`387`	`387`	`*/`
`388`		`- public function restart(callable $callback = null, array $env = []): self`
	`388`	`+ public function restart(?callable $callback = null, array $env = []): self`
`389`	`389`	`{`
`390`	`390`	`if ($this->isRunning()) {`
`391`	`391`	`throw new RuntimeException('Process is already running.');`
`@@ -412,7 +412,7 @@ public function restart(callable $callback = null, array $env = []): self`
`412`	`412`	`* @throws ProcessSignaledException When process stopped after receiving signal`
`413`	`413`	`* @throws LogicException When process is not yet started`
`414`	`414`	`*/`
`415`		`- public function wait(callable $callback = null)`
	`415`	`+ public function wait(?callable $callback = null)`
`416`	`416`	`{`
`417`	`417`	`$this->requireProcessIsStarted(__FUNCTION__);`
`418`	`418`
`@@ -914,7 +914,7 @@ public function getStatus()`
`914`	`914`	`*`
`915`	`915`	`* @return int\|null The exit-code of the process or null if it's not running`
`916`	`916`	`*/`
`917`		`- public function stop(float $timeout = 10, int $signal = null)`
	`917`	`+ public function stop(float $timeout = 10, ?int $signal = null)`
`918`	`918`	`{`
`919`	`919`	`$timeoutMicro = microtime(true) + $timeout;`
`920`	`920`	`if ($this->isRunning()) {`
`@@ -1310,7 +1310,7 @@ private function getDescriptors(): array`
`1310`	`1310`	`*`
`1311`	`1311`	`* @return \Closure`
`1312`	`1312`	`*/`
`1313`		`- protected function buildCallback(callable $callback = null)`
	`1313`	`+ protected function buildCallback(?callable $callback = null)`
`1314`	`1314`	`{`
`1315`	`1315`	`if ($this->outputDisabled) {`
`1316`	`1316`	`return function ($type, $data) use ($callback): bool {`
Original file line number	Diff line number	Diff line change
`@@ -1558,7 +1558,7 @@ public function testNotTerminableInputPipe()`
`1558`	`1558`	`* @param string\|array $commandline`
`1559`	`1559`	`* @param mixed $input`
`1560`	`1560`	`*/`
`1561`		`- private function getProcess($commandline, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process`
	`1561`	`+ private function getProcess($commandline, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process`
`1562`	`1562`	`{`
`1563`	`1563`	`if (\is_string($commandline)) {`
`1564`	`1564`	`$process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout);`
`@@ -1573,7 +1573,7 @@ private function getProcess($commandline, string $cwd = null, array $env = null,`
`1573`	`1573`	`return self::$process = $process;`
`1574`	`1574`	`}`
`1575`	`1575`
`1576`		`- private function getProcessForCode(string $code, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process`
	`1576`	`+ private function getProcessForCode(string $code, ?string $cwd = null, ?array $env = null, $input = null, ?int $timeout = 60): Process`
`1577`	`1577`	`{`
`1578`	`1578`	`return $this->getProcess([self::$phpBin, '-r', $code], $cwd, $env, $input, $timeout);`
`1579`	`1579`	`}`