Skip to content

Commit 0ffb840

Browse files
Merge branch '3.4' into 4.2
* 3.4: [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass [FrameworkBundle] reset cache pools between requests
2 parents 49acc88 + 35e0525 commit 0ffb840

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Compiler/MergeExtensionConfigurationPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
200200
$bag = $this->getParameterBag();
201201
$value = $bag->resolveValue($value);
202202

203+
if (!$bag instanceof EnvPlaceholderParameterBag) {
204+
return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
205+
}
206+
203207
foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
204208
if (false === strpos($env, ':')) {
205209
continue;

0 commit comments

Comments
 (0)