diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index feb51fff3bb1..aec6a79b228c 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -181,10 +181,12 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
}
- return null;
+ if (!\in_array($prefix, ['string', 'bool', 'not', 'int', 'float'], true)) {
+ return null;
+ }
}
- if (!\is_scalar($env)) {
+ if (null !== $env && !\is_scalar($env)) {
throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
}
@@ -199,7 +201,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
}
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));
}
@@ -207,7 +209,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
}
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/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index bf35ba135dfd..21acd7fc962a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -839,8 +839,8 @@ public function testEnvAreNullable()
$container->register('foo', 'stdClass')
->setPublic(true)
->setProperties([
- 'fake' => '%env(int:FAKE)%',
- ]);
+ 'fake' => '%env(resolve:FAKE)%',
+ ]);
$container->compile(true);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index e14fb6ae2449..72cf270a632b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -760,4 +760,22 @@ public static function provideGetEnvUrlPath()
['blog//', 'https://symfony.com/blog//'],
];
}
+
+ /**
+ * @testWith ["", "string"]
+ * [false, "bool"]
+ * [true, "not"]
+ * [0, "int"]
+ * [0.0, "float"]
+ */
+ public function testGetEnvCastsNull($expected, string $prefix)
+ {
+ $processor = new EnvVarProcessor(new Container());
+
+ $this->assertSame($expected, $processor->getEnv($prefix, 'default::FOO', static function () use ($processor) {
+ return $processor->getEnv('default', ':FOO', static function () {
+ return null;
+ });
+ }));
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy