Merge branch '4.2' into 4.3

fabpot · fabpot · commit 57dc7d5ce0fa · 2019-06-13T13:01:17.000+02:00
* 4.2:
  fixed CS
  fixed CS
  [HttpKernel] Remove TestEventDispatcher.
diff --git a/Dotenv.php b/Dotenv.php
@@ -401,7 +401,7 @@ private function resolveCommands($value)
                 throw new \LogicException('Resolving commands requires the Symfony Process component.');
             }
 
-            $process = \method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
+            $process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);
             $process->inheritEnvironmentVariables(true);
             $process->setEnv($this->values);
             try {

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ private function resolveCommands($value)`
`401`	`401`	`throw new \LogicException('Resolving commands requires the Symfony Process component.');`
`402`	`402`	`}`
`403`	`403`
`404`		`- $process = \method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);`
	`404`	`+ $process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline('echo '.$matches[0]) : new Process('echo '.$matches[0]);`
`405`	`405`	`$process->inheritEnvironmentVariables(true);`
`406`	`406`	`$process->setEnv($this->values);`
`407`	`407`	`try {`