Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 6a2cecd7011a · 2020-05-30T22:06:45.000+02:00
* 3.4:
  Various cleanups
diff --git a/EnvVarProcessor.php b/EnvVarProcessor.php
@@ -227,7 +227,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
             $env = json_decode($env, true);
 
             if (JSON_ERROR_NONE !== json_last_error()) {
-                throw new RuntimeException(sprintf('Invalid JSON in env var "%s": '.json_last_error_msg(), $name));
+                throw new RuntimeException(sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());
             }
 
             if (null !== $env && !\is_array($env)) {

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`227`	`227`	`$env = json_decode($env, true);`
`228`	`228`
`229`	`229`	`if (JSON_ERROR_NONE !== json_last_error()) {`
`230`		`- throw new RuntimeException(sprintf('Invalid JSON in env var "%s": '.json_last_error_msg(), $name));`
	`230`	`+ throw new RuntimeException(sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`if (null !== $env && !\is_array($env)) {`