uppgrade to 2.0.19

app/bootstrap.php.cache

@@ -23,6 +23,9 @@ interface ContainerAwareInterface
 namespace Symfony\Component\DependencyInjection
 {
 
+use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+
 
 interface ContainerInterface
 {
@@ -455,11 +458,11 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION         = '2.0.17';
-    const VERSION_ID      = '20017';
+    const VERSION         = '2.0.19';
+    const VERSION_ID      = '20019';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '0';
-    const RELEASE_VERSION = '17';
+    const RELEASE_VERSION = '19';
     const EXTRA_VERSION   = '';
 
     
@@ -579,7 +582,7 @@ abstract class Kernel implements KernelInterface
     public function getBundle($name, $first = true)
     {
         if (!isset($this->bundleMap[$name])) {
-            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() function of your %s.php file?', $name, get_class($this)));
+            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this)));
         }
 
         if (true === $first) {
@@ -946,6 +949,7 @@ namespace Symfony\Component\ClassLoader
 class ClassCollectionLoader
 {
     private static $loaded;
+    private static $useTokenizer = true;
 
     
     public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
@@ -1028,7 +1032,11 @@ class ClassCollectionLoader
     
     public static function fixNamespaceDeclarations($source)
     {
-        if (!function_exists('token_get_all')) {
+        if (!function_exists('token_get_all') || !self::$useTokenizer) {
+            if (preg_match('/namespace(.*?)\s*;/', $source)) {
+                $source = preg_replace('/namespace(.*?)(\s*);/', "namespace$1$2\n{", $source)."}\n";
+            }
+
             return $source;
         }
 
@@ -1103,6 +1111,12 @@ class ClassCollectionLoader
 
         return $output;
     }
+
+    
+    public static function enableTokenizer($bool)
+    {
+        self::$useTokenizer = (Boolean) $bool;
+    }
 }
 }
  

deps

@@ -1,14 +1,14 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.17
+    version=v2.0.19
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.9.2
+    version=v1.10.3
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
-    version=1.0.2
+    version=1.2.1
 
 [doctrine-common]
     git=http://github.com/doctrine/common.git
@@ -24,14 +24,15 @@
 
 [swiftmailer]
     git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.2.1
+    version=v4.2.2
 
 [assetic]
     git=http://github.com/kriswallsmith/assetic.git
-    version=v1.0.3
+    version=v1.0.4
 
 [twig-extensions]
     git=http://github.com/fabpot/Twig-extensions.git
+    version=v1.0.0-alpha
 
 [metadata]
     git=http://github.com/schmittjoh/metadata.git

deps.lock

@@ -1,15 +1,15 @@
-symfony v2.0.17
-twig v1.9.2
-monolog 1.0.2
+symfony v2.0.19
+twig v1.10.3
+monolog 1.2.1
 doctrine-common 2.1.4
 doctrine-dbal 2.1.7
 doctrine 2.1.7
-swiftmailer v4.2.1
-assetic v1.0.3
-twig-extensions feb6d3f10c411e2631997c0a905aa581c80305c1
+swiftmailer v4.2.2
+assetic v1.0.4
+twig-extensions v1.0.0-alpha
 metadata 1.0.0
 SensioFrameworkExtraBundle v2.0.17
 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102
 SensioDistributionBundle v2.0.17
-SensioGeneratorBundle v2.0.17
+SensioGeneratorBundle v2.0.19
 AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052

vendor/assetic/CHANGELOG-1.0.md

@@ -1,3 +1,10 @@
+1.0.4 (August 28, 2012)
+-----------------------
+
+ * Fixed the Twig tag to avoid a fatal error when left unclosed
+ * Added the HashableInterface for non-serialiable filters
+ * Fixed a bug for compass on windows
+
 1.0.3 (March 2, 2012)
 ---------------------
 

vendor/assetic/README.md

@@ -280,4 +280,4 @@ Assetic is based on the Python [webassets][1] library (available on
 
 [1]: http://elsdoerfer.name/docs/webassets
 [2]: https://github.com/miracle2k/webassets
-[3]: http://www.twig-project.org
+[3]: http://twig.sensiolabs.org

vendor/assetic/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "kriswallsmith/assetic",
-    "description": "Asset Management for PHP 5.3",
+    "description": "Asset Management for PHP",
     "keywords": ["assets", "compression", "minification"],
     "homepage": "https://github.com/kriswallsmith/assetic",
     "type": "library",
@@ -13,9 +13,9 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.3.1"
     },
     "autoload": {
         "psr-0": { "Assetic": "src/" }
     }
-}
+}

vendor/assetic/src/Assetic/Asset/AssetCache.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,6 +13,7 @@ namespace Assetic\Asset;
 
 use Assetic\Cache\CacheInterface;
 use Assetic\Filter\FilterInterface;
+use Assetic\Filter\HashableInterface;
 
 /**
  * Caches an asset to avoid the cost of loading and dumping.
@@ -50,6 +51,7 @@ class AssetCache implements AssetInterface
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
         if ($this->cache->has($cacheKey)) {
             $this->asset->setContent($this->cache->get($cacheKey));
+
             return;
         }
 
@@ -122,7 +124,7 @@ class AssetCache implements AssetInterface
      *
      * @return string A key for identifying the current asset
      */
-    static private function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
+    private static function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
     {
         if ($additionalFilter) {
             $asset = clone $asset;
@@ -135,7 +137,11 @@ class AssetCache implements AssetInterface
         $cacheKey .= $asset->getLastModified();
 
         foreach ($asset->getFilters() as $filter) {
-            $cacheKey .= serialize($filter);
+            if ($filter instanceof HashableInterface) {
+                $cacheKey .= $filter->hash();
+            } else {
+                $cacheKey .= serialize($filter);
+            }
         }
 
         return md5($cacheKey.$salt);

vendor/assetic/src/Assetic/Asset/AssetCollection.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -140,8 +140,7 @@ class AssetCollection implements AssetInterface, \IteratorAggregate
             return;
         }
 
-        $mapper = function (AssetInterface $asset)
-        {
+        $mapper = function (AssetInterface $asset) {
             return $asset->getLastModified();
         };
 

vendor/assetic/src/Assetic/Asset/AssetInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,19 +25,19 @@ interface AssetInterface
      *
      * @param FilterInterface $filter A filter
      */
-    function ensureFilter(FilterInterface $filter);
+    public function ensureFilter(FilterInterface $filter);
 
     /**
      * Returns an array of filters currently applied.
      *
      * @return array An array of filters
      */
-    function getFilters();
+    public function getFilters();
 
     /**
      * Clears all filters from the current asset.
      */
-    function clearFilters();
+    public function clearFilters();
 
     /**
      * Loads the asset into memory and applies load filters.
@@ -46,7 +46,7 @@ interface AssetInterface
      *
      * @param FilterInterface $additionalFilter An additional filter
      */
-    function load(FilterInterface $additionalFilter = null);
+    public function load(FilterInterface $additionalFilter = null);
 
     /**
      * Applies dump filters and returns the asset as a string.
@@ -62,14 +62,14 @@ interface AssetInterface
      *
      * @return string The filtered content of the current asset
      */
-    function dump(FilterInterface $additionalFilter = null);
+    public function dump(FilterInterface $additionalFilter = null);
 
     /**
      * Returns the loaded content of the current asset.
      *
      * @return string The content
      */
-    function getContent();
+    public function getContent();
 
     /**
      * Sets the content of the current asset.
@@ -78,7 +78,7 @@ interface AssetInterface
      *
      * @param string $content The asset content
      */
-    function setContent($content);
+    public function setContent($content);
 
     /**
      * Returns an absolute path or URL to the source asset's root directory.
@@ -94,7 +94,7 @@ interface AssetInterface
      *
      * @return string|null The asset's root
      */
-    function getSourceRoot();
+    public function getSourceRoot();
 
     /**
      * Returns the relative path for the source asset.
@@ -110,26 +110,26 @@ interface AssetInterface
      *
      * @return string|null The source asset path
      */
-    function getSourcePath();
+    public function getSourcePath();
 
     /**
      * Returns the URL for the current asset.
      *
      * @return string|null A web URL where the asset will be dumped
      */
-    function getTargetPath();
+    public function getTargetPath();
 
     /**
      * Sets the URL for the current asset.
      *
      * @param string $targetPath A web URL where the asset will be dumped
      */
-    function setTargetPath($targetPath);
+    public function setTargetPath($targetPath);
 
     /**
      * Returns the time the current asset was last modified.
      *
      * @return integer|null A UNIX timestamp
      */
-    function getLastModified();
+    public function getLastModified();
 }

vendor/assetic/src/Assetic/Asset/AssetReference.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,6 @@
 namespace Assetic\Asset;
 
 use Assetic\AssetManager;
-use Assetic\Filter\FilterCollection;
 use Assetic\Filter\FilterInterface;
 
 /**

vendor/assetic/src/Assetic/Asset/BaseAsset.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Asset/FileAsset.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Asset/GlobAsset.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Asset/HttpAsset.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Asset/StringAsset.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/AssetManager.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/AssetWriter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -44,7 +44,7 @@ class AssetWriter
         static::write($this->dir . '/' . $asset->getTargetPath(), $asset->dump());
     }
 
-    static protected function write($path, $contents)
+    protected static function write($path, $contents)
     {
         if (!is_dir($dir = dirname($path)) && false === @mkdir($dir, 0777, true)) {
             throw new \RuntimeException('Unable to create directory '.$dir);

vendor/assetic/src/Assetic/Cache/CacheInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,7 +25,7 @@ interface CacheInterface
      *
      * @return Boolean Whether the cache has a value for this key
      */
-    function has($key);
+    public function has($key);
 
     /**
      * Returns the value for a key.
@@ -34,7 +34,7 @@ interface CacheInterface
      *
      * @return string|null The value in the cache
      */
-    function get($key);
+    public function get($key);
 
     /**
      * Sets a value in the cache.
@@ -42,12 +42,12 @@ interface CacheInterface
      * @param string $key   A unique key
      * @param string $value The value to cache
      */
-    function set($key, $value);
+    public function set($key, $value);
 
     /**
      * Removes a value from the cache.
      *
      * @param string $key A unique key
      */
-    function remove($key);
+    public function remove($key);
 }

vendor/assetic/src/Assetic/Cache/ConfigCache.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Cache/ExpiringCache.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Cache/FilesystemCache.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Extension/Twig/AsseticExtension.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,8 +11,6 @@
 
 namespace Assetic\Extension\Twig;
 
-use Assetic\Factory\AssetFactory;
-
 /**
  * Filters a single asset.
  *

vendor/assetic/src/Assetic/Extension/Twig/AsseticNode.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -101,9 +101,7 @@ class AsseticTokenParser extends \Twig_TokenParser
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
 
-        $endtag = 'end'.$this->getTag();
-        $test = function(\Twig_Token $token) use($endtag) { return $token->test($endtag); };
-        $body = $this->parser->subparse($test, true);
+        $body = $this->parser->subparse(array($this, 'testEndTag'), true);
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
 
@@ -125,6 +123,11 @@ class AsseticTokenParser extends \Twig_TokenParser
         return $this->tag;
     }
 
+    public function testEndTag(\Twig_Token $token)
+    {
+        return $token->test(array('end'.$this->getTag()));
+    }
+
     protected function createNode(AssetInterface $asset, \Twig_NodeInterface $body, array $inputs, array $filters, $name, array $attributes = array(), $lineno = 0, $tag = null)
     {
         return new AsseticNode($asset, $body, $inputs, $filters, $name, $attributes, $lineno, $tag);

vendor/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Extension/Twig/TwigResource.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/AssetFactory.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -335,7 +335,7 @@ class AssetFactory
         }
     }
 
-    static private function isAbsolutePath($path)
+    private static function isAbsolutePath($path)
     {
         return '/' == $path[0] || '\\' == $path[0] || (3 < strlen($path) && ctype_alpha($path[0]) && $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]));
     }
@@ -348,7 +348,7 @@ class AssetFactory
      *
      * @return string|null The matching root directory, if found
      */
-    static private function findRootDir($path, array $roots)
+    private static function findRootDir($path, array $roots)
     {
         foreach ($roots as $root) {
             if (0 === strpos($path, $root)) {

vendor/assetic/src/Assetic/Factory/LazyAssetManager.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -147,12 +147,12 @@ abstract class BasePhpFormulaLoader implements FormulaLoaderInterface
      */
     abstract protected function registerSetupCode();
 
-    static protected function tokenToString($token)
+    protected static function tokenToString($token)
     {
         return is_array($token) ? $token[1] : $token;
     }
 
-    static protected function argumentToArray($argument)
+    protected static function argumentToArray($argument)
     {
         return is_array($argument) ? $argument : array_filter(array_map('trim', explode(',', $argument)));
     }

vendor/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -30,5 +30,5 @@ interface FormulaLoaderInterface
      *
      * @return array An array of formulae
      */
-    function load(ResourceInterface $resource);
+    public function load(ResourceInterface $resource);
 }

vendor/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Resource/DirectoryResource.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -79,7 +79,7 @@ class DirectoryResource implements IteratorResourceInterface
 
     protected function getInnerIterator()
     {
-        return new DirectoryResourceFilterIterator(new \RecursiveDirectoryIterator($this->path), $this->pattern);
+        return new DirectoryResourceFilterIterator(new \RecursiveDirectoryIterator($this->path, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS), $this->pattern);
     }
 }
 
@@ -128,6 +128,6 @@ class DirectoryResourceFilterIterator extends \RecursiveFilterIterator
 
     public function getChildren()
     {
-        return new self(new \RecursiveDirectoryIterator($this->current()->getPathname()), $this->pattern);
+        return new self(new \RecursiveDirectoryIterator($this->current()->getPathname(), \RecursiveDirectoryIterator::FOLLOW_SYMLINKS), $this->pattern);
     }
 }

vendor/assetic/src/Assetic/Factory/Resource/FileResource.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Resource/ResourceInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,19 +25,19 @@ interface ResourceInterface
      *
      * @return Boolean True if the timestamp is up to date
      */
-    function isFresh($timestamp);
+    public function isFresh($timestamp);
 
     /**
      * Returns the content of the resource.
      *
      * @return string The content
      */
-    function getContent();
+    public function getContent();
 
     /**
      * Returns a unique string for the current resource.
      *
      * @return string A unique string to identity the current resource
      */
-    function __toString();
+    public function __toString();
 }

vendor/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Factory/Worker/WorkerInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,5 +25,5 @@ interface WorkerInterface
      *
      * @param AssetInterface $asset An asset
      */
-    function process(AssetInterface $asset);
+    public function process(AssetInterface $asset);
 }

vendor/assetic/src/Assetic/Filter/BaseCssFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/CallablesFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/CompassFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -46,7 +46,7 @@ class CompassFilter implements FilterInterface
     private $httpPath;
     private $httpImagesPath;
     private $httpJavascriptsPath;
-    
+
     public function __construct($compassPath = '/usr/bin/compass')
     {
         $this->compassPath = $compassPath;
@@ -108,7 +108,7 @@ class CompassFilter implements FilterInterface
     {
         $this->noLineComments = $noLineComments;
     }
-    
+
     public function setImagesDir($imagesDir)
     {
         $this->imagesDir = $imagesDir;
@@ -139,12 +139,12 @@ class CompassFilter implements FilterInterface
     {
         $this->httpPath = $httpPath;
     }
-    
+
     public function setHttpImagesPath($httpImagesPath)
     {
         $this->httpImagesPath = $httpImagesPath;
     }
-    
+
     public function setHttpJavascriptsPath($httpJavascriptsPath)
     {
         $this->httpJavascriptsPath = $httpJavascriptsPath;
@@ -271,7 +271,14 @@ class CompassFilter implements FilterInterface
         unlink($tempName); // FIXME: don't use tempnam() here
 
         // input
-        $pb->add($input = $tempName.'.'.$type);
+        $input = $tempName.'.'.$type;
+
+        // work-around for https://github.com/chriseppstein/compass/issues/748
+        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+            $input = str_replace('\\', '/', $input);
+        }
+
+        $pb->add($input);
         file_put_contents($input, $asset->getContent());
 
         // output
@@ -311,12 +318,12 @@ class CompassFilter implements FilterInterface
 
         // does we have an associative array ?
         if (count(array_filter(array_keys($array), "is_numeric")) != count($array)) {
-            foreach($array as $name => $value) {
+            foreach ($array as $name => $value) {
                 $output[] = sprintf('    :%s => "%s"', $name, addcslashes($value, '\\'));
             }
             $output = "{\n".implode(",\n", $output)."\n}";
         } else {
-            foreach($array as $name => $value) {
+            foreach ($array as $name => $value) {
                 $output[] = sprintf('    "%s"', addcslashes($value, '\\'));
             }
             $output = "[\n".implode(",\n", $output)."\n]";

vendor/assetic/src/Assetic/Filter/CssEmbedFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/CssImportFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -40,8 +40,7 @@ class CssImportFilter extends BaseCssFilter
         $sourceRoot = $asset->getSourceRoot();
         $sourcePath = $asset->getSourcePath();
 
-        $callback = function($matches) use($importFilter, $sourceRoot, $sourcePath)
-        {
+        $callback = function($matches) use ($importFilter, $sourceRoot, $sourcePath) {
             if (!$matches['url'] || null === $sourceRoot) {
                 return $matches[0];
             }

vendor/assetic/src/Assetic/Filter/CssMinFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/CssRewriteFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -67,8 +67,7 @@ class CssRewriteFilter extends BaseCssFilter
             }
         }
 
-        $content = $this->filterReferences($asset->getContent(), function($matches) use($host, $path)
-        {
+        $content = $this->filterReferences($asset->getContent(), function($matches) use ($host, $path) {
             if (false !== strpos($matches['url'], '://') || 0 === strpos($matches['url'], '//') || 0 === strpos($matches['url'], 'data:')) {
                 // absolute or protocol-relative or data uri
                 return $matches[0];

vendor/assetic/src/Assetic/Filter/FilterCollection.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/FilterInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,12 +25,12 @@ interface FilterInterface
      *
      * @param AssetInterface $asset An asset
      */
-    function filterLoad(AssetInterface $asset);
+    public function filterLoad(AssetInterface $asset);
 
     /**
      * Filters an asset just before it's dumped.
      *
      * @param AssetInterface $asset An asset
      */
-    function filterDump(AssetInterface $asset);
+    public function filterDump(AssetInterface $asset);
 }

vendor/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/HashableInterface.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Assetic package, an OpenSky project.
+ *
+ * (c) 2010-2012 OpenSky Project Inc
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Assetic\Filter;
+
+/**
+ * A filter can implement a hash function
+ *
+ * @author Francisco Facioni <fran6co@gmail.com>
+ */
+interface HashableInterface
+{
+    /**
+     * Generates a hash for the object
+     *
+     * @return string Object hash
+     */
+    public function hash();
+}

vendor/assetic/src/Assetic/Filter/JpegoptimFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/JpegtranFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/LessFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/LessphpFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/OptiPngFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/PackagerFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/PngoutFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/Sass/ScssFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/SprocketsFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/StylusFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -40,7 +40,7 @@ class StylusFilter implements FilterInterface
     /**
      * Enable output compression.
      *
-     * @param   boolean     $compress
+     * @param boolean $compress
      */
     public function setCompress($compress)
     {

vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/FilterManager.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/Assetic/Util/Process.php

@@ -106,8 +106,7 @@ class Process
         $this->stdout = '';
         $this->stderr = '';
         $that = $this;
-        $callback = function ($type, $data) use ($that, $callback)
-        {
+        $callback = function ($type, $data) use ($that, $callback) {
             if ('out' == $type) {
                 $that->addOutput($data);
             } else {

vendor/assetic/src/Assetic/Util/ProcessBuilder.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -97,7 +97,7 @@ class ProcessBuilder
 
         $options = $this->options;
 
-        if (defined('PHP_WINDOWS_MAJOR_VERSION')) {
+        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
             $options += array('bypass_shell' => true);
 
             $args = $this->arguments;
@@ -105,7 +105,7 @@ class ProcessBuilder
 
             $script = '"'.$cmd.'"';
             if ($args) {
-                $script .= ' '.implode(' ', array_map('escapeshellarg', $parts));
+                $script .= ' '.implode(' ', array_map('escapeshellarg', $args));
             }
         } else {
             $script = implode(' ', array_map('escapeshellarg', $this->arguments));

vendor/assetic/src/Assetic/Util/TraversableString.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/src/functions.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -47,8 +47,7 @@ class AssetCollectionTest extends \PHPUnit_Framework_TestCase
 
         $count = 0;
         $matches = array();
-        $filter = new CallablesFilter(function($asset) use ($content, & $matches, & $count)
-        {
+        $filter = new CallablesFilter(function($asset) use ($content, &$matches, &$count) {
             ++$count;
             if ($content == $asset->getContent()) {
                 $matches[] = $asset;
@@ -70,8 +69,7 @@ class AssetCollectionTest extends \PHPUnit_Framework_TestCase
         $innerColl = new AssetCollection(array($nestedAsset));
 
         $contents = array();
-        $filter = new CallablesFilter(function($asset) use(& $contents)
-        {
+        $filter = new CallablesFilter(function($asset) use (&$contents) {
             $contents[] = $asset->getContent();
         });
 
@@ -126,7 +124,7 @@ class AssetCollectionTest extends \PHPUnit_Framework_TestCase
     public function testIterationFilters()
     {
         $count = 0;
-        $filter = new CallablesFilter(function() use(&$count) { ++$count; });
+        $filter = new CallablesFilter(function() use (&$count) { ++$count; });
 
         $coll = new AssetCollection();
         $coll->add(new StringAsset(''));

vendor/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Asset/FileAssetTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Asset/StringAssetTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/AssetManagerTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/AssetWriterTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -34,8 +34,7 @@ class FilesystemCacheTest extends \PHPUnit_Framework_TestCase
     {
         $dir = sys_get_temp_dir().'/assetic/fscachetest';
 
-        $tearDown = function() use($dir)
-        {
+        $tearDown = function() use ($dir) {
             array_map('unlink', glob($dir.'/*'));
             @rmdir($dir);
         };

vendor/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -183,6 +183,14 @@ class AsseticExtensionTest extends \PHPUnit_Framework_TestCase
         $this->assertStringEndsWith('.css', (string) $xml->asset[0]['url']);
     }
 
+    /**
+     * @expectedException Twig_Error
+     */
+    public function testUnclosedTag()
+    {
+        $this->renderXml('unclosed_tag.twig');
+    }
+
     private function renderXml($name, $context = array())
     {
         return new \SimpleXMLElement($this->twig->loadTemplate($name)->render($context));

vendor/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -93,4 +93,15 @@ class TwigFormulaLoaderTest extends \PHPUnit_Framework_TestCase
         $formulae = $this->loader->load($resource);
         $this->assertEquals($expected, $formulae);
     }
+
+    public function testUnclosedTag()
+    {
+        $resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
+        $resource->expects($this->once())
+            ->method('getContent')
+            ->will($this->returnValue(file_get_contents(__DIR__.'/templates/unclosed_tag.twig')));
+
+        $formulae = $this->loader->load($resource);
+        $this->assertEquals(array(), $formulae);
+    }
 }

vendor/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig

@@ -0,0 +1,5 @@
+<assets>
+{% block assets %}
+{% stylesheets 'foo.css' 'bar.css' filter='?foo,bar' output='css/packed.css' debug=true %}<asset url="{{ asset_url }}" />
+{% endblock %}
+</assets>

vendor/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -105,4 +105,28 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
         $resource = new DirectoryResource(__DIR__.'foo');
         $this->assertEquals(0, iterator_count($resource), 'works for non-existent directory');
     }
+
+    public function testFollowSymlinks()
+    {
+        // Create the symlink if it doesn't already exist yet (if someone broke the entire testsuite perhaps)
+        if (!is_dir(__DIR__.'/Fixtures/dir3')) {
+            symlink(__DIR__.'/Fixtures/dir2', __DIR__.'/Fixtures/dir3');
+        }
+
+        $resource = new DirectoryResource(__DIR__.'/Fixtures');
+
+        $count = 0;
+        foreach ($resource as $r) {
+            ++$count;
+        }
+
+        $this->assertEquals(6, $count);
+    }
+
+    public function tearDown()
+    {
+        if (is_dir(__DIR__.'/Fixtures/dir3')) {
+            unlink(__DIR__.'/Fixtures/dir3');
+        }
+    }
 }

vendor/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

vendor/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Assetic package, an OpenSky project.
  *
- * (c) 2010-2011 OpenSky Project Inc
+ * (c) 2010-2012 OpenSky Project Inc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,7 @@ namespace Assetic\Test\Filter;
 
 abstract class BaseImageFilterTest extends \PHPUnit_Framework_TestCase
 {
-    static public function assertMimeType($expected, $data, $message = null)
+    public static function assertMimeType($expected, $data, $message = null)
     {
         $finfo = new \finfo(FILEINFO_MIME_TYPE);