[DI] Don't track merged configs when the extension doesn't expose it
This commit is contained in:
parent
9280ca429e
commit
a8e6aac2f5
@ -67,7 +67,7 @@ class MergeExtensionConfigurationPass implements CompilerPassInterface
|
|||||||
|
|
||||||
if ($resolvingBag instanceof MergeExtensionConfigurationParameterBag) {
|
if ($resolvingBag instanceof MergeExtensionConfigurationParameterBag) {
|
||||||
// don't keep track of env vars that are *overridden* when configs are merged
|
// don't keep track of env vars that are *overridden* when configs are merged
|
||||||
$resolvingBag->freezeAfterProcessing($extension);
|
$resolvingBag->freezeAfterProcessing($extension, $tmpContainer);
|
||||||
}
|
}
|
||||||
|
|
||||||
$container->merge($tmpContainer);
|
$container->merge($tmpContainer);
|
||||||
@ -92,12 +92,16 @@ class MergeExtensionConfigurationParameterBag extends EnvPlaceholderParameterBag
|
|||||||
$this->mergeEnvPlaceholders($parameterBag);
|
$this->mergeEnvPlaceholders($parameterBag);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function freezeAfterProcessing(Extension $extension)
|
public function freezeAfterProcessing(Extension $extension, ContainerBuilder $container)
|
||||||
{
|
{
|
||||||
|
if (!$config = $extension->getProcessedConfigs()) {
|
||||||
|
// Extension::processConfiguration() wasn't called, we cannot know how configs were merged
|
||||||
|
return;
|
||||||
|
}
|
||||||
$this->processedEnvPlaceholders = array();
|
$this->processedEnvPlaceholders = array();
|
||||||
|
|
||||||
// serialize config to catch env vars nested in object graphs
|
// serialize config and container to catch env vars nested in object graphs
|
||||||
$config = serialize($extension->getProcessedConfigs());
|
$config = serialize($config).serialize($container->getDefinitions()).serialize($container->getAliases()).serialize($container->getParameterBag()->all());
|
||||||
|
|
||||||
foreach (parent::getEnvPlaceholders() as $env => $placeholders) {
|
foreach (parent::getEnvPlaceholders() as $env => $placeholders) {
|
||||||
foreach ($placeholders as $placeholder) {
|
foreach ($placeholders as $placeholder) {
|
||||||
|
Reference in New Issue
Block a user