Merge branch '5.4' into 6.0

derrabus · derrabus · commit c6f326c11214 · 2021-12-05T21:36:47.000+01:00
* 5.4:
  Fix TranslationTrait for multiple domains
  Fix parameter types for ProcessHelper::mustRun()
  Fix: Wording
  [SecurityBundle] Fix ambiguous deprecation message on missing provider
  Remove dead code in tests
  Remove return void PHPDoc in test
  Fix merge
diff --git a/Helper/ProcessHelper.php b/Helper/ProcessHelper.php
@@ -86,15 +86,15 @@ public function run(OutputInterface $output, array|Process $cmd, string $error =
      * 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
      *
      * @throws ProcessFailedException
      *
      * @see run()
      */
-    public function mustRun(OutputInterface $output, string|Process $cmd, string $error = null, callable $callback = null): Process
+    public function mustRun(OutputInterface $output, array|Process $cmd, string $error = null, callable $callback = null): Process
     {
         $process = $this->run($output, $cmd, $error, $callback);
 

Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ public function run(OutputInterface $output, array\|Process $cmd, string $error =`
`86`	`86`	`* This is identical to run() except that an exception is thrown if the process`
`87`	`87`	`* exits with a non-zero exit code.`
`88`	`88`	`*`
`89`		`- * @param string\|Process $cmd An instance of Process or a command to run`
`90`		`- * @param callable\|null $callback A PHP callback to run whenever there is some`
`91`		`- * output available on STDOUT or STDERR`
	`89`	`+ * @param array\|Process $cmd An instance of Process or a command to run`
	`90`	`+ * @param callable\|null $callback A PHP callback to run whenever there is some`
	`91`	`+ * output available on STDOUT or STDERR`
`92`	`92`	`*`
`93`	`93`	`* @throws ProcessFailedException`
`94`	`94`	`*`
`95`	`95`	`* @see run()`
`96`	`96`	`*/`
`97`		`- public function mustRun(OutputInterface $output, string\|Process $cmd, string $error = null, callable $callback = null): Process`
	`97`	`+ public function mustRun(OutputInterface $output, array\|Process $cmd, string $error = null, callable $callback = null): Process`
`98`	`98`	`{`
`99`	`99`	`$process = $this->run($output, $cmd, $error, $callback);`
`100`	`100`