[HttpKernel] fix $dotenvVars in data collector

mynameisbogdan · mynameisbogdan · commit ca3fb258bf96 · 2019-10-08T04:19:00.000+03:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -80,9 +80,9 @@ public function collect(Request $request, Response $response, \Exception $except
         }
 
         $dotenvVars = [];
-        foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {
-            if ('' !== $name && false !== $value = getenv($name)) {
-                $dotenvVars[$name] = $value;
+        foreach (explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? '') as $name) {
+            if ('' !== $name && isset($_ENV[$name])) {
+                $dotenvVars[$name] = $_ENV[$name];
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ public function collect(Request $request, Response $response, \Exception $except`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`$dotenvVars = [];`
`83`		`- foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {`
`84`		`- if ('' !== $name && false !== $value = getenv($name)) {`
`85`		`- $dotenvVars[$name] = $value;`
	`83`	`+ foreach (explode(',', $_SERVER['SYMFONY_DOTENV_VARS'] ?? $_ENV['SYMFONY_DOTENV_VARS'] ?? '') as $name) {`
	`84`	`+ if ('' !== $name && isset($_ENV[$name])) {`
	`85`	`+ $dotenvVars[$name] = $_ENV[$name];`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`