[DI] Prevent an ininite loop when using env vars in service names

dunglas · dunglas · commit 11afeffbf456 · 2017-10-24T11:37:59.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -469,7 +469,8 @@ protected function getEnv($name)
             return $this->envCache[$name];
         }
         if (!$this->has($id = 'container.env_var_processors_locator')) {
-            $this->set($id, new ServiceLocator(array()));
+            // Prevent an infinite loop, because set() call getRemovedIds() that may call getEnv()
+            $this->services[$id] = new ServiceLocator(array());
         }
         if (!$this->getEnv) {
             $this->getEnv = new \ReflectionMethod($this, __FUNCTION__);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -538,6 +538,23 @@ public function testReplacingAPreDefinedServiceIsDeprecated()
 
         $this->assertSame($bar, $c->get('bar'), '->set() replaces a pre-defined service');
     }
+
+    public function testNoInfiniteLoopInGetEnv()
+    {
+        $_ENV['bar'] = 'hello';
+        $this->assertCount(1, (new RemovedIdsCallGetEnvContainer())->getRemovedIds());
+        unset($_ENV['bar']);
+    }
+}
+
+class RemovedIdsCallGetEnvContainer extends Container
+{
+    public function getRemovedIds()
+    {
+        return array(
+            'foo.'.$this->getEnv('bar') => true,
+        );
+    }
 }
 
 class ProjectServiceContainer extends Container

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,8 @@ protected function getEnv($name)`
`469`	`469`	`return $this->envCache[$name];`
`470`	`470`	`}`
`471`	`471`	`if (!$this->has($id = 'container.env_var_processors_locator')) {`
`472`		`- $this->set($id, new ServiceLocator(array()));`
	`472`	`+ // Prevent an infinite loop, because set() call getRemovedIds() that may call getEnv()`
	`473`	`+ $this->services[$id] = new ServiceLocator(array());`
`473`	`474`	`}`
`474`	`475`	`if (!$this->getEnv) {`
`475`	`476`	`$this->getEnv = new \ReflectionMethod($this, __FUNCTION__);`