fix handling of not processable config

xabbuh · xabbuh · commit 4bf5883e6df0 · 2018-06-25T17:34:31.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -56,12 +56,10 @@ public function __construct()
 
     public function load(array $configs, ContainerBuilder $container)
     {
-        if (!array_filter($configs)) {
+        if (null === $mainConfig = $this->getConfiguration($configs, $container)) {
             return;
         }
 
-        $mainConfig = $this->getConfiguration($configs, $container);
-
         $config = $this->processConfiguration($mainConfig, $configs);
 
         // load services
@@ -722,6 +720,10 @@ public function getNamespace()
 
     public function getConfiguration(array $config, ContainerBuilder $container)
     {
+        if (!array_filter($config)) {
+            return;
+        }
+
         // first assemble the factories
         return new MainConfiguration($this->factories, $this->userProviderFactories);
     }

Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,10 @@ public function __construct()`
`56`	`56`
`57`	`57`	`public function load(array $configs, ContainerBuilder $container)`
`58`	`58`	`{`
`59`		`- if (!array_filter($configs)) {`
	`59`	`+ if (null === $mainConfig = $this->getConfiguration($configs, $container)) {`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`	`62`
`63`		`- $mainConfig = $this->getConfiguration($configs, $container);`
`64`		`-`
`65`	`63`	`$config = $this->processConfiguration($mainConfig, $configs);`
`66`	`64`
`67`	`65`	`// load services`
`@@ -722,6 +720,10 @@ public function getNamespace()`
`722`	`720`
`723`	`721`	`public function getConfiguration(array $config, ContainerBuilder $container)`
`724`	`722`	`{`
	`723`	`+ if (!array_filter($config)) {`
	`724`	`+ return;`
	`725`	`+ }`
	`726`	`+`
`725`	`727`	`// first assemble the factories`
`726`	`728`	`return new MainConfiguration($this->factories, $this->userProviderFactories);`
`727`	`729`	`}`