diff -r 000000000000 -r 7f95f8617b0b vendor/bundles/Symfony/Bundle/AsseticBundle/Factory/AssetFactory.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/bundles/Symfony/Bundle/AsseticBundle/Factory/AssetFactory.php	Sat Sep 24 15:40:41 2011 +0200
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony framework.
+ *
+ * (c) Fabien Potencier <fabien@symfony.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\Factory;
+
+use Assetic\Factory\AssetFactory as BaseAssetFactory;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+/**
+ * Loads asset formulae from the filesystem.
+ *
+ * @author Kris Wallsmith <kris@symfony.com>
+ */
+class AssetFactory extends BaseAssetFactory
+{
+    private $kernel;
+    private $container;
+    private $parameterBag;
+
+    /**
+     * Constructor.
+     *
+     * @param KernelInterface       $kernel       The kernel is used to parse bundle notation
+     * @param ContainerInterface    $container    The container is used to load the managers lazily, thus avoiding a circular dependency
+     * @param ParameterBagInterface $parameterBag The container parameter bag
+     * @param string                $baseDir      The base directory for relative inputs
+     * @param Boolean               $debug        The current debug mode
+     */
+    public function __construct(KernelInterface $kernel, ContainerInterface $container, ParameterBagInterface $parameterBag, $baseDir, $debug = false)
+    {
+        $this->kernel = $kernel;
+        $this->container = $container;
+        $this->parameterBag = $parameterBag;
+
+        parent::__construct($baseDir, $debug);
+    }
+
+    /**
+     * Adds support for bundle notation file and glob assets and parameter placeholders.
+     *
+     * FIXME: This is a naive implementation of globs in that it doesn't
+     * attempt to support bundle inheritance within the glob pattern itself.
+     */
+    protected function parseInput($input, array $options = array())
+    {
+        $input = $this->parameterBag->resolveValue($input);
+
+        // expand bundle notation
+        if ('@' == $input[0] && false !== strpos($input, '/')) {
+            // use the bundle path as this asset's root
+            $bundle = substr($input, 1);
+            if (false !== $pos = strpos($bundle, '/')) {
+                $bundle = substr($bundle, 0, $pos);
+            }
+            $options['root'] = array($this->kernel->getBundle($bundle)->getPath());
+
+            // canonicalize the input
+            if (false !== $pos = strpos($input, '*')) {
+                // locateResource() does not support globs so we provide a naive implementation here
+                list($before, $after) = explode('*', $input, 2);
+                $input = $this->kernel->locateResource($before).'*'.$after;
+            } else {
+                $input = $this->kernel->locateResource($input);
+            }
+        }
+
+        return parent::parseInput($input, $options);
+    }
+
+    protected function createAssetReference($name)
+    {
+        if (!$this->getAssetManager()) {
+            $this->setAssetManager($this->container->get('assetic.asset_manager'));
+        }
+
+        return parent::createAssetReference($name);
+    }
+
+    protected function getFilter($name)
+    {
+        if (!$this->getFilterManager()) {
+            $this->setFilterManager($this->container->get('assetic.filter_manager'));
+        }
+
+        return parent::getFilter($name);
+    }
+}