bug symfony#45529 [DependencyInjection] Don't reset env placeholders during compilation (nicolas-grekas)

This PR was merged into the 4.4 branch.

Discussion
----------

[DependencyInjection] Don't reset env placeholders during compilation

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix symfony#36466
| License       | MIT
| Doc PR        | -

Resetting causes placeholders to be lost when the env-var-in-config is used by several bundles (from linked issue.)

Commits
-------

fac5418 [DependencyInjection] Don't reset env placeholders during compilation

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php

@@ -79,10 +79,6 @@ public function process(ContainerBuilder $container)
                     $container->getParameterBag()->mergeEnvPlaceholders($resolvingBag);
                 }
 
-                if ($configAvailable) {
-                    BaseNode::resetPlaceholders();
-                }
-
                 throw $e;
             }
 
@@ -95,10 +91,6 @@ public function process(ContainerBuilder $container)
             $container->getParameterBag()->add($parameters);
         }
 
-        if ($configAvailable) {
-            BaseNode::resetPlaceholders();
-        }
-
         $container->addDefinitions($definitions);
         $container->addAliases($aliases);
     }

src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php

@@ -48,45 +48,41 @@ public function process(ContainerBuilder $container)
 
         $defaultBag = new ParameterBag($resolvingBag->all());
         $envTypes = $resolvingBag->getProvidedTypes();
-        try {
-            foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
-                $values = [];
-                if (false === $i = strpos($env, ':')) {
-                    $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
-                    $defaultType = null !== $default ? self::getType($default) : 'string';
-                    $values[$defaultType] = $default;
-                } else {
-                    $prefix = substr($env, 0, $i);
-                    foreach ($envTypes[$prefix] ?? ['string'] as $type) {
-                        $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
-                    }
-                }
-                foreach ($placeholders as $placeholder) {
-                    BaseNode::setPlaceholder($placeholder, $values);
+        foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
+            $values = [];
+            if (false === $i = strpos($env, ':')) {
+                $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
+                $defaultType = null !== $default ? self::getType($default) : 'string';
+                $values[$defaultType] = $default;
+            } else {
+                $prefix = substr($env, 0, $i);
+                foreach ($envTypes[$prefix] ?? ['string'] as $type) {
+                    $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
                 }
             }
+            foreach ($placeholders as $placeholder) {
+                BaseNode::setPlaceholder($placeholder, $values);
+            }
+        }
 
-            $processor = new Processor();
+        $processor = new Processor();
 
-            foreach ($extensions as $name => $extension) {
-                if (!$extension instanceof ConfigurationExtensionInterface || !$config = array_filter($container->getExtensionConfig($name))) {
-                    // this extension has no semantic configuration or was not called
-                    continue;
-                }
+        foreach ($extensions as $name => $extension) {
+            if (!$extension instanceof ConfigurationExtensionInterface || !$config = array_filter($container->getExtensionConfig($name))) {
+                // this extension has no semantic configuration or was not called
+                continue;
+            }
 
-                $config = $resolvingBag->resolveValue($config);
+            $config = $resolvingBag->resolveValue($config);
 
-                if (null === $configuration = $extension->getConfiguration($config, $container)) {
-                    continue;
-                }
+            if (null === $configuration = $extension->getConfiguration($config, $container)) {
+                continue;
+            }
 
-                try {
-                    $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
-                } catch (TreeWithoutRootNodeException $e) {
-                }
+            try {
+                $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
+            } catch (TreeWithoutRootNodeException $e) {
             }
-        } finally {
-            BaseNode::resetPlaceholders();
         }
 
         $resolvingBag->clearUnusedEnvPlaceholders();