Revert "bug #29409 Fix env fallback to an unresolved variable (jderusse)"

This reverts commit ab95ae3f7a13c145037196a17b1dc1d2d4cd0399, reversing
changes made to 8a6090793b638e32df871f6200ce65c740433d83.

Author: nicolas-grekas

ContainerBuilder.php

@@ -1534,15 +1534,11 @@ protected function getEnv($name)
             return $value;
         }
 
-        $envPlaceholders = $bag->getEnvPlaceholders();
-        if (isset($envPlaceholders[$name][$value])) {
-            $bag = new ParameterBag($bag->all());
-
-            return $bag->unescapeValue($bag->get("env($name)"));
-        }
-        foreach ($envPlaceholders as $env => $placeholders) {
+        foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
             if (isset($placeholders[$value])) {
-                return $this->getEnv($env);
+                $bag = new ParameterBag($bag->all());
+
+                return $bag->unescapeValue($bag->get("env($name)"));
             }
         }
 

Tests/ContainerBuilderTest.php

@@ -738,20 +738,6 @@ 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();