Merge branch '4.4' into 5.3

derrabus · derrabus · commit 840cc01fe15a · 2021-12-05T21:32:41.000+01:00
* 4.4:
  Fix parameter types for ProcessHelper::mustRun()
  Remove return void PHPDoc in test
diff --git a/Helper/ProcessHelper.php b/Helper/ProcessHelper.php
@@ -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 The process that ran
      *

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ public function run(OutputInterface $output, $cmd, string $error = null, callabl`
`92`	`92`	`* This is identical to run() except that an exception is thrown if the process`
`93`	`93`	`* exits with a non-zero exit code.`
`94`	`94`	`*`
`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`
`98`	`98`	`*`
`99`	`99`	`* @return Process The process that ran`
`100`	`100`	`*`