fix merge

This commit is contained in:
Nicolas Grekas 2018-11-08 23:17:11 +01:00
parent f45252a155
commit 67f3a35870

View File

@ -68,7 +68,7 @@ final class Dotenv
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_');