[DependencyInjection] Fix autocasting null env values to empty string

fancyweb · fancyweb · commit 764d6232c9c4 · 2023-06-30T18:35:14.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -390,7 +390,15 @@ protected function getEnv(string $name)
             $prefix = 'string';
             $localName = $name;
         }
-        $processor = $processors->has($prefix) ? $processors->get($prefix) : new EnvVarProcessor($this);
+
+        if ($processors->has($prefix)) {
+            $processor = $processors->get($prefix);
+        } else {
+            $processor = new EnvVarProcessor($this);
+            if ('string' === $prefix) {
+                $prefix = '';
+            }
+        }
 
         $this->resolving[$envName] = true;
         try {
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -126,7 +126,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
             }
         }
 
-        if (false !== $i || 'string' !== $prefix) {
+        if (false !== $i || !\in_array($prefix, ['', 'string'], true)) {
             $env = $getEnv($name);
         } elseif (isset($_ENV[$name])) {
             $env = $_ENV[$name];
@@ -177,6 +177,10 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
         }
 
         if (null === $env) {
+            if ('' === $prefix) {
+                return null;
+            }
+
             if (!isset($this->getProvidedTypes()[$prefix])) {
                 throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
             }
@@ -190,7 +194,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
             throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
         }
 
-        if ('string' === $prefix) {
+        if (\in_array($prefix, ['', 'string'], true)) {
             return (string) $env;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -763,12 +763,13 @@ public static function provideGetEnvUrlPath()
 
     /**
      * @testWith    ["", "string"]
+     *              [null, ""]
      *              [false, "bool"]
      *              [true, "not"]
      *              [0, "int"]
      *              [0.0, "float"]
      */
-    public function testGetEnvCastsNull($expected, string $prefix)
+    public function testGetEnvCastsNullBehavior($expected, string $prefix)
     {
         $processor = new EnvVarProcessor(new Container());
 
@@ -778,4 +779,19 @@ public function testGetEnvCastsNull($expected, string $prefix)
             });
         }));
     }
+
+    public function testGetEnvWithEmptyStringPrefixCastsToString()
+    {
+        $processor = new EnvVarProcessor(new Container());
+        unset($_ENV['FOO']);
+        $_ENV['FOO'] = 4;
+
+        try {
+            $this->assertSame('4', $processor->getEnv('', 'FOO', static function () {
+                $this->fail('Should not be called');
+            }));
+        } finally {
+            unset($_ENV['FOO']);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`		`- if (false !== $i \|\| 'string' !== $prefix) {`
	`129`	`+ if (false !== $i \|\| !\in_array($prefix, ['', 'string'], true)) {`
`130`	`130`	`$env = $getEnv($name);`
`131`	`131`	`} elseif (isset($_ENV[$name])) {`
`132`	`132`	`$env = $_ENV[$name];`
`@@ -177,6 +177,10 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if (null === $env) {`
	`180`	`+ if ('' === $prefix) {`
	`181`	`+ return null;`
	`182`	`+ }`
	`183`	`+`
`180`	`184`	`if (!isset($this->getProvidedTypes()[$prefix])) {`
`181`	`185`	`throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));`
`182`	`186`	`}`
`@@ -190,7 +194,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`190`	`194`	`throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));`
`191`	`195`	`}`
`192`	`196`
`193`		`- if ('string' === $prefix) {`
	`197`	`+ if (\in_array($prefix, ['', 'string'], true)) {`
`194`	`198`	`return (string) $env;`
`195`	`199`	`}`
`196`	`200`