bug #29131 [Dotenv] dont use getenv() to read SYMFONY_DOTENV_VARS (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d74a4eb2fa7b · 2018-11-08T22:48:38.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Dotenv] dont use getenv() to read SYMFONY_DOTENV_VARS | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Since using it is not thread safe, let's not rely on it (already done in other places.) Commits ------- 21a909a [Dotenv] dont use getenv() to read SYMFONY_DOTENV_VARS
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -66,8 +66,8 @@ public function load($path/*, ...$paths*/)
      */
     public function populate($values)
     {
-        $loadedVars = array_flip(explode(',', getenv('SYMFONY_DOTENV_VARS')));
-        unset($loadedVars['']);
+        $updateLoadedVars = false;
+        $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) {
             $notHttpName = 0 !== strpos($name, 'HTTP_');
@@ -82,14 +82,15 @@ public function populate($values)
                 $_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));
-            putenv("SYMFONY_DOTENV_VARS=$loadedVars");
-            $_ENV['SYMFONY_DOTENV_VARS'] = $loadedVars;
-            $_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars;
+            putenv('SYMFONY_DOTENV_VARS='.$_ENV['SYMFONY_DOTENV_VARS'] = $_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars);
         }
     }
 
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -268,7 +268,7 @@ public function testMemorizingLoadedVarsNamesInSpecialVar()
 
     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('BAR=bar');

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public function load($path/, ...$paths/)`
`66`	`66`	`*/`
`67`	`67`	`public function populate($values)`
`68`	`68`	`{`
`69`		`- $loadedVars = array_flip(explode(',', getenv('SYMFONY_DOTENV_VARS')));`
`70`		`- unset($loadedVars['']);`
	`69`	`+ $updateLoadedVars = false;`
	`70`	`+ $loadedVars = array_flip(explode(',', isset($_SERVER['SYMFONY_DOTENV_VARS']) ? $_SERVER['SYMFONY_DOTENV_VARS'] : (isset($_ENV['SYMFONY_DOTENV_VARS']) ? $_ENV['SYMFONY_DOTENV_VARS'] : '')));`
`71`	`71`
`72`	`72`	`foreach ($values as $name => $value) {`
`73`	`73`	`$notHttpName = 0 !== strpos($name, 'HTTP_');`
`@@ -82,14 +82,15 @@ public function populate($values)`
`82`	`82`	`$_SERVER[$name] = $value;`
`83`	`83`	`}`
`84`	`84`
`85`		`- $loadedVars[$name] = true;`
	`85`	`+ if (!isset($loadedVars[$name])) {`
	`86`	`+ $loadedVars[$name] = $updateLoadedVars = true;`
	`87`	`+ }`
`86`	`88`	`}`
`87`	`89`
`88`		`- if ($loadedVars) {`
	`90`	`+ if ($updateLoadedVars) {`
	`91`	`+ unset($loadedVars['']);`
`89`	`92`	`$loadedVars = implode(',', array_keys($loadedVars));`
`90`		`- putenv("SYMFONY_DOTENV_VARS=$loadedVars");`
`91`		`- $_ENV['SYMFONY_DOTENV_VARS'] = $loadedVars;`
`92`		`- $_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars;`
	`93`	`+ putenv('SYMFONY_DOTENV_VARS='.$_ENV['SYMFONY_DOTENV_VARS'] = $_SERVER['SYMFONY_DOTENV_VARS'] = $loadedVars);`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public function testMemorizingLoadedVarsNamesInSpecialVar()`
`268`	`268`
`269`	`269`	`public function testOverridingEnvVarsWithNamesMemorizedInSpecialVar()`
`270`	`270`	`{`
`271`		`- putenv('SYMFONY_DOTENV_VARS=FOO,BAR,BAZ');`
	`271`	`+ putenv('SYMFONY_DOTENV_VARS='.$_SERVER['SYMFONY_DOTENV_VARS'] = 'FOO,BAR,BAZ');`
`272`	`272`
`273`	`273`	`putenv('FOO=foo');`
`274`	`274`	`putenv('BAR=bar');`