Merge branch '5.4' into 6.2

* 5.4:
  cs fix
  [Messenger] Fix passing options set via tags to handler descriptors
  random_bytes length should be an int greater than 0
  enforce UTC timezone in test
  [DependencyInjection] Fix autocasting null env values to empty string
  Fix executable bit
  Readme: Replace Stack Overflow with GitHub Discussions
  [DependencyInjection] Fix annotation
  [String] Fix Inflector for 'status'
  [EventDispatcher] [EventDispatcher] Throw exception when listener method cannot be resolved

Author: nicolas-grekas

Container.php

@@ -354,7 +354,15 @@ protected function getEnv(string $name): mixed
             $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 (false === $i) {
+                $prefix = '';
+            }
+        }
 
         $this->resolving[$envName] = true;
         try {

ContainerAwareTrait.php

@@ -19,7 +19,7 @@
 trait ContainerAwareTrait
 {
     /**
-     * @var ContainerInterface
+     * @var ContainerInterface|null
      */
     protected $container;
 

EnvVarProcessor.php

@@ -143,6 +143,12 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
             }
         }
 
+        $returnNull = false;
+        if ('' === $prefix) {
+            $returnNull = true;
+            $prefix = 'string';
+        }
+
         if (false !== $i || 'string' !== $prefix) {
             $env = $getEnv($name);
         } elseif (isset($_ENV[$name])) {
@@ -194,6 +200,10 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         }
 
         if (null === $env) {
+            if ($returnNull) {
+                return null;
+            }
+
             if (!isset($this->getProvidedTypes()[$prefix])) {
                 throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
             }

Tests/EnvVarProcessorTest.php

@@ -854,12 +854,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());
 
@@ -869,4 +870,17 @@ 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', function () { $this->fail('Should not be called'); }));
+        } finally {
+            unset($_ENV['FOO']);
+        }
+    }
 }