Skip to content

Commit 98cb8ee

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [PHPDoc] Fix some union type cases
2 parents 313a38f + f5481b2 commit 98cb8ee

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Process.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class Process implements \IteratorAggregate
133133
* @param array $command The command to run and its arguments listed as separate entries
134134
* @param string|null $cwd The working directory or null to use the working dir of the current PHP process
135135
* @param array|null $env The environment variables or null to use the same environment as the current PHP process
136-
* @param mixed|null $input The input as stream resource, scalar or \Traversable, or null for no input
136+
* @param mixed $input The input as stream resource, scalar or \Traversable, or null for no input
137137
* @param int|float|null $timeout The timeout in seconds or null to disable
138138
*
139139
* @throws LogicException When proc_open is not installed
@@ -180,7 +180,7 @@ public function __construct(array $command, string $cwd = null, array $env = nul
180180
* @param string $command The command line to pass to the shell of the OS
181181
* @param string|null $cwd The working directory or null to use the working dir of the current PHP process
182182
* @param array|null $env The environment variables or null to use the same environment as the current PHP process
183-
* @param mixed|null $input The input as stream resource, scalar or \Traversable, or null for no input
183+
* @param mixed $input The input as stream resource, scalar or \Traversable, or null for no input
184184
* @param int|float|null $timeout The timeout in seconds or null to disable
185185
*
186186
* @return static

0 commit comments

Comments
 (0)