Skip to content

Commit 9d512fe

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix TranslationTrait for multiple domains Fix parameter types for ProcessHelper::mustRun() Fix: Wording Remove return void PHPDoc in test
2 parents ec3661f + 840cc01 commit 9d512fe

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Helper/ProcessHelper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl
9292
* This is identical to run() except that an exception is thrown if the process
9393
* exits with a non-zero exit code.
9494
*
95-
* @param string|Process $cmd An instance of Process or a command to run
96-
* @param callable|null $callback A PHP callback to run whenever there is some
97-
* output available on STDOUT or STDERR
95+
* @param array|Process $cmd An instance of Process or a command to run
96+
* @param callable|null $callback A PHP callback to run whenever there is some
97+
* output available on STDOUT or STDERR
9898
*
9999
* @return Process
100100
*

0 commit comments

Comments
 (0)