Skip to content

Commit 9aea172

Browse files
feature #36186 [FrameworkBundle] Dump kernel extension configuration (guillbdx)
This PR was squashed before being merged into the 5.1-dev branch. Discussion ---------- [FrameworkBundle] Dump kernel extension configuration | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | #34756 | License | MIT If the kernel is a container extension and defines a configuration, the `config:dump-reference` will now be able to dump it. Commits ------- 2ccafb1eb3 [FrameworkBundle] Dump kernel extension configuration
2 parents 4a16e27 + 90df8e9 commit 9aea172

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Compiler/ValidateEnvPlaceholdersPass.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\DependencyInjection\Compiler;
1313

1414
use Symfony\Component\Config\Definition\BaseNode;
15+
use Symfony\Component\Config\Definition\ConfigurationInterface;
1516
use Symfony\Component\Config\Definition\Processor;
1617
use Symfony\Component\DependencyInjection\ContainerBuilder;
1718
use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
@@ -68,14 +69,18 @@ public function process(ContainerBuilder $container)
6869
$processor = new Processor();
6970

7071
foreach ($extensions as $name => $extension) {
71-
if (!$extension instanceof ConfigurationExtensionInterface || !$config = array_filter($container->getExtensionConfig($name))) {
72+
if (!($extension instanceof ConfigurationExtensionInterface || $extension instanceof ConfigurationInterface)
73+
|| !$config = array_filter($container->getExtensionConfig($name))
74+
) {
7275
// this extension has no semantic configuration or was not called
7376
continue;
7477
}
7578

7679
$config = $resolvingBag->resolveValue($config);
7780

78-
if (null === $configuration = $extension->getConfiguration($config, $container)) {
81+
if ($extension instanceof ConfigurationInterface) {
82+
$configuration = $extension;
83+
} elseif (null === $configuration = $extension->getConfiguration($config, $container)) {
7984
continue;
8085
}
8186

0 commit comments

Comments
 (0)