Skip to content

Commit fa60a09

Browse files
Merge branch '6.2' into 6.3
* 6.2: CS fix Fix test provider
2 parents 8d7df63 + 51d8f2a commit fa60a09

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Process.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,8 @@ public function getIncrementalOutput(): string
604604
*
605605
* @param int $flags A bit field of Process::ITER_* flags
606606
*
607+
* @return \Generator<string, string>
608+
*
607609
* @throws LogicException in case the output has been disabled
608610
* @throws LogicException In case the process is not started
609611
*/

Tests/ProcessTest.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,11 +1536,7 @@ public function testEnvCaseInsensitiveOnWindows()
15361536
}
15371537
}
15381538

1539-
/**
1540-
* @param string|array $commandline
1541-
* @param mixed $input
1542-
*/
1543-
private function getProcess($commandline, string $cwd = null, array $env = null, $input = null, ?int $timeout = 60): Process
1539+
private function getProcess(string|array $commandline, string $cwd = null, array $env = null, mixed $input = null, ?int $timeout = 60): Process
15441540
{
15451541
if (\is_string($commandline)) {
15461542
$process = Process::fromShellCommandline($commandline, $cwd, $env, $input, $timeout);

0 commit comments

Comments
 (0)