symfony 2.0.11 to 2.0.12

app/bootstrap.php.cache

@@ -456,7 +456,7 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION = '2.0.11';
+    const VERSION = '2.0.12';
 
     
     public function __construct($environment, $debug)

deps

@@ -1,10 +1,10 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.11
+    version=v2.0.12
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.6.0
+    version=v1.6.2
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
@@ -28,7 +28,7 @@
 
 [assetic]
     git=http://github.com/kriswallsmith/assetic.git
-    version=v1.0.2
+    version=v1.0.3
 
 [twig-extensions]
     git=http://github.com/fabpot/Twig-extensions.git

deps.lock

@@ -1,15 +1,15 @@
-symfony v2.0.11
-twig v1.6.0
+symfony v2.0.12
+twig v1.6.2
 monolog 1.0.2
 doctrine-common 2.1.4
 doctrine-dbal 2.1.6
 doctrine 2.1.6
 swiftmailer v4.1.5
-assetic v1.0.2
+assetic v1.0.3
 twig-extensions 1dfff8e793f50f651c4f74f796c2c68a4aee3147
 metadata 1.0.0
 SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
 JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
-SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab
+SensioGeneratorBundle b1ccb78c1743f30817b0fce9bb5c6baff6ed7bf8
 AsseticBundle v1.0.1

deps~

@@ -1,73 +0,0 @@
-[symfony]
-    git=http://github.com/symfony/symfony.git
-    version=v2.0.8
-
-[twig]
-    git=http://github.com/fabpot/Twig.git
-    version=v1.4.0
-
-[monolog]
-    git=http://github.com/Seldaek/monolog.git
-    version=1.0.2
-
-[doctrine-common]
-    git=http://github.com/doctrine/common.git
-    version=2.1.4
-
-[doctrine-dbal]
-    git=http://github.com/doctrine/dbal.git
-    version=2.1.5
-
-[doctrine]
-    git=http://github.com/doctrine/doctrine2.git
-    version=2.1.5
-
-[swiftmailer]
-    git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.1.4
-
-[assetic]
-    git=http://github.com/kriswallsmith/assetic.git
-    version=v1.0.2
-
-[twig-extensions]
-    git=http://github.com/fabpot/Twig-extensions.git
-
-[metadata]
-    git=http://github.com/schmittjoh/metadata.git
-    version=1.0.0
-
-[SensioFrameworkExtraBundle]
-    git=http://github.com/sensio/SensioFrameworkExtraBundle.git
-    target=/bundles/Sensio/Bundle/FrameworkExtraBundle
-    version=origin/2.0
-
-[JMSSecurityExtraBundle]
-    git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git
-    target=/bundles/JMS/SecurityExtraBundle
-    version=origin/1.0.x
-
-[SensioDistributionBundle]
-    git=http://github.com/sensio/SensioDistributionBundle.git
-    target=/bundles/Sensio/Bundle/DistributionBundle
-    version=origin/2.0
-
-[SensioGeneratorBundle]
-    git=http://github.com/sensio/SensioGeneratorBundle.git
-    target=/bundles/Sensio/Bundle/GeneratorBundle
-
-[AsseticBundle]
-    git=http://github.com/symfony/AsseticBundle.git
-    target=/bundles/Symfony/Bundle/AsseticBundle
-    version=v1.0.1
-
-[FOSUserBundle]
-    git=git://github.com/FriendsOfSymfony/FOSUserBundle.git
-    target=bundles/FOS/UserBundle
-
-[doctrine-fixtures]
-    git=http://github.com/doctrine/data-fixtures.git
-
-[DoctrineFixturesBundle]
-    git=http://github.com/symfony/DoctrineFixturesBundle.git
-    target=/bundles/Symfony/Bundle/DoctrineFixturesBundle

vendor/assetic/.gitignore

@@ -1 +1,2 @@
-phpunit.xml
+phpunit.xml
+vendor/

vendor/assetic/.travis.yml

@@ -0,0 +1,13 @@
+language: php
+
+php:
+    - 5.3
+    - 5.4
+
+before_script:
+    - git clone https://github.com/kamicane/packager.git vendor/packager --quiet --depth 1
+    - git clone https://github.com/leafo/lessphp.git vendor/lessphp --quiet --depth 1
+    - git clone https://github.com/fabpot/Twig.git vendor/twig --quiet --depth 1
+    - svn checkout http://cssmin.googlecode.com/svn/trunk/ vendor/cssmin --quiet
+
+script: phpunit --configuration phpunit.travis.xml

vendor/assetic/CHANGELOG → vendor/assetic/CHANGELOG-1.0.md

@@ -1,3 +1,10 @@
+1.0.3 (March 2, 2012)
+---------------------
+
+ * Added "boring" option to Compass filter
+ * Fixed accumulation of load paths in Compass filter
+ * Fixed issues in CssImport and CssRewrite filters
+
 1.0.2 (August 26, 2011)
 -----------------------
 

vendor/assetic/composer.json

@@ -0,0 +1,21 @@
+{
+    "name": "kriswallsmith/assetic",
+    "description": "Asset Management for PHP 5.3",
+    "keywords": ["assets", "compression", "minification"],
+    "homepage": "https://github.com/kriswallsmith/assetic",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Kris Wallsmith",
+            "email": "kris.wallsmith@gmail.com",
+            "homepage": "http://kriswallsmith.net/"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-0": { "Assetic": "src/" }
+    }
+}

vendor/assetic/phpunit.travis.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+    <testsuites>
+        <testsuite name="Assetic Test Suite">
+            <directory suffix="Test.php">./tests/Assetic/Test/</directory>
+        </testsuite>
+    </testsuites>
+
+    <php>
+        <!-- <server name="CLOSURE_JAR" value="/path/to/google-closure/compiler.jar" /> -->
+        <!-- <server name="COFFEE_BIN" value="/path/to/coffee" /> -->
+        <!-- <server name="NODE_BIN" value="/path/to/node" /> -->
+        <!-- <server name="NODE_PATH" value="/path/to/node/lib" /> -->
+        <server name="LESSPHP" value="vendor/lessphp/lessc.inc.php" />
+        <!-- <server name="SASS_BIN" value="/path/to/sass" /> -->
+        <!-- <server name="COMPASS_BIN" value="/path/to/compass" /> -->
+        <!-- <server name="RUBY_BIN" value="/path/to/ruby" /> -->
+        <!-- <server name="SPROCKETS_LIB" value="/path/to/sprockets/lib" /> -->
+        <server name="TWIG_LIB" value="vendor/twig/lib" />
+        <!-- <server name="YUI_COMPRESSOR_JAR" value="/path/to/yuicompressor-2.4.2.jar" /> -->
+        <!-- <server name="OPTIPNG_BIN" value="/path/to/optipng" /> -->
+        <!-- <server name="JPEGOPTIM_BIN" value="/path/to/jpegoptim" /> -->
+        <!-- <server name="JPEGTRAN_BIN" value="/path/to/jpegtran" /> -->
+        <!-- <server name="PNGOUT_BIN" value="/path/to/pngout" /> -->
+        <server name="CSSMIN" value="vendor/cssmin/source/CssMin.php" />
+        <!-- <server name="CSSEMBED_JAR" value="/path/to/cssembed.jar" /> -->
+        <server name="PACKAGER" value="vendor/packager/packager.php" />
+    </php>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/Assetic/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

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

@@ -163,10 +163,6 @@ class AssetFactory
             $options['output'] = $this->output;
         }
 
-        if (!isset($options['name'])) {
-            $options['name'] = $this->generateAssetName($inputs, $filters, $options);
-        }
-
         if (!isset($options['debug'])) {
             $options['debug'] = $this->debug;
         }
@@ -181,6 +177,10 @@ class AssetFactory
             $options['root'][] = $this->root;
         }
 
+        if (!isset($options['name'])) {
+            $options['name'] = $this->generateAssetName($inputs, $filters, $options);
+        }
+
         $asset = $this->createAssetCollection();
         $extensions = array();
 

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

@@ -19,7 +19,7 @@ namespace Assetic\Filter;
 abstract class BaseCssFilter implements FilterInterface
 {
     /**
-     * Filters all references -- url() and @import -- through a callable.
+     * Filters all references -- url() and "@import" -- through a callable.
      *
      * @param string $content  The CSS
      * @param mixed  $callback A PHP callable
@@ -37,8 +37,10 @@ abstract class BaseCssFilter implements FilterInterface
     /**
      * Filters all CSS url()'s through a callable.
      *
-     * @param string $content  The CSS
-     * @param mixed  $callback A PHP callable
+     * @param string  $content  The CSS
+     * @param mixed   $callback A PHP callable
+     * @param integer $limit    Limit the number of replacements
+     * @param integer $count    Will be populated with the count
      *
      * @return string The filtered CSS
      */
@@ -52,6 +54,8 @@ abstract class BaseCssFilter implements FilterInterface
      *
      * @param string  $content    The CSS
      * @param mixed   $callback   A PHP callable
+     * @param integer $limit      Limit the number of replacements
+     * @param integer $count      Will be populated with the count
      * @param Boolean $includeUrl Whether to include url() in the pattern
      *
      * @return string The filtered CSS
@@ -59,8 +63,8 @@ abstract class BaseCssFilter implements FilterInterface
     protected function filterImports($content, $callback, $limit = -1, & $count = 0, $includeUrl = true)
     {
         $pattern = $includeUrl
-            ? '/@import +(?:url)? *\(? *([\'"])?(?<url>.*?)\1 *\)? *;?/'
-            : '/@import +([\'"])(?<url>.*?)\1 *;?/';
+            ? '/@import (?:url\()?(\'|"|)(?<url>[^\'"\)\n\r]*)\1\)?;?/'
+            : '/@import (?!url\()(\'|"|)(?<url>[^\'"\)\n\r]*)\1;?/';
 
         return preg_replace_callback($pattern, $callback, $content, $limit, $count);
     }

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

@@ -36,14 +36,12 @@ class CoffeeScriptFilter implements FilterInterface
         $input = tempnam(sys_get_temp_dir(), 'assetic_coffeescript');
         file_put_contents($input, $asset->getContent());
 
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->nodePath)
-            ->add($this->coffeePath)
-            ->add('-cp')
-            ->add($input)
-        ;
+        $pb = new ProcessBuilder(array(
+            $this->nodePath,
+            $this->coffeePath,
+            '-cp',
+            $input,
+        ));
 
         $proc = $pb->getProcess();
         $code = $proc->run();

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

@@ -35,6 +35,7 @@ class CompassFilter implements FilterInterface
     private $force;
     private $style;
     private $quiet;
+    private $boring;
     private $noLineComments;
     private $imagesDir;
     private $javascriptsDir;
@@ -50,6 +51,10 @@ class CompassFilter implements FilterInterface
     {
         $this->compassPath = $compassPath;
         $this->cacheLocation = sys_get_temp_dir();
+
+        if ('cli' !== php_sapi_name()) {
+            $this->boring = true;
+        }
     }
 
     public function setScss($scss)
@@ -94,6 +99,11 @@ class CompassFilter implements FilterInterface
         $this->quiet = $quiet;
     }
 
+    public function setBoring($boring)
+    {
+        $this->boring = $boring;
+    }
+
     public function setNoLineComments($noLineComments)
     {
         $this->noLineComments = $noLineComments;
@@ -145,20 +155,20 @@ class CompassFilter implements FilterInterface
         $root = $asset->getSourceRoot();
         $path = $asset->getSourcePath();
 
+        $loadPaths = $this->loadPaths;
         if ($root && $path) {
-            $this->loadPaths[] = dirname($root.'/'.$path);
+            $loadPaths[] = dirname($root.'/'.$path);
         }
 
         // compass does not seems to handle symlink, so we use realpath()
         $tempDir = realpath(sys_get_temp_dir());
 
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->compassPath)
-            ->add('compile')
-            ->add($tempDir)
-        ;
+        $pb = new ProcessBuilder(array(
+            $this->compassPath,
+            'compile',
+            $tempDir,
+        ));
+        $pb->inheritEnvironmentVariables();
 
         if ($this->force) {
             $pb->add('--force');
@@ -172,6 +182,10 @@ class CompassFilter implements FilterInterface
             $pb->add('--quiet');
         }
 
+        if ($this->boring) {
+            $pb->add('--boring');
+        }
+
         if ($this->noLineComments) {
             $pb->add('--no-line-comments');
         }
@@ -190,8 +204,8 @@ class CompassFilter implements FilterInterface
         // options in config file
         $optionsConfig = array();
 
-        if (!empty($this->loadPaths)) {
-            $optionsConfig['additional_import_paths'] = $this->loadPaths;
+        if (!empty($loadPaths)) {
+            $optionsConfig['additional_import_paths'] = $loadPaths;
         }
 
         if ($this->unixNewlines) {
@@ -275,7 +289,7 @@ class CompassFilter implements FilterInterface
                 unlink($configFile);
             }
 
-            throw new \RuntimeException($proc->getErrorOutput() ?: $proc->getOutput());
+            throw new \RuntimeException($proc->getErrorOutput().'...'.$proc->getOutput());
         }
 
         $asset->setContent(file_get_contents($output));

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

@@ -79,13 +79,11 @@ class CssEmbedFilter implements FilterInterface
 
     public function filterDump(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->javaPath)
-            ->add('-jar')
-            ->add($this->jarPath)
-        ;
+        $pb = new ProcessBuilder(array(
+            $this->javaPath,
+            '-jar',
+            $this->jarPath,
+        ));
 
         if (null !== $this->charset) {
             $pb->add('--charset')->add($this->charset);

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

@@ -42,11 +42,7 @@ class CssImportFilter extends BaseCssFilter
 
         $callback = function($matches) use($importFilter, $sourceRoot, $sourcePath)
         {
-            if (!$matches['url']) {
-                return $matches[0];
-            }
-
-            if (null === $sourceRoot) {
+            if (!$matches['url'] || null === $sourceRoot) {
                 return $matches[0];
             }
 

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

@@ -39,7 +39,7 @@ class CssRewriteFilter extends BaseCssFilter
             list($scheme, $url) = explode('://', $sourceBase.'/'.$sourcePath, 2);
             list($host, $path) = explode('/', $url, 2);
 
-            $host = $scheme.'://'.$host;
+            $host = $scheme.'://'.$host.'/';
             $path = false === strpos($path, '/') ? '' : dirname($path);
             $path .= '/';
         } else {
@@ -69,8 +69,8 @@ class CssRewriteFilter extends BaseCssFilter
 
         $content = $this->filterReferences($asset->getContent(), function($matches) use($host, $path)
         {
-            if (false !== strpos($matches['url'], '://') || 0 === strpos($matches['url'], '//')) {
-                // absolute or protocol-relative
+            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/GoogleClosure/CompilerJarFilter.php

@@ -34,13 +34,11 @@ class CompilerJarFilter extends BaseCompilerFilter
     {
         $cleanup = array();
 
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->javaPath)
-            ->add('-jar')
-            ->add($this->jarPath)
-        ;
+        $pb = new ProcessBuilder(array(
+            $this->javaPath,
+            '-jar',
+            $this->jarPath,
+        ));
 
         if (null !== $this->compilationLevel) {
             $pb->add('--compilation_level')->add($this->compilationLevel);

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

@@ -52,11 +52,7 @@ class JpegoptimFilter implements FilterInterface
 
     public function filterDump(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->jpegoptimBin)
-        ;
+        $pb = new ProcessBuilder(array($this->jpegoptimBin));
 
         if ($this->stripAll) {
             $pb->add('--strip-all');

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

@@ -67,11 +67,7 @@ class JpegtranFilter implements FilterInterface
 
     public function filterDump(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->jpegtranBin)
-        ;
+        $pb = new ProcessBuilder(array($this->jpegtranBin));
 
         if ($this->optimize) {
             $pb->add('-optimize');

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

@@ -46,7 +46,7 @@ class LessFilter implements FilterInterface
     {
         static $format = <<<'EOF'
 var less = require('less');
-var sys  = require('sys');
+var sys  = require(process.binding('natives').util ? 'util' : 'sys');
 
 new(less.Parser)(%s).parse(%s, function(e, tree) {
     if (e) {

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

@@ -46,11 +46,7 @@ class OptiPngFilter implements FilterInterface
 
     public function filterDump(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->optipngBin)
-        ;
+        $pb = new ProcessBuilder(array($this->optipngBin));
 
         if (null !== $this->level) {
             $pb->add('-o')->add($this->level);
@@ -67,7 +63,7 @@ class OptiPngFilter implements FilterInterface
 
         if (0 < $code) {
             unlink($input);
-            throw new \RuntimeException($proc->getOutput());
+            throw new \RuntimeException($proc->getErrorOutput());
         }
 
         $asset->setContent(file_get_contents($output));

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

@@ -85,11 +85,7 @@ class PngoutFilter implements FilterInterface
 
     public function filterDump(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->pngoutBin)
-        ;
+        $pb = new ProcessBuilder(array($this->pngoutBin));
 
         if (null !== $this->color) {
             $pb->add('-c'.$this->color);

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

@@ -97,11 +97,7 @@ class SassFilter implements FilterInterface
 
     public function filterLoad(AssetInterface $asset)
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->sassPath)
-        ;
+        $pb = new ProcessBuilder(array($this->sassPath));
 
         $root = $asset->getSourceRoot();
         $path = $asset->getSourcePath();

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

@@ -101,12 +101,10 @@ EOF;
             $more
         ));
 
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->rubyBin)
-            ->add($input)
-        ;
+        $pb = new ProcessBuilder(array(
+            $this->rubyBin,
+            $input,
+        ));
 
         $proc = $pb->getProcess();
         $code = $proc->run();

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

@@ -54,7 +54,7 @@ class StylusFilter implements FilterInterface
     {
         static $format = <<<'EOF'
 var stylus = require('stylus');
-var sys    = require('sys');
+var sys    = require(process.binding('natives').util ? 'util' : 'sys');
 
 stylus(%s, %s).render(function(e, css){
     if (e) {

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

@@ -58,13 +58,11 @@ abstract class BaseCompressorFilter implements FilterInterface
      */
     protected function compress($content, $type, $options = array())
     {
-        $pb = new ProcessBuilder();
-        $pb
-            ->inheritEnvironmentVariables()
-            ->add($this->javaPath)
-            ->add('-jar')
-            ->add($this->jarPath)
-        ;
+        $pb = new ProcessBuilder(array(
+            $this->javaPath,
+            '-jar',
+            $this->jarPath,
+        ));
 
         foreach ($options as $option) {
             $pb->add($option);

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

@@ -18,7 +18,7 @@ namespace Assetic\Util;
  */
 class ProcessBuilder
 {
-    private $arguments = array();
+    private $arguments;
     private $cwd;
     private $env;
     private $stdin;
@@ -26,6 +26,11 @@ class ProcessBuilder
     private $options = array();
     private $inheritEnv = false;
 
+    public function __construct(array $arguments = array())
+    {
+        $this->arguments = $arguments;
+    }
+
     /**
      * Adds an unescaped argument to the command string.
      *
@@ -105,7 +110,7 @@ class ProcessBuilder
         } else {
             $script = implode(' ', array_map('escapeshellarg', $this->arguments));
         }
-        $env = $this->inheritEnv ? ($this->env ?: array()) + $_ENV : $this->env;
+        $env = $this->inheritEnv && $_ENV ? ($this->env ?: array()) + $_ENV : $this->env;
 
         return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);
     }