Skip to content

Commit

Permalink
Merge branch '5.3' into 5.4
Browse files Browse the repository at this point in the history
* 5.3:
  Fix TranslationTrait for multiple domains
  Fix parameter types for ProcessHelper::mustRun()
  Fix: Wording
  Remove return void PHPDoc in test
  • Loading branch information
derrabus committed Dec 5, 2021
2 parents ec3661f + 840cc01 commit 9d512fe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Helper/ProcessHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl
* This is identical to run() except that an exception is thrown if the process
* exits with a non-zero exit code.
*
* @param string|Process $cmd An instance of Process or a command to run
* @param callable|null $callback A PHP callback to run whenever there is some
* output available on STDOUT or STDERR
* @param array|Process $cmd An instance of Process or a command to run
* @param callable|null $callback A PHP callback to run whenever there is some
* output available on STDOUT or STDERR
*
* @return Process
*
Expand Down

0 comments on commit 9d512fe

Please sign in to comment.