symfony · Feb 23, 2011 · Feb 23, 2011 · Feb 23, 2011
diff --git a/src/Symfony/Bundle/AsseticBundle/AsseticBundle.php b/src/Symfony/Bundle/AsseticBundle/AsseticBundle.php
@@ -28,8 +28,8 @@ public function build(ContainerBuilder $container)
    {
        parent::build($container);

+        $container->addCompilerPass(new TemplatingPass());
        $container->addCompilerPass(new AssetManagerPass());
        $container->addCompilerPass(new FilterManagerPass());
-        $container->addCompilerPass(new TemplatingPass());
    }
 }
diff --git a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetManagerCacheWarmer.php b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetManagerCacheWarmer.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony framework.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Symfony\Bundle\AsseticBundle\CacheWarmer;
+
+use Assetic\Factory\LazyAssetManager;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
+
+class AssetManagerCacheWarmer extends CacheWarmer
+{
+    protected $am;
+
+    public function __construct(LazyAssetManager $am)
+    {
+        $this->am = $am;
+    }
+
+    public function warmUp($cacheDir)
+    {
+        $this->am->load();
+    }
+
+    public function isOptional()
+    {
+        return true;
+    }
+}
diff --git a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/PhpTemplatingAssetsCacheWarmer.php b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/PhpTemplatingAssetsCacheWarmer.php
diff --git a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/TwigAssetsCacheWarmer.php b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/TwigAssetsCacheWarmer.php
diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
@@ -11,11 +11,13 @@

 namespace Symfony\Bundle\AsseticBundle\DependencyInjection;

-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;

 /**
 * Semantic asset configuration.
@@ -94,6 +96,56 @@ public function load(array $configs, ContainerBuilder $container)
        if ($container->hasParameter('assetic.less.compress')) {
            $container->getDefinition('assetic.filter.less')->addMethodCall('setCompress', array('%assetic.less.compress%'));
        }
+
+        $this->registerFormulaResources($container);
+    }
+
+    protected function registerFormulaResources(ContainerBuilder $container)
+    {
+        // bundle views/ directories
+        $am = $container->getDefinition('assetic.asset_manager');
+        foreach ($container->getParameter('kernel.bundles') as $name => $class) {
+            $rc = new \ReflectionClass($class);
+            if (is_dir($dir = dirname($rc->getFileName()).'/Resources/views')) {
+                foreach (array('twig', 'php') as $engine) {
+                    $container->setDefinition(
+                        'assetic.'.$engine.'_directory_resource.'.$name,
+                        $this->createDirectoryResourceDefinition($name, $dir, $engine)
+                    );
+                }
+            }
+        }
+
+        // kernel views/ directory
+        if (is_dir($dir = $container->getParameter('kernel.root_dir').'/views')) {
+            foreach (array('twig', 'php') as $engine) {
+                $container->setDefinition(
+                    'assetic.'.$engine.'_directory_resource.kernel',
+                    $this->createDirectoryResourceDefinition('', $dir, $engine)
+                );
+            }
+        }
+    }
+
+    /**
+     * @todo decorate an abstract xml definition
+     */
+    protected function createDirectoryResourceDefinition($bundle, $dir, $engine)
+    {
+        $definition = new Definition('%assetic.directory_resource.class%');
+
+        $definition
+            ->addArgument(new Reference('templating.name_parser'))
+            ->addArgument(new Reference('templating.loader'))
+            ->addArgument($bundle)
+            ->addArgument($dir)
+            ->addArgument('/\.'.$engine.'$/')
+            ->addTag('assetic.templating.'.$engine)
+            ->addTag('assetic.formula_resource', array('loader' => $engine))
+            ->setPublic(false)
+        ;
+
+        return $definition;
    }

    /**

diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/AssetManagerPass.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/AssetManagerPass.php
@@ -29,12 +29,34 @@ public function process(ContainerBuilder $container)
        }

        $am = $container->getDefinition('assetic.asset_manager');
+
+        // add assets
        foreach ($container->findTaggedServiceIds('assetic.asset') as $id => $attributes) {
            foreach ($attributes as $attr) {
                if (isset($attr['alias'])) {
                    $am->addMethodCall('set', array($attr['alias'], new Reference($id)));
                }
            }
        }
+
+        // add loaders
+        $loaders = array();
+        foreach ($container->findTaggedServiceIds('assetic.formula_loader') as $id => $attributes) {
+            foreach ($attributes as $attr) {
+                if (isset($attr['alias'])) {
+                    $loaders[$attr['alias']] = new Reference($id);
+                }
+            }
+        }
+        $am->setArgument(1, $loaders);
+
+        // add resources
+        foreach ($container->findTaggedServiceIds('assetic.formula_resource') as $id => $attributes) {
+            foreach ($attributes as $attr) {
+                if (isset($attr['loader'])) {
+                    $am->addMethodCall('addResource', array($attr['loader'], new Reference($id)));
+                }
+            }
+        }
    }
 }
diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/TemplatingPass.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/TemplatingPass.php
@@ -14,6 +14,11 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

+/**
+ * This pass removes services associated with unused templating engines.
+ *
+ * @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ */
 class TemplatingPass implements CompilerPassInterface
 {
    public function process(ContainerBuilder $container)
@@ -25,17 +30,13 @@ public function process(ContainerBuilder $container)
        $am = $container->getDefinition('assetic.asset_manager');
        $engines = $container->getParameterBag()->resolveValue($container->getParameter('templating.engines'));

-        if (in_array('twig', $engines)) {
-            $am->addMethodCall('addCacheFile', array('%kernel.cache_dir%/assetic_twig_assets.php'));
-        } else {
+        if (!in_array('twig', $engines)) {
            foreach ($container->findTaggedServiceIds('assetic.templating.twig') as $id => $attr) {
                $container->remove($id);
            }
        }

-        if (in_array('php', $engines)) {
-            // $am->addMethodCall('addCacheFile', array('%kernel.cache_dir%/assetic_php_assets.php'));
-        } else {
+        if (!in_array('php', $engines)) {
            foreach ($container->findTaggedServiceIds('assetic.templating.php') as $id => $attr) {
                $container->remove($id);
            }

diff --git a/src/Symfony/Bundle/AsseticBundle/Factory/AssetManager.php b/src/Symfony/Bundle/AsseticBundle/Factory/AssetManager.php