Ensure all properties have a type

Author: nicolas-grekas

Pipes/AbstractPipes.php

@@ -23,19 +23,18 @@ abstract class AbstractPipes implements PipesInterface
     public array $pipes = [];
 
     private string $inputBuffer = '';
+    /** @var resource|string|\Iterator */
     private $input;
     private bool $blocked = true;
     private ?string $lastError = null;
 
     /**
-     * @param resource|string|int|float|bool|\Iterator|null $input
+     * @param resource|string|\Iterator $input
      */
-    public function __construct(mixed $input)
+    public function __construct($input)
     {
         if (\is_resource($input) || $input instanceof \Iterator) {
             $this->input = $input;
-        } elseif (\is_string($input)) {
-            $this->inputBuffer = $input;
         } else {
             $this->inputBuffer = (string) $input;
         }

Process.php

@@ -54,6 +54,7 @@ class Process implements \IteratorAggregate
     private array|string $commandline;
     private ?string $cwd;
     private array $env = [];
+    /** @var resource|string|\Iterator|null */
     private $input;
     private ?float $starttime = null;
     private ?float $lastOutputTime = null;
@@ -63,8 +64,11 @@ class Process implements \IteratorAggregate
     private array $fallbackStatus = [];
     private array $processInformation;
     private bool $outputDisabled = false;
+    /** @var resource */
     private $stdout;
+    /** @var resource */
     private $stderr;
+    /** @var resource|null */
     private $process;
     private string $status = self::STATUS_READY;
     private int $incrementalOutputOffset = 0;
@@ -345,11 +349,12 @@ public function start(callable $callback = null, array $env = [])
             throw new RuntimeException(sprintf('The provided cwd "%s" does not exist.', $this->cwd));
         }
 
-        $this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
+        $process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
 
-        if (!\is_resource($this->process)) {
+        if (!\is_resource($process)) {
             throw new RuntimeException('Unable to launch a new process.');
         }
+        $this->process = $process;
         $this->status = self::STATUS_STARTED;
 
         if (isset($descriptors[3])) {
@@ -1118,7 +1123,7 @@ public function getInput()
      *
      * This content will be passed to the underlying process standard input.
      *
-     * @param string|int|float|bool|resource|\Traversable|null $input The content
+     * @param string|resource|\Traversable|self|null $input The content
      *
      * @return $this
      *

ProcessUtils.php

@@ -43,9 +43,6 @@ public static function validateInput(string $caller, mixed $input): mixed
             if (\is_resource($input)) {
                 return $input;
             }
-            if (\is_string($input)) {
-                return $input;
-            }
             if (\is_scalar($input)) {
                 return (string) $input;
             }