[TwigBundle] Fix bug where namespaced paths don't take parent bundles in account

wesleylancel · wesleylancel · commit 7308a178c5e0 · 2016-08-10T09:55:52.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -92,6 +92,13 @@ public function load(array $configs, ContainerBuilder $container)
             $dir = dirname($reflection->getFileName()).'/Resources/views';
             if (is_dir($dir)) {
                 $this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
+
+                $classMock = new $class;
+                $parent = $classMock->getParent();
+
+                if ($parent) {
+                    $this->prependTwigPath($twigFilesystemLoaderDefinition, $dir, $parent);
+                }
             }
             $container->addResource(new FileExistenceResource($dir));
         }
@@ -140,11 +147,23 @@ public function load(array $configs, ContainerBuilder $container)
 
     private function addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle)
     {
-        $name = $bundle;
+        $name = $this->stripBundleName($bundle);
+        $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir, $name));
+    }
+
+    private function prependTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle)
+    {
+        $name = $this->stripBundleName($bundle);
+        $twigFilesystemLoaderDefinition->addMethodCall('prependPath', array($dir, $name));
+    }
+
+    private function stripBundleName($name)
+    {
         if ('Bundle' === substr($name, -6)) {
             $name = substr($name, 0, -6);
         }
-        $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir, $name));
+
+        return $name;
     }
 
     /**
