Merge branch '5.4' into 6.2

* 5.4:
  [Cache] Fix tests
  [DependencyInjection] Allow casting env var processors to cast null
  [Cache] Fix DBAL deprecations
  Fix broken symlink tests Windows PHP 7.4+
  [Serializer] Fix discriminator map not working with `AbstractNormalizer::OBJECT_TO_POPULATE`

Author: nicolas-grekas

EnvVarProcessor.php

@@ -198,7 +198,9 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                 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 ('shuffle' === $prefix) {
@@ -207,7 +209,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
             return $env;
         }
 
-        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));
         }
 
@@ -222,15 +224,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));
             }
 

Tests/ContainerBuilderTest.php

@@ -863,8 +863,8 @@ public function testEnvAreNullable()
         $container->register('foo', 'stdClass')
             ->setPublic(true)
             ->setProperties([
-            'fake' => '%env(int:FAKE)%',
-        ]);
+                'fake' => '%env(resolve:FAKE)%',
+            ]);
 
         $container->compile(true);
 

Tests/EnvVarProcessorTest.php

@@ -851,4 +851,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;
+            });
+        }));
+    }
 }