Fix env fallback to an unresolved variable

jderusse · nicolas-grekas · commit ad6df01b9f17 · 2018-12-17T14:52:50.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1534,11 +1534,15 @@ protected function getEnv($name)
             return $value;
         }
 
-        foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
-            if (isset($placeholders[$value])) {
-                $bag = new ParameterBag($bag->all());
+        $envPlaceholders = $bag->getEnvPlaceholders();
+        if (isset($envPlaceholders[$name][$value])) {
+            $bag = new ParameterBag($bag->all());
 
-                return $bag->unescapeValue($bag->get("env($name)"));
+            return $bag->unescapeValue($bag->get("env($name)"));
+        }
+        foreach ($envPlaceholders as $env => $placeholders) {
+            if (isset($placeholders[$value])) {
+                return $this->getEnv($env);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -738,6 +738,20 @@ public function testDynamicEnv()
         $this->assertSame('someFooBar', $container->getParameter('baz'));
     }
 
+    public function testFallbackEnv()
+    {
+        putenv('DUMMY_FOO=foo');
+
+        $container = new ContainerBuilder();
+        $container->setParameter('foo', '%env(DUMMY_FOO)%');
+        $container->setParameter('bar', 'bar%env(default:foo:DUMMY_BAR)%');
+
+        $container->compile(true);
+        putenv('DUMMY_FOO');
+
+        $this->assertSame('barfoo', $container->getParameter('bar'));
+    }
+
     public function testCastEnv()
     {
         $container = new ContainerBuilder();

Original file line number	Diff line number	Diff line change
`@@ -1534,11 +1534,15 @@ protected function getEnv($name)`
`1534`	`1534`	`return $value;`
`1535`	`1535`	`}`
`1536`	`1536`
`1537`		`- foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {`
`1538`		`- if (isset($placeholders[$value])) {`
`1539`		`- $bag = new ParameterBag($bag->all());`
	`1537`	`+ $envPlaceholders = $bag->getEnvPlaceholders();`
	`1538`	`+ if (isset($envPlaceholders[$name][$value])) {`
	`1539`	`+ $bag = new ParameterBag($bag->all());`
`1540`	`1540`
`1541`		`- return $bag->unescapeValue($bag->get("env($name)"));`
	`1541`	`+ return $bag->unescapeValue($bag->get("env($name)"));`
	`1542`	`+ }`
	`1543`	`+ foreach ($envPlaceholders as $env => $placeholders) {`
	`1544`	`+ if (isset($placeholders[$value])) {`
	`1545`	`+ return $this->getEnv($env);`
`1542`	`1546`	`}`
`1543`	`1547`	`}`
`1544`	`1548`