Merge branch '4.1'

* 4.1:
  fix merge
This commit is contained in:
Nicolas Grekas 2018-11-08 23:17:22 +01:00
commit 99856a9b08

View File

@ -102,7 +102,7 @@ final class Dotenv
public function populate(array $values, bool $overrideExistingVars = false): void public function populate(array $values, bool $overrideExistingVars = false): void
{ {
$updateLoadedVars = false; $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) { foreach ($values as $name => $value) {
$notHttpName = 0 !== strpos($name, 'HTTP_'); $notHttpName = 0 !== strpos($name, 'HTTP_');