[DependencyInjection] Allow casting env var processors to cast null

fancyweb · fancyweb · commit 6277c6d115ff · 2023-05-31T20:13:02.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -196,6 +196,10 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                 throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
             }
 
+            if (\in_array($prefix, ['string', 'bool', 'not', 'int', 'float'], true)) {
+                goto cast;
+            }
+
             return null;
         }
 
@@ -209,6 +213,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
             throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
         }
 
+        cast:
         if ('string' === $prefix) {
             return (string) $env;
         }
@@ -220,15 +225,15 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         }
 
         if ('int' === $prefix) {
-            if (false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {
+            if (null !== $env && false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {
                 throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));
             }
 
             return (int) $env;
         }
 
         if ('float' === $prefix) {
-            if (false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {
+            if (null !== $env && false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {
                 throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -845,4 +845,18 @@ public static function provideGetEnvUrlPath()
             ['blog//', 'https://symfony.com/blog//'],
         ];
     }
+
+    /**
+     * @testWith    ["", "string"]
+     *              [false, "bool"]
+     *              [true, "not"]
+     *              [0, "int"]
+     *              [0.0, "float"]
+     */
+    public function testGetEnvCastsNull(string|bool|int|float $expected, string $prefix)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $this->assertSame($expected, $processor->getEnv($prefix, 'default::FOO', static fn () => $processor->getEnv('default', ':FOO', static fn () => null)));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,10 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`196`	`196`	`throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));`
`197`	`197`	`}`
`198`	`198`
	`199`	`+ if (\in_array($prefix, ['string', 'bool', 'not', 'int', 'float'], true)) {`
	`200`	`+ goto cast;`
	`201`	`+ }`
	`202`	`+`
`199`	`203`	`return null;`
`200`	`204`	`}`
`201`	`205`
`@@ -209,6 +213,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`209`	`213`	`throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));`
`210`	`214`	`}`
`211`	`215`
	`216`	`+ cast:`
`212`	`217`	`if ('string' === $prefix) {`
`213`	`218`	`return (string) $env;`
`214`	`219`	`}`
`@@ -220,15 +225,15 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed`
`220`	`225`	`}`
`221`	`226`
`222`	`227`	`if ('int' === $prefix) {`
`223`		`- if (false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {`
	`228`	`+ if (null !== $env && false === $env = filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT)) {`
`224`	`229`	`throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));`
`225`	`230`	`}`
`226`	`231`
`227`	`232`	`return (int) $env;`
`228`	`233`	`}`
`229`	`234`
`230`	`235`	`if ('float' === $prefix) {`
`231`		`- if (false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {`
	`236`	`+ if (null !== $env && false === $env = filter_var($env, \FILTER_VALIDATE_FLOAT)) {`
`232`	`237`	`throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));`
`233`	`238`	`}`
`234`	`239`