File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change 12
12
namespace Symfony \Component \DependencyInjection \Compiler ;
13
13
14
14
use Symfony \Component \Config \Definition \BaseNode ;
15
+ use Symfony \Component \Config \Definition \ConfigurationInterface ;
15
16
use Symfony \Component \Config \Definition \Processor ;
16
17
use Symfony \Component \DependencyInjection \ContainerBuilder ;
17
18
use Symfony \Component \DependencyInjection \Extension \ConfigurationExtensionInterface ;
@@ -68,14 +69,18 @@ public function process(ContainerBuilder $container)
68
69
$ processor = new Processor ();
69
70
70
71
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
+ ) {
72
75
// this extension has no semantic configuration or was not called
73
76
continue ;
74
77
}
75
78
76
79
$ config = $ resolvingBag ->resolveValue ($ config );
77
80
78
- if (null === $ configuration = $ extension ->getConfiguration ($ config , $ container )) {
81
+ if ($ extension instanceof ConfigurationInterface) {
82
+ $ configuration = $ extension ;
83
+ } elseif (null === $ configuration = $ extension ->getConfiguration ($ config , $ container )) {
79
84
continue ;
80
85
}
81
86
You can’t perform that action at this time.
0 commit comments