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('
- %kernel.root_dir%
+ %kernel.root_dir%/Resources
%kernel.cache_dir%
- %kernel.root_dir%
+ %kernel.root_dir%/Resources
- %kernel.root_dir%/views
+ %kernel.root_dir%/Resources