bug symfony#32365 [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit db05791ceb37 · 2019-07-04T15:33:02.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Spotted in and needed by symfony#32294 Commits ------- b06d000 [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -186,6 +186,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
         $bag = $this->getParameterBag();
         $value = $bag->resolveValue($value);
 
+        if (!$bag instanceof EnvPlaceholderParameterBag) {
+            return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
+        }
+
         foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
             if (false === strpos($env, ':')) {
                 continue;
