[DependencyInjection] Fix autocasting null env values to empty string with container.env_var_processors_locator

fancyweb · nicolas-grekas · commit 0773b18cf238 · 2023-08-14T15:23:11.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -369,43 +369,42 @@ protected function load(string $file)
      */
     protected function getEnv(string $name)
     {
-        if (isset($this->resolving[$envName = "env($name)"])) {
-            throw new ParameterCircularReferenceException(array_keys($this->resolving));
-        }
-        if (isset($this->envCache[$name]) || \array_key_exists($name, $this->envCache)) {
-            return $this->envCache[$name];
-        }
         if (!$this->has($id = 'container.env_var_processors_locator')) {
             $this->set($id, new ServiceLocator([]));
         }
-        if (!$this->getEnv) {
-            $this->getEnv = \Closure::fromCallable([$this, 'getEnv']);
-        }
-        $processors = $this->get($id);
-
-        if (false !== $i = strpos($name, ':')) {
-            $prefix = substr($name, 0, $i);
-            $localName = substr($name, 1 + $i);
-        } else {
-            $prefix = 'string';
-            $localName = $name;
-        }
+        $this->getEnv ?? $this->getEnv = function ($name, $recursive = true) use ($id) {
+            if (isset($this->resolving[$envName = "env($name)"])) {
+                throw new ParameterCircularReferenceException(array_keys($this->resolving));
+            }
+            if (\array_key_exists($name, $this->envCache)) {
+                return $this->envCache[$name];
+            }
+
+            $processors = $this->get($id);
+
+            if (false !== $i = strpos($name, ':')) {
+                $prefix = substr($name, 0, $i);
+                $localName = substr($name, 1 + $i);
+            } else {
+                $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) {
+            if (false === $i && !$recursive) {
                 $prefix = '';
             }
-        }
 
-        $this->resolving[$envName] = true;
-        try {
-            return $this->envCache[$name] = $processor->getEnv($prefix, $localName, $this->getEnv);
-        } finally {
-            unset($this->resolving[$envName]);
-        }
+            $this->resolving[$envName] = true;
+            try {
+                return $this->envCache[$name] = $processor->getEnv($prefix, $localName, $this->getEnv);
+            } finally {
+                unset($this->resolving[$envName]);
+            }
+        };
+
+        return ($this->getEnv)($name, false);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/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
@@ -405,6 +407,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
