Merge pull request #5 from symfony-bundles/dev

Load extension if extension config is empty in container

Author: khaperets

BundleDependency.php

@@ -3,6 +3,7 @@
 namespace SymfonyBundles\BundleDependency;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use SymfonyBundles\BundleDependency\DependencyInjection\Compiler;
 
 trait BundleDependency
 {
@@ -45,11 +46,15 @@ protected function registerBundleDependencies(ContainerBuilder $container)
 
         $this->bundles = $container->getParameter('kernel.bundles');
 
-        $this->createBundles($this->getBundleDependencies());
+        if ($this->createBundles($this->getBundleDependencies())) {
+            $container->setParameter('kernel.bundles', $this->bundles);
 
-        $container->setParameter('kernel.bundles', $this->bundles);
+            $this->initializeBundles($container);
 
-        $this->initializeBundles($container);
+            $pass = new Compiler\ExtensionLoadPass($this->instances);
+
+            $container->addCompilerPass($pass);
+        }
 
         $this->booted = true;
     }
@@ -59,7 +64,7 @@ protected function registerBundleDependencies(ContainerBuilder $container)
      *
      * @param array $dependencies
      *
-     * @return void
+     * @return bool Has new instances or not.
      */
     protected function createBundles(array $dependencies)
     {
@@ -76,6 +81,8 @@ protected function createBundles(array $dependencies)
                 }
             }
         }
+
+        return count($this->instances) > 0;
     }
 
     /**
@@ -88,8 +95,6 @@ protected function initializeBundles(ContainerBuilder $container)
         foreach ($this->instances as $bundle) {
             if ($extension = $bundle->getContainerExtension()) {
                 $container->registerExtension($extension);
-
-                $extension->load([], $container);
             }
 
             $bundle->build($container);

DependencyInjection/Compiler/ExtensionLoadPass.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace SymfonyBundles\BundleDependency\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class ExtensionLoadPass implements CompilerPassInterface
+{
+
+    /**
+     * @var array
+     */
+    private $bundles;
+
+    /**
+     * @param array $bundles
+     */
+    public function __construct(array $bundles)
+    {
+        $this->bundles = $bundles;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        foreach ($this->bundles as $bundle) {
+            if ($extension = $bundle->getContainerExtension()) {
+                $this->loadExtension($extension, $container);
+            }
+        }
+    }
+
+    /**
+     * @param Extension        $extension
+     * @param ContainerBuilder $container
+     *
+     * @return void
+     */
+    private function loadExtension(Extension $extension, ContainerBuilder $container)
+    {
+        if (!$container->getExtensionConfig($extension->getAlias())) {
+            $extension->load([], $container);
+        }
+    }
+
+}

README.md

@@ -50,9 +50,11 @@ If you want override a method `build`, call the method `registerBundleDependenci
 ``` php
 public function build(ContainerBuilder $container)
 {
-    $this->registerBundleDependencies($container);
+    parent::build($container);
 
     // ...
+
+    $this->registerBundleDependencies($container);
 }
 ```