fix merge

nicolas-grekas · nicolas-grekas · commit 67f3a35870af · 2018-11-08T23:17:11.000+01:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -68,7 +68,7 @@ public function load(string $path, string ...$paths): void
     public function populate(array $values): void
     {
         $updateLoadedVars = false;
-        $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? '')));
+        $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? ''));
 
         foreach ($values as $name => $value) {
             $notHttpName = 0 !== strpos($name, 'HTTP_');

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function load(string $path, string ...$paths): void`
`68`	`68`	`public function populate(array $values): void`
`69`	`69`	`{`
`70`	`70`	`$updateLoadedVars = false;`
`71`		`- $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? '')));`
	`71`	`+ $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? ''));`
`72`	`72`
`73`	`73`	`foreach ($values as $name => $value) {`
`74`	`74`	`$notHttpName = 0 !== strpos($name, 'HTTP_');`