Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 99856a9b0897 · 2018-11-08T23:17:22.000+01:00
* 4.1:
  fix merge
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -102,7 +102,7 @@ public function overload(string $path, string ...$extraPaths): void
     public function populate(array $values, bool $overrideExistingVars = false): 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
`@@ -102,7 +102,7 @@ public function overload(string $path, string ...$extraPaths): void`
`102`	`102`	`public function populate(array $values, bool $overrideExistingVars = false): void`
`103`	`103`	`{`
`104`	`104`	`$updateLoadedVars = false;`
`105`		`- $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? '')));`
	`105`	`+ $loadedVars = array_flip(explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? ''));`
`106`	`106`
`107`	`107`	`foreach ($values as $name => $value) {`
`108`	`108`	`$notHttpName = 0 !== strpos($name, 'HTTP_');`