[FrameworkBundle] moved templating configuration from FrameworkBundle to FrameworkExtension

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php

@@ -185,6 +185,10 @@ class WebExtension extends Extension
         if (!$container->hasDefinition('templating')) {
             $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
             $loader->load($this->resources['templating']);
+
+            if ($container->getParameter('kernel.debug')) {
+                $loader->load('templating_debug.xml');
+            }
         }
 
         if (array_key_exists('escaping', $config)) {
@@ -195,6 +199,13 @@ class WebExtension extends Extension
             $container->setParameter('templating.assets.version', $config['assets_version']);
         }
 
+        // template paths
+        $dirs = array('%kernel.root_dir%/views/%%bundle%%/%%controller%%/%%name%%%%format%%.%%renderer%%');
+        foreach ($container->getParameter('kernel.bundle_dirs') as $dir) {
+            $dirs[] = $dir.'/%%bundle%%/Resources/views/%%controller%%/%%name%%%%format%%.%%renderer%%';
+        }
+        $container->setParameter('templating.loader.filesystem.path', $dirs);
+
         // path for the filesystem loader
         if (isset($config['path'])) {
             $container->setParameter('templating.loader.filesystem.path', $config['path']);

src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php

@@ -34,19 +34,5 @@ class FrameworkBundle extends Bundle
     public function buildContainer(ParameterBagInterface $parameterBag)
     {
         ContainerBuilder::registerExtension(new WebExtension($parameterBag->get('kernel.bundle_dirs'), $parameterBag->get('kernel.bundles')));
-
-        $dirs = array('%kernel.root_dir%/views/%%bundle%%/%%controller%%/%%name%%%%format%%.%%renderer%%');
-        foreach ($parameterBag->get('kernel.bundle_dirs') as $dir) {
-            $dirs[] = $dir.'/%%bundle%%/Resources/views/%%controller%%/%%name%%%%format%%.%%renderer%%';
-        }
-        $parameterBag->set('templating.loader.filesystem.path', $dirs);
-
-        $container = new ContainerBuilder();
-        if ($parameterBag->get('kernel.debug')) {
-            $loader = new XmlFileLoader($container, __DIR__.'/Resources/config');
-            $loader->load('debug.xml');
-        }
-
-        return $container;
     }
 }