Merge branch '5.4' into 6.3

* 5.4:
  [Messenger] Fix cloned TraceableStack not unstacking the stack independently
  [DependencyInjection] Fix autocasting null env values to empty string with container.env_var_processors_locator
  [Cache] Fix support for Redis Sentinel using php-redis 6.0.0
  minor #51693 Disable the dead code analysis in Psalm (stof)
  Update the PR template
  [SecurityBundle][PasswordHasher] Fix password migration with custom hasher service with security bundle config
  [Translator] Fix support for `default_path` in XML
  [HttpClient] Fix TraceableResponse if response has no destruct method

Author: nicolas-grekas

Container.php

@@ -373,13 +373,9 @@ protected function getEnv(string $name): mixed
             $localName = $name;
         }
 
-        if ($processors->has($prefix)) {
-            $processor = $processors->get($prefix);
-        } else {
-            $processor = new EnvVarProcessor($this);
-            if (false === $i) {
-                $prefix = '';
-            }
+        $processor = $processors->has($prefix) ? $processors->get($prefix) : new EnvVarProcessor($this);
+        if (false === $i) {
+            $prefix = '';
         }
 
         $this->resolving[$envName] = true;

EnvVarProcessorInterface.php

@@ -24,6 +24,7 @@ interface EnvVarProcessorInterface
      * Returns the value of the given variable as managed by the current instance.
      *
      * @param string                  $prefix The namespace of the variable
+     * @param string                  $prefix The namespace of the variable; when the empty string is passed, null values should be kept as is
      * @param string                  $name   The name of the variable within the namespace
      * @param \Closure(string): mixed $getEnv A closure that allows fetching more env vars
      *

Tests/ContainerTest.php

@@ -14,11 +14,13 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\EnvVarProcessor;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Contracts\Service\ResetInterface;
 
 class ContainerTest extends TestCase
@@ -404,6 +406,33 @@ public function testRequestAnInternalSharedPrivateService()
         $c->get('internal_dependency');
         $c->get('internal');
     }
+
+    public function testGetEnvDoesNotAutoCastNullWithDefaultEnvVarProcessor()
+    {
+        $container = new Container();
+        $container->setParameter('env(FOO)', null);
+        $container->compile();
+
+        $r = new \ReflectionMethod($container, 'getEnv');
+        $r->setAccessible(true);
+        $this->assertNull($r->invoke($container, 'FOO'));
+    }
+
+    public function testGetEnvDoesNotAutoCastNullWithEnvVarProcessorsLocatorReturningDefaultEnvVarProcessor()
+    {
+        $container = new Container();
+        $container->setParameter('env(FOO)', null);
+        $container->set('container.env_var_processors_locator', new ServiceLocator([
+            'string' => static function () use ($container): EnvVarProcessor {
+                return new EnvVarProcessor($container);
+            },
+        ]));
+        $container->compile();
+
+        $r = new \ReflectionMethod($container, 'getEnv');
+        $r->setAccessible(true);
+        $this->assertNull($r->invoke($container, 'FOO'));
+    }
 }
 
 class ProjectServiceContainer extends Container