fixup

HeahDude · HeahDude · commit 851aee62eb90 · 2017-07-27T11:50:18.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -158,6 +158,9 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
                     ->end()
                     ->prototype('variable')->end()
                 ->end()
+                ->scalarNode('default_path')
+                    ->defaultValue('%kernel.project_dir%/templates')
+                ->end()
             ->end()
         ;
     }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -122,22 +122,15 @@ public function load(array $configs, ContainerBuilder $container)
             foreach ($bundle['paths'] as $path) {
                 $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
             }
-        }
 
-        if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/views', false)) {
-            $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
+            $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($config['default_path'].'/bundles/'.$namespace, $namespace));
         }
 
-        if ($container->fileExists($dir = $container->getParameter('kernel.project_dir').'/templates', false)) {
+        if ($container->fileExists($dir = $container->getParameter('kernel.root_dir').'/Resources/views', false)) {
             $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
         }
 
-        if ($container->fileExists($dir = $container->getParameter('kernel.project_dir').'/templates/bundles', false)) {
-            foreach (glob($dir.'/*', GLOB_ONLYDIR) as $path) {
-                $parts = explode(DIRECTORY_SEPARATOR, $path);
-                $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, end($parts)));
-            }
-        }
+        $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($config['default_path']));
 
         if (!empty($config['globals'])) {
             $def = $container->getDefinition('twig');

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,9 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)`
`158`	`158`	`->end()`
`159`	`159`	`->prototype('variable')->end()`
`160`	`160`	`->end()`
	`161`	`+ ->scalarNode('default_path')`
	`162`	`+ ->defaultValue('%kernel.project_dir%/templates')`
	`163`	`+ ->end()`
`161`	`164`	`->end()`
`162`	`165`	`;`
`163`	`166`	`}`