Patch to avoid exception

Pierstoval · Pierstoval · commit a1849921c6d1 · 2015-01-24T12:58:14.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -424,9 +424,13 @@ protected function initializeBundles()
         $this->topMostBundles = array();
         $this->directChildrenBundles = array();
 
+        // Register root bundles
         foreach ($this->registerBundles() as $bundle) {
             $this->addBundle($bundle);
+        }
 
+        // Register dependencies
+        foreach ($this->bundles as $bundle) {
             foreach ($bundle->getBundleDependencies() as $bundleDependency) {
                 $this->addBundle($bundleDependency, true);
             }
@@ -466,11 +470,7 @@ protected function addBundle($bundle, $dependency = false)
     {
         $name = $bundle->getName();
 
-        // Register dependencies only if not already registered
-        if (isset($this->bundles[$name]) && true === $dependency) {
-            return;
-        }
-        if (isset($this->bundles[$name])) {
+        if (isset($this->bundles[$name]) && false === $dependency) {
             throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name));
         }
         $this->bundles[$name] = $bundle;
