From a2294106fb8eee0f9cdb10bf9b190c52485bd551 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 23 Mar 2011 09:04:19 +0100
Subject: [PATCH] fixed finding resources under the main app/ directory

* Now, all resources can be stored globally (templates, assets, ...)
* The new directory is app/Resources/...
---
 .../AsseticBundle/DependencyInjection/AsseticExtension.php | 3 ++-
 .../Tests/Resources/{ => Resources}/views/base.html.php    | 0
 .../Tests/Resources/{ => Resources}/views/base.html.twig   | 0
 .../Tests/Resources/{ => Resources}/views/layout.html.php  | 0
 .../Tests/Resources/{ => Resources}/views/layout.html.twig | 0
 .../CacheWarmer/TemplatePathsCacheWarmer.php               | 7 +++----
 .../Bundle/FrameworkBundle/Resources/config/templating.xml | 6 +++---
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Symfony/Bundle/AsseticBundle/Tests/Resources/{ => Resources}/views/base.html.php (100%)
 rename src/Symfony/Bundle/AsseticBundle/Tests/Resources/{ => Resources}/views/base.html.twig (100%)
 rename src/Symfony/Bundle/AsseticBundle/Tests/Resources/{ => Resources}/views/layout.html.php (100%)
 rename src/Symfony/Bundle/AsseticBundle/Tests/Resources/{ => Resources}/views/layout.html.twig (100%)

diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
index a931a4359f9e..21c0c572a366 100644
--- a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
+++ b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
@@ -96,6 +96,7 @@ static protected function registerFormulaResources(ContainerBuilder $container,
         foreach ($bundles as $name) {
             $rc = new \ReflectionClass($map[$name]);
             if (is_dir($dir = dirname($rc->getFileName()).'/Resources/views')) {
+                // FIXME: must also look for templates in %kernel.root_dir%/Resources/%bundle%/views
                 foreach (array('twig', 'php') as $engine) {
                     $container->setDefinition(
                         'assetic.'.$engine.'_directory_resource.'.$name,
@@ -106,7 +107,7 @@ static protected function registerFormulaResources(ContainerBuilder $container,
         }
 
         // kernel views/ directory
-        if (is_dir($dir = $container->getParameter('kernel.root_dir').'/views')) {
+        if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
             foreach (array('twig', 'php') as $engine) {
                 $container->setDefinition(
                     'assetic.'.$engine.'_directory_resource.kernel',
diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/base.html.php b/src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/base.html.php
similarity index 100%
rename from src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/base.html.php
rename to src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/base.html.php
diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/base.html.twig b/src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/base.html.twig
similarity index 100%
rename from src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/base.html.twig
rename to src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/base.html.twig
diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/layout.html.php b/src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/layout.html.php
similarity index 100%
rename from src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/layout.html.php
rename to src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/layout.html.php
diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/layout.html.twig b/src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/layout.html.twig
similarity index 100%
rename from src/Symfony/Bundle/AsseticBundle/Tests/Resources/views/layout.html.twig
rename to src/Symfony/Bundle/AsseticBundle/Tests/Resources/Resources/views/layout.html.twig
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
index 75cec241d5cf..fe0e971b5c86 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
@@ -23,8 +23,6 @@
  */
 class TemplatePathsCacheWarmer extends CacheWarmer
 {
-    const TEMPLATES_PATH_IN_BUNDLE = '/Resources/views';
-
     protected $kernel;
     protected $rootDir;
     protected $parser;
@@ -53,10 +51,11 @@ public function warmUp($cacheDir)
         $templates = array();
 
         foreach ($this->kernel->getBundles() as $name => $bundle) {
-            $templates += $this->findTemplatesIn($bundle->getPath().self::TEMPLATES_PATH_IN_BUNDLE, $name);
+            $templates += $this->findTemplatesIn($this->rootDir.'/'.$name.'/views', $name);
+            $templates += $this->findTemplatesIn($bundle->getPath().'/Resources/views', $name);
         }
 
-        $templates += $this->findTemplatesIn($this->rootDir);
+        $templates += $this->findTemplatesIn($this->rootDir.'/views');
 
         $this->writeCacheFile($cacheDir.'/templates.php', sprintf('<?php return %s;', var_export($templates, true)));
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
index 0caac51d2d27..95375a53f266 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -29,19 +29,19 @@
 
         <service id="templating.locator" class="%templating.locator.class%" public="false">
             <argument type="service" id="file_locator" />
-            <argument>%kernel.root_dir%</argument>
+            <argument>%kernel.root_dir%/Resources</argument>
         </service>
 
         <service id="templating.locator.cached" class="%templating.locator.cached.class%" public="false">
             <argument>%kernel.cache_dir%</argument>
             <argument type="service" id="file_locator" />
-            <argument>%kernel.root_dir%</argument>
+            <argument>%kernel.root_dir%/Resources</argument>
         </service>
 
         <service id="templating.cache_warmer.template_paths" class="%templating.cache_warmer.template_paths.class%" public="false">
             <argument type="service" id="kernel" />
             <argument type="service" id="templating.name_parser" />
-            <argument>%kernel.root_dir%/views</argument>
+            <argument>%kernel.root_dir%/Resources</argument>
         </service>
 
         <service id="templating.loader.filesystem" class="%templating.loader.filesystem.class%" public="false">