[DependencyInjection] Stop considering empty env vars as populated

nicolas-grekas · nicolas-grekas · commit a8f8903a94b2 · 2022-12-28T12:33:57.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -145,18 +145,16 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
 
         if (false !== $i || 'string' !== $prefix) {
             $env = $getEnv($name);
-        } elseif (isset($_ENV[$name])) {
-            $env = $_ENV[$name];
-        } elseif (isset($_SERVER[$name]) && !str_starts_with($name, 'HTTP_')) {
-            $env = $_SERVER[$name];
-        } elseif (false === ($env = getenv($name)) || null === $env) { // null is a possible value because of thread safety issues
+        } elseif ('' === ($env = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null)))
+            || false === ($env = $env ?? getenv($name) ?? false) // null is a possible value because of thread safety issues
+        ) {
             foreach ($this->loadedVars as $vars) {
-                if (false !== $env = ($vars[$name] ?? false)) {
+                if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {
                     break;
                 }
             }
 
-            if (false === $env || null === $env) {
+            if (false === $env || '' === $env) {
                 $loaders = $this->loaders;
                 $this->loaders = new \ArrayIterator();
 
@@ -169,7 +167,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                             continue;
                         }
                         $this->loadedVars[] = $vars = $loader->loadEnvVars();
-                        if (false !== $env = $vars[$name] ?? false) {
+                        if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {
                             $ended = false;
                             break;
                         }
@@ -184,7 +182,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                 }
             }
 
-            if (false === $env || null === $env) {
+            if (false === $env) {
                 if (!$this->container->hasParameter("env($name)")) {
                     throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
                 }
@@ -218,7 +216,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         if (\in_array($prefix, ['bool', 'not'], true)) {
             $env = (bool) (filter_var($env, \FILTER_VALIDATE_BOOL) ?: filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT));
 
-            return 'not' === $prefix ? !$env : $env;
+            return 'not' === $prefix xor $env;
         }
 
         if ('int' === $prefix) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -744,12 +744,15 @@ public function validCsv()
 
     public function testEnvLoader()
     {
+        $_ENV['BAZ_ENV_LOADER'] = '';
+
         $loaders = function () {
             yield new class() implements EnvVarLoaderInterface {
                 public function loadEnvVars(): array
                 {
                     return [
                         'FOO_ENV_LOADER' => '123',
+                        'BAZ_ENV_LOADER' => '',
                     ];
                 }
             };
@@ -760,6 +763,7 @@ public function loadEnvVars(): array
                     return [
                         'FOO_ENV_LOADER' => '234',
                         'BAR_ENV_LOADER' => '456',
+                        'BAZ_ENV_LOADER' => '567',
                     ];
                 }
             };
@@ -773,8 +777,13 @@ public function loadEnvVars(): array
         $result = $processor->getEnv('string', 'BAR_ENV_LOADER', function () {});
         $this->assertSame('456', $result);
 
+        $result = $processor->getEnv('string', 'BAZ_ENV_LOADER', function () {});
+        $this->assertSame('567', $result);
+
         $result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
         $this->assertSame('123', $result); // check twice
+
+        unset($_ENV['BAZ_ENV_LOADER']);
     }
 
     public function testCircularEnvLoader()

Original file line number	Diff line number	Diff line change
`@@ -145,18 +145,16 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`145`	`145`
`146`	`146`	`if (false !== $i \|\| 'string' !== $prefix) {`
`147`	`147`	`$env = $getEnv($name);`
`148`		`- } elseif (isset($_ENV[$name])) {`
`149`		`- $env = $_ENV[$name];`
`150`		`- } elseif (isset($_SERVER[$name]) && !str_starts_with($name, 'HTTP_')) {`
`151`		`- $env = $_SERVER[$name];`
`152`		`- } elseif (false === ($env = getenv($name)) \|\| null === $env) { // null is a possible value because of thread safety issues`
	`148`	`+ } elseif ('' === ($env = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null)))`
	`149`	`+ \|\| false === ($env = $env ?? getenv($name) ?? false) // null is a possible value because of thread safety issues`
	`150`	`+ ) {`
`153`	`151`	`foreach ($this->loadedVars as $vars) {`
`154`		`- if (false !== $env = ($vars[$name] ?? false)) {`
	`152`	`+ if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {`
`155`	`153`	`break;`
`156`	`154`	`}`
`157`	`155`	`}`
`158`	`156`
`159`		`- if (false === $env \|\| null === $env) {`
	`157`	`+ if (false === $env \|\| '' === $env) {`
`160`	`158`	`$loaders = $this->loaders;`
`161`	`159`	`$this->loaders = new \ArrayIterator();`
`162`	`160`
`@@ -169,7 +167,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`169`	`167`	`continue;`
`170`	`168`	`}`
`171`	`169`	`$this->loadedVars[] = $vars = $loader->loadEnvVars();`
`172`		`- if (false !== $env = $vars[$name] ?? false) {`
	`170`	`+ if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {`
`173`	`171`	`$ended = false;`
`174`	`172`	`break;`
`175`	`173`	`}`
`@@ -184,7 +182,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`184`	`182`	`}`
`185`	`183`	`}`
`186`	`184`
`187`		`- if (false === $env \|\| null === $env) {`
	`185`	`+ if (false === $env) {`
`188`	`186`	`if (!$this->container->hasParameter("env($name)")) {`
`189`	`187`	`throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));`
`190`	`188`	`}`
`@@ -218,7 +216,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`218`	`216`	`if (\in_array($prefix, ['bool', 'not'], true)) {`
`219`	`217`	`$env = (bool) (filter_var($env, \FILTER_VALIDATE_BOOL) ?: filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT));`
`220`	`218`
`221`		`- return 'not' === $prefix ? !$env : $env;`
	`219`	`+ return 'not' === $prefix xor $env;`
`222`	`220`	`}`
`223`	`221`
`224`	`222`	`if ('int' === $prefix) {`