diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dotenv] dont use getenv() to read SYMFONY_DOTENV_VARS

Browse Source
This commit is contained in:
Nicolas Grekas 2018-11-08 09:45:28 +01:00
parent 6006448997
commit 21a909a189
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Dotenv/Dotenv.php
View File

@ -66,8 +66,8 @@ final class Dotenv
*/ */
public function populate($values) public function populate($values)
{ {
$loadedVars = array_flip(explode(',', getenv('SYMFONY_DOTENV_VARS'))); $updateLoadedVars = false;
unset($loadedVars['']); $loadedVars = array_flip(explode(',', isset($_SERVER['SYMFONY_DOTENV_VARS']) ? $_SERVER['SYMFONY_DOTENV_VARS'] : (isset($_ENV['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_');
@ -82,14 +82,15 @@ final class Dotenv
$_SERVER[$name] = $value; $_SERVER[$name] = $value;
} }
$loadedVars[$name] = true; if (!isset($loadedVars[$name])) {
$loadedVars[$name] = $updateLoadedVars = true;
}
} }
if ($loadedVars) { if ($updateLoadedVars) {
unset($loadedVars['']);
$loadedVars = implode(',', array_keys($loadedVars)); $loadedVars = implode(',', array_keys($loadedVars));
putenv("SYMFONY_DOTENV_VARS=$loadedVars"); putenv('SYMFONY_DOTENV_VARS='.$_ENV['SYMFONY_DOTENV_VARS'] = $_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars);
$_ENV['SYMFONY_DOTENV_VARS'] = $loadedVars;
$_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars;
} }
} }

2
src/Symfony/Component/Dotenv/Tests/DotenvTest.php
View File

@ -268,7 +268,7 @@ class DotenvTest extends TestCase
public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar() public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar()
{ {
putenv('SYMFONY_DOTENV_VARS=FOO,BAR,BAZ'); putenv('SYMFONY_DOTENV_VARS='.$_SERVER['SYMFONY_DOTENV_VARS'] = 'FOO,BAR,BAZ');
putenv('FOO=foo'); putenv('FOO=foo');
putenv('BAR=bar'); putenv('BAR=bar');