Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit c714958428a8 · 2020-05-30T22:06:45.000+02:00
* 3.4:
  Various cleanups
diff --git a/Process.php b/Process.php
@@ -1648,7 +1648,7 @@ private function replacePlaceholders(string $commandline, array $env)
     {
         return preg_replace_callback('/"\$\{:([_a-zA-Z]++[_a-zA-Z0-9]*+)\}"/', function ($matches) use ($commandline, $env) {
             if (!isset($env[$matches[1]]) || false === $env[$matches[1]]) {
-                throw new InvalidArgumentException(sprintf('Command line is missing a value for parameter "%s": '.$commandline, $matches[1]));
+                throw new InvalidArgumentException(sprintf('Command line is missing a value for parameter "%s": ', $matches[1]).$commandline);
             }
 
             return $this->escapeArgument($env[$matches[1]]);

Original file line number	Diff line number	Diff line change
`@@ -1648,7 +1648,7 @@ private function replacePlaceholders(string $commandline, array $env)`
`1648`	`1648`	`{`
`1649`	`1649`	`return preg_replace_callback('/"\$\{:([_a-zA-Z]++[_a-zA-Z0-9]*+)\}"/', function ($matches) use ($commandline, $env) {`
`1650`	`1650`	`if (!isset($env[$matches[1]]) \|\| false === $env[$matches[1]]) {`
`1651`		`- throw new InvalidArgumentException(sprintf('Command line is missing a value for parameter "%s": '.$commandline, $matches[1]));`
	`1651`	`+ throw new InvalidArgumentException(sprintf('Command line is missing a value for parameter "%s": ', $matches[1]).$commandline);`
`1652`	`1652`	`}`
`1653`	`1653`
`1654`	`1654`	`return $this->escapeArgument($env[$matches[1]]);`