Browse Source

symfony 2.0.11 to 2.0.12

Sevajol Bastien 11 years ago
parent
commit
6a7c93e985
100 changed files with 169 additions and 175 deletions
  1. 1 1
      app/bootstrap.php.cache
  2. 3 3
      deps
  3. 4 4
      deps.lock
  4. 0 73
      deps~
  5. 2 1
      vendor/assetic/.gitignore
  6. 13 0
      vendor/assetic/.travis.yml
  7. 7 0
      vendor/assetic/CHANGELOG-1.0.md
  8. 0 0
      vendor/assetic/README.md
  9. 21 0
      vendor/assetic/composer.json
  10. 0 0
      vendor/assetic/docs/en/build.md
  11. 0 0
      vendor/assetic/docs/en/concepts.md
  12. 0 0
      vendor/assetic/docs/en/define.md
  13. 0 0
      vendor/assetic/docs/en/index.md
  14. 0 0
      vendor/assetic/docs/en/introduction.md
  15. 0 0
      vendor/assetic/docs/ja/build.md
  16. 0 0
      vendor/assetic/docs/ja/concepts.md
  17. 0 0
      vendor/assetic/docs/ja/define.md
  18. 0 0
      vendor/assetic/docs/ja/index.md
  19. 0 0
      vendor/assetic/docs/ja/introduction.md
  20. 36 0
      vendor/assetic/phpunit.travis.xml
  21. 0 0
      vendor/assetic/phpunit.xml.dist
  22. 0 0
      vendor/assetic/src/Assetic/Asset/AssetCache.php
  23. 0 0
      vendor/assetic/src/Assetic/Asset/AssetCollection.php
  24. 0 0
      vendor/assetic/src/Assetic/Asset/AssetInterface.php
  25. 0 0
      vendor/assetic/src/Assetic/Asset/AssetReference.php
  26. 0 0
      vendor/assetic/src/Assetic/Asset/BaseAsset.php
  27. 0 0
      vendor/assetic/src/Assetic/Asset/FileAsset.php
  28. 0 0
      vendor/assetic/src/Assetic/Asset/GlobAsset.php
  29. 0 0
      vendor/assetic/src/Assetic/Asset/HttpAsset.php
  30. 0 0
      vendor/assetic/src/Assetic/Asset/StringAsset.php
  31. 0 0
      vendor/assetic/src/Assetic/AssetManager.php
  32. 0 0
      vendor/assetic/src/Assetic/AssetWriter.php
  33. 0 0
      vendor/assetic/src/Assetic/Cache/CacheInterface.php
  34. 0 0
      vendor/assetic/src/Assetic/Cache/ConfigCache.php
  35. 0 0
      vendor/assetic/src/Assetic/Cache/ExpiringCache.php
  36. 0 0
      vendor/assetic/src/Assetic/Cache/FilesystemCache.php
  37. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/AsseticExtension.php
  38. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php
  39. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php
  40. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/AsseticNode.php
  41. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php
  42. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php
  43. 0 0
      vendor/assetic/src/Assetic/Extension/Twig/TwigResource.php
  44. 4 4
      vendor/assetic/src/Assetic/Factory/AssetFactory.php
  45. 0 0
      vendor/assetic/src/Assetic/Factory/LazyAssetManager.php
  46. 0 0
      vendor/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php
  47. 0 0
      vendor/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php
  48. 0 0
      vendor/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php
  49. 0 0
      vendor/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php
  50. 0 0
      vendor/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php
  51. 0 0
      vendor/assetic/src/Assetic/Factory/Resource/DirectoryResource.php
  52. 0 0
      vendor/assetic/src/Assetic/Factory/Resource/FileResource.php
  53. 0 0
      vendor/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php
  54. 0 0
      vendor/assetic/src/Assetic/Factory/Resource/ResourceInterface.php
  55. 0 0
      vendor/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php
  56. 0 0
      vendor/assetic/src/Assetic/Factory/Worker/WorkerInterface.php
  57. 9 5
      vendor/assetic/src/Assetic/Filter/BaseCssFilter.php
  58. 0 0
      vendor/assetic/src/Assetic/Filter/CallablesFilter.php
  59. 6 8
      vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php
  60. 25 11
      vendor/assetic/src/Assetic/Filter/CompassFilter.php
  61. 5 7
      vendor/assetic/src/Assetic/Filter/CssEmbedFilter.php
  62. 1 5
      vendor/assetic/src/Assetic/Filter/CssImportFilter.php
  63. 0 0
      vendor/assetic/src/Assetic/Filter/CssMinFilter.php
  64. 3 3
      vendor/assetic/src/Assetic/Filter/CssRewriteFilter.php
  65. 0 0
      vendor/assetic/src/Assetic/Filter/FilterCollection.php
  66. 0 0
      vendor/assetic/src/Assetic/Filter/FilterInterface.php
  67. 0 0
      vendor/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php
  68. 0 0
      vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php
  69. 5 7
      vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php
  70. 1 5
      vendor/assetic/src/Assetic/Filter/JpegoptimFilter.php
  71. 1 5
      vendor/assetic/src/Assetic/Filter/JpegtranFilter.php
  72. 1 1
      vendor/assetic/src/Assetic/Filter/LessFilter.php
  73. 0 0
      vendor/assetic/src/Assetic/Filter/LessphpFilter.php
  74. 2 6
      vendor/assetic/src/Assetic/Filter/OptiPngFilter.php
  75. 0 0
      vendor/assetic/src/Assetic/Filter/PackagerFilter.php
  76. 1 5
      vendor/assetic/src/Assetic/Filter/PngoutFilter.php
  77. 1 5
      vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php
  78. 0 0
      vendor/assetic/src/Assetic/Filter/Sass/ScssFilter.php
  79. 4 6
      vendor/assetic/src/Assetic/Filter/SprocketsFilter.php
  80. 1 1
      vendor/assetic/src/Assetic/Filter/StylusFilter.php
  81. 5 7
      vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
  82. 0 0
      vendor/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php
  83. 0 0
      vendor/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php
  84. 0 0
      vendor/assetic/src/Assetic/FilterManager.php
  85. 0 0
      vendor/assetic/src/Assetic/Util/Process.php
  86. 7 2
      vendor/assetic/src/Assetic/Util/ProcessBuilder.php
  87. 0 0
      vendor/assetic/src/Assetic/Util/TraversableString.php
  88. 0 0
      vendor/assetic/src/functions.php
  89. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php
  90. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php
  91. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php
  92. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/FileAssetTest.php
  93. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php
  94. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php
  95. 0 0
      vendor/assetic/tests/Assetic/Test/Asset/StringAssetTest.php
  96. 0 0
      vendor/assetic/tests/Assetic/Test/AssetManagerTest.php
  97. 0 0
      vendor/assetic/tests/Assetic/Test/AssetWriterTest.php
  98. 0 0
      vendor/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php
  99. 0 0
      vendor/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php
  100. 0 0
      vendor/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php

+ 1 - 1
app/bootstrap.php.cache View File

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

+ 3 - 3
deps View File

@@ -1,10 +1,10 @@
1 1
 [symfony]
2 2
     git=http://github.com/symfony/symfony.git
3
-    version=v2.0.11
3
+    version=v2.0.12
4 4
 
5 5
 [twig]
6 6
     git=http://github.com/fabpot/Twig.git
7
-    version=v1.6.0
7
+    version=v1.6.2
8 8
 
9 9
 [monolog]
10 10
     git=http://github.com/Seldaek/monolog.git
@@ -28,7 +28,7 @@
28 28
 
29 29
 [assetic]
30 30
     git=http://github.com/kriswallsmith/assetic.git
31
-    version=v1.0.2
31
+    version=v1.0.3
32 32
 
33 33
 [twig-extensions]
34 34
     git=http://github.com/fabpot/Twig-extensions.git

+ 4 - 4
deps.lock View File

@@ -1,15 +1,15 @@
1
-symfony v2.0.11
2
-twig v1.6.0
1
+symfony v2.0.12
2
+twig v1.6.2
3 3
 monolog 1.0.2
4 4
 doctrine-common 2.1.4
5 5
 doctrine-dbal 2.1.6
6 6
 doctrine 2.1.6
7 7
 swiftmailer v4.1.5
8
-assetic v1.0.2
8
+assetic v1.0.3
9 9
 twig-extensions 1dfff8e793f50f651c4f74f796c2c68a4aee3147
10 10
 metadata 1.0.0
11 11
 SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
12 12
 JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5
13 13
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
14
-SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab
14
+SensioGeneratorBundle b1ccb78c1743f30817b0fce9bb5c6baff6ed7bf8
15 15
 AsseticBundle v1.0.1

+ 0 - 73
deps~ View File

@@ -1,73 +0,0 @@
1
-[symfony]
2
-    git=http://github.com/symfony/symfony.git
3
-    version=v2.0.8
4
-
5
-[twig]
6
-    git=http://github.com/fabpot/Twig.git
7
-    version=v1.4.0
8
-
9
-[monolog]
10
-    git=http://github.com/Seldaek/monolog.git
11
-    version=1.0.2
12
-
13
-[doctrine-common]
14
-    git=http://github.com/doctrine/common.git
15
-    version=2.1.4
16
-
17
-[doctrine-dbal]
18
-    git=http://github.com/doctrine/dbal.git
19
-    version=2.1.5
20
-
21
-[doctrine]
22
-    git=http://github.com/doctrine/doctrine2.git
23
-    version=2.1.5
24
-
25
-[swiftmailer]
26
-    git=http://github.com/swiftmailer/swiftmailer.git
27
-    version=v4.1.4
28
-
29
-[assetic]
30
-    git=http://github.com/kriswallsmith/assetic.git
31
-    version=v1.0.2
32
-
33
-[twig-extensions]
34
-    git=http://github.com/fabpot/Twig-extensions.git
35
-
36
-[metadata]
37
-    git=http://github.com/schmittjoh/metadata.git
38
-    version=1.0.0
39
-
40
-[SensioFrameworkExtraBundle]
41
-    git=http://github.com/sensio/SensioFrameworkExtraBundle.git
42
-    target=/bundles/Sensio/Bundle/FrameworkExtraBundle
43
-    version=origin/2.0
44
-
45
-[JMSSecurityExtraBundle]
46
-    git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git
47
-    target=/bundles/JMS/SecurityExtraBundle
48
-    version=origin/1.0.x
49
-
50
-[SensioDistributionBundle]
51
-    git=http://github.com/sensio/SensioDistributionBundle.git
52
-    target=/bundles/Sensio/Bundle/DistributionBundle
53
-    version=origin/2.0
54
-
55
-[SensioGeneratorBundle]
56
-    git=http://github.com/sensio/SensioGeneratorBundle.git
57
-    target=/bundles/Sensio/Bundle/GeneratorBundle
58
-
59
-[AsseticBundle]
60
-    git=http://github.com/symfony/AsseticBundle.git
61
-    target=/bundles/Symfony/Bundle/AsseticBundle
62
-    version=v1.0.1
63
-
64
-[FOSUserBundle]
65
-    git=git://github.com/FriendsOfSymfony/FOSUserBundle.git
66
-    target=bundles/FOS/UserBundle
67
-
68
-[doctrine-fixtures]
69
-    git=http://github.com/doctrine/data-fixtures.git
70
-
71
-[DoctrineFixturesBundle]
72
-    git=http://github.com/symfony/DoctrineFixturesBundle.git
73
-    target=/bundles/Symfony/Bundle/DoctrineFixturesBundle

+ 2 - 1
vendor/assetic/.gitignore View File

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

+ 13 - 0
vendor/assetic/.travis.yml View File

@@ -0,0 +1,13 @@
1
+language: php
2
+
3
+php:
4
+    - 5.3
5
+    - 5.4
6
+
7
+before_script:
8
+    - git clone https://github.com/kamicane/packager.git vendor/packager --quiet --depth 1
9
+    - git clone https://github.com/leafo/lessphp.git vendor/lessphp --quiet --depth 1
10
+    - git clone https://github.com/fabpot/Twig.git vendor/twig --quiet --depth 1
11
+    - svn checkout http://cssmin.googlecode.com/svn/trunk/ vendor/cssmin --quiet
12
+
13
+script: phpunit --configuration phpunit.travis.xml

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

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

+ 0 - 0
vendor/assetic/README.md View File


+ 21 - 0
vendor/assetic/composer.json View File

@@ -0,0 +1,21 @@
1
+{
2
+    "name": "kriswallsmith/assetic",
3
+    "description": "Asset Management for PHP 5.3",
4
+    "keywords": ["assets", "compression", "minification"],
5
+    "homepage": "https://github.com/kriswallsmith/assetic",
6
+    "type": "library",
7
+    "license": "MIT",
8
+    "authors": [
9
+        {
10
+            "name": "Kris Wallsmith",
11
+            "email": "kris.wallsmith@gmail.com",
12
+            "homepage": "http://kriswallsmith.net/"
13
+        }
14
+    ],
15
+    "require": {
16
+        "php": ">=5.3.0"
17
+    },
18
+    "autoload": {
19
+        "psr-0": { "Assetic": "src/" }
20
+    }
21
+}

+ 0 - 0
vendor/assetic/docs/en/build.md View File


+ 0 - 0
vendor/assetic/docs/en/concepts.md View File


+ 0 - 0
vendor/assetic/docs/en/define.md View File


+ 0 - 0
vendor/assetic/docs/en/index.md View File


+ 0 - 0
vendor/assetic/docs/en/introduction.md View File


+ 0 - 0
vendor/assetic/docs/ja/build.md View File


+ 0 - 0
vendor/assetic/docs/ja/concepts.md View File


+ 0 - 0
vendor/assetic/docs/ja/define.md View File


+ 0 - 0
vendor/assetic/docs/ja/index.md View File


+ 0 - 0
vendor/assetic/docs/ja/introduction.md View File


+ 36 - 0
vendor/assetic/phpunit.travis.xml View File

@@ -0,0 +1,36 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+
3
+<phpunit bootstrap="./tests/bootstrap.php" colors="true">
4
+    <testsuites>
5
+        <testsuite name="Assetic Test Suite">
6
+            <directory suffix="Test.php">./tests/Assetic/Test/</directory>
7
+        </testsuite>
8
+    </testsuites>
9
+
10
+    <php>
11
+        <!-- <server name="CLOSURE_JAR" value="/path/to/google-closure/compiler.jar" /> -->
12
+        <!-- <server name="COFFEE_BIN" value="/path/to/coffee" /> -->
13
+        <!-- <server name="NODE_BIN" value="/path/to/node" /> -->
14
+        <!-- <server name="NODE_PATH" value="/path/to/node/lib" /> -->
15
+        <server name="LESSPHP" value="vendor/lessphp/lessc.inc.php" />
16
+        <!-- <server name="SASS_BIN" value="/path/to/sass" /> -->
17
+        <!-- <server name="COMPASS_BIN" value="/path/to/compass" /> -->
18
+        <!-- <server name="RUBY_BIN" value="/path/to/ruby" /> -->
19
+        <!-- <server name="SPROCKETS_LIB" value="/path/to/sprockets/lib" /> -->
20
+        <server name="TWIG_LIB" value="vendor/twig/lib" />
21
+        <!-- <server name="YUI_COMPRESSOR_JAR" value="/path/to/yuicompressor-2.4.2.jar" /> -->
22
+        <!-- <server name="OPTIPNG_BIN" value="/path/to/optipng" /> -->
23
+        <!-- <server name="JPEGOPTIM_BIN" value="/path/to/jpegoptim" /> -->
24
+        <!-- <server name="JPEGTRAN_BIN" value="/path/to/jpegtran" /> -->
25
+        <!-- <server name="PNGOUT_BIN" value="/path/to/pngout" /> -->
26
+        <server name="CSSMIN" value="vendor/cssmin/source/CssMin.php" />
27
+        <!-- <server name="CSSEMBED_JAR" value="/path/to/cssembed.jar" /> -->
28
+        <server name="PACKAGER" value="vendor/packager/packager.php" />
29
+    </php>
30
+
31
+    <filter>
32
+        <whitelist>
33
+            <directory suffix=".php">./src/Assetic/</directory>
34
+        </whitelist>
35
+    </filter>
36
+</phpunit>

+ 0 - 0
vendor/assetic/phpunit.xml.dist View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/AssetCache.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/AssetCollection.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/AssetInterface.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/AssetReference.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/BaseAsset.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/FileAsset.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/GlobAsset.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/HttpAsset.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Asset/StringAsset.php View File


+ 0 - 0
vendor/assetic/src/Assetic/AssetManager.php View File


+ 0 - 0
vendor/assetic/src/Assetic/AssetWriter.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Cache/CacheInterface.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Cache/ConfigCache.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Cache/ExpiringCache.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Cache/FilesystemCache.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/AsseticExtension.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/AsseticNode.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Extension/Twig/TwigResource.php View File


+ 4 - 4
vendor/assetic/src/Assetic/Factory/AssetFactory.php View File

@@ -163,10 +163,6 @@ class AssetFactory
163 163
             $options['output'] = $this->output;
164 164
         }
165 165
 
166
-        if (!isset($options['name'])) {
167
-            $options['name'] = $this->generateAssetName($inputs, $filters, $options);
168
-        }
169
-
170 166
         if (!isset($options['debug'])) {
171 167
             $options['debug'] = $this->debug;
172 168
         }
@@ -181,6 +177,10 @@ class AssetFactory
181 177
             $options['root'][] = $this->root;
182 178
         }
183 179
 
180
+        if (!isset($options['name'])) {
181
+            $options['name'] = $this->generateAssetName($inputs, $filters, $options);
182
+        }
183
+
184 184
         $asset = $this->createAssetCollection();
185 185
         $extensions = array();
186 186
 

+ 0 - 0
vendor/assetic/src/Assetic/Factory/LazyAssetManager.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Resource/DirectoryResource.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Resource/FileResource.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Resource/ResourceInterface.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Factory/Worker/WorkerInterface.php View File


+ 9 - 5
vendor/assetic/src/Assetic/Filter/BaseCssFilter.php View File

@@ -19,7 +19,7 @@ namespace Assetic\Filter;
19 19
 abstract class BaseCssFilter implements FilterInterface
20 20
 {
21 21
     /**
22
-     * Filters all references -- url() and @import -- through a callable.
22
+     * Filters all references -- url() and "@import" -- through a callable.
23 23
      *
24 24
      * @param string $content  The CSS
25 25
      * @param mixed  $callback A PHP callable
@@ -37,8 +37,10 @@ abstract class BaseCssFilter implements FilterInterface
37 37
     /**
38 38
      * Filters all CSS url()'s through a callable.
39 39
      *
40
-     * @param string $content  The CSS
41
-     * @param mixed  $callback A PHP callable
40
+     * @param string  $content  The CSS
41
+     * @param mixed   $callback A PHP callable
42
+     * @param integer $limit    Limit the number of replacements
43
+     * @param integer $count    Will be populated with the count
42 44
      *
43 45
      * @return string The filtered CSS
44 46
      */
@@ -52,6 +54,8 @@ abstract class BaseCssFilter implements FilterInterface
52 54
      *
53 55
      * @param string  $content    The CSS
54 56
      * @param mixed   $callback   A PHP callable
57
+     * @param integer $limit      Limit the number of replacements
58
+     * @param integer $count      Will be populated with the count
55 59
      * @param Boolean $includeUrl Whether to include url() in the pattern
56 60
      *
57 61
      * @return string The filtered CSS
@@ -59,8 +63,8 @@ abstract class BaseCssFilter implements FilterInterface
59 63
     protected function filterImports($content, $callback, $limit = -1, & $count = 0, $includeUrl = true)
60 64
     {
61 65
         $pattern = $includeUrl
62
-            ? '/@import +(?:url)? *\(? *([\'"])?(?<url>.*?)\1 *\)? *;?/'
63
-            : '/@import +([\'"])(?<url>.*?)\1 *;?/';
66
+            ? '/@import (?:url\()?(\'|"|)(?<url>[^\'"\)\n\r]*)\1\)?;?/'
67
+            : '/@import (?!url\()(\'|"|)(?<url>[^\'"\)\n\r]*)\1;?/';
64 68
 
65 69
         return preg_replace_callback($pattern, $callback, $content, $limit, $count);
66 70
     }

+ 0 - 0
vendor/assetic/src/Assetic/Filter/CallablesFilter.php View File


+ 6 - 8
vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php View File

@@ -36,14 +36,12 @@ class CoffeeScriptFilter implements FilterInterface
36 36
         $input = tempnam(sys_get_temp_dir(), 'assetic_coffeescript');
37 37
         file_put_contents($input, $asset->getContent());
38 38
 
39
-        $pb = new ProcessBuilder();
40
-        $pb
41
-            ->inheritEnvironmentVariables()
42
-            ->add($this->nodePath)
43
-            ->add($this->coffeePath)
44
-            ->add('-cp')
45
-            ->add($input)
46
-        ;
39
+        $pb = new ProcessBuilder(array(
40
+            $this->nodePath,
41
+            $this->coffeePath,
42
+            '-cp',
43
+            $input,
44
+        ));
47 45
 
48 46
         $proc = $pb->getProcess();
49 47
         $code = $proc->run();

+ 25 - 11
vendor/assetic/src/Assetic/Filter/CompassFilter.php View File

@@ -35,6 +35,7 @@ class CompassFilter implements FilterInterface
35 35
     private $force;
36 36
     private $style;
37 37
     private $quiet;
38
+    private $boring;
38 39
     private $noLineComments;
39 40
     private $imagesDir;
40 41
     private $javascriptsDir;
@@ -50,6 +51,10 @@ class CompassFilter implements FilterInterface
50 51
     {
51 52
         $this->compassPath = $compassPath;
52 53
         $this->cacheLocation = sys_get_temp_dir();
54
+
55
+        if ('cli' !== php_sapi_name()) {
56
+            $this->boring = true;
57
+        }
53 58
     }
54 59
 
55 60
     public function setScss($scss)
@@ -94,6 +99,11 @@ class CompassFilter implements FilterInterface
94 99
         $this->quiet = $quiet;
95 100
     }
96 101
 
102
+    public function setBoring($boring)
103
+    {
104
+        $this->boring = $boring;
105
+    }
106
+
97 107
     public function setNoLineComments($noLineComments)
98 108
     {
99 109
         $this->noLineComments = $noLineComments;
@@ -145,20 +155,20 @@ class CompassFilter implements FilterInterface
145 155
         $root = $asset->getSourceRoot();
146 156
         $path = $asset->getSourcePath();
147 157
 
158
+        $loadPaths = $this->loadPaths;
148 159
         if ($root && $path) {
149
-            $this->loadPaths[] = dirname($root.'/'.$path);
160
+            $loadPaths[] = dirname($root.'/'.$path);
150 161
         }
151 162
 
152 163
         // compass does not seems to handle symlink, so we use realpath()
153 164
         $tempDir = realpath(sys_get_temp_dir());
154 165
 
155
-        $pb = new ProcessBuilder();
156
-        $pb
157
-            ->inheritEnvironmentVariables()
158
-            ->add($this->compassPath)
159
-            ->add('compile')
160
-            ->add($tempDir)
161
-        ;
166
+        $pb = new ProcessBuilder(array(
167
+            $this->compassPath,
168
+            'compile',
169
+            $tempDir,
170
+        ));
171
+        $pb->inheritEnvironmentVariables();
162 172
 
163 173
         if ($this->force) {
164 174
             $pb->add('--force');
@@ -172,6 +182,10 @@ class CompassFilter implements FilterInterface
172 182
             $pb->add('--quiet');
173 183
         }
174 184
 
185
+        if ($this->boring) {
186
+            $pb->add('--boring');
187
+        }
188
+
175 189
         if ($this->noLineComments) {
176 190
             $pb->add('--no-line-comments');
177 191
         }
@@ -190,8 +204,8 @@ class CompassFilter implements FilterInterface
190 204
         // options in config file
191 205
         $optionsConfig = array();
192 206
 
193
-        if (!empty($this->loadPaths)) {
194
-            $optionsConfig['additional_import_paths'] = $this->loadPaths;
207
+        if (!empty($loadPaths)) {
208
+            $optionsConfig['additional_import_paths'] = $loadPaths;
195 209
         }
196 210
 
197 211
         if ($this->unixNewlines) {
@@ -275,7 +289,7 @@ class CompassFilter implements FilterInterface
275 289
                 unlink($configFile);
276 290
             }
277 291
 
278
-            throw new \RuntimeException($proc->getErrorOutput() ?: $proc->getOutput());
292
+            throw new \RuntimeException($proc->getErrorOutput().'...'.$proc->getOutput());
279 293
         }
280 294
 
281 295
         $asset->setContent(file_get_contents($output));

+ 5 - 7
vendor/assetic/src/Assetic/Filter/CssEmbedFilter.php View File

@@ -79,13 +79,11 @@ class CssEmbedFilter implements FilterInterface
79 79
 
80 80
     public function filterDump(AssetInterface $asset)
81 81
     {
82
-        $pb = new ProcessBuilder();
83
-        $pb
84
-            ->inheritEnvironmentVariables()
85
-            ->add($this->javaPath)
86
-            ->add('-jar')
87
-            ->add($this->jarPath)
88
-        ;
82
+        $pb = new ProcessBuilder(array(
83
+            $this->javaPath,
84
+            '-jar',
85
+            $this->jarPath,
86
+        ));
89 87
 
90 88
         if (null !== $this->charset) {
91 89
             $pb->add('--charset')->add($this->charset);

+ 1 - 5
vendor/assetic/src/Assetic/Filter/CssImportFilter.php View File

@@ -42,11 +42,7 @@ class CssImportFilter extends BaseCssFilter
42 42
 
43 43
         $callback = function($matches) use($importFilter, $sourceRoot, $sourcePath)
44 44
         {
45
-            if (!$matches['url']) {
46
-                return $matches[0];
47
-            }
48
-
49
-            if (null === $sourceRoot) {
45
+            if (!$matches['url'] || null === $sourceRoot) {
50 46
                 return $matches[0];
51 47
             }
52 48
 

+ 0 - 0
vendor/assetic/src/Assetic/Filter/CssMinFilter.php View File


+ 3 - 3
vendor/assetic/src/Assetic/Filter/CssRewriteFilter.php View File

@@ -39,7 +39,7 @@ class CssRewriteFilter extends BaseCssFilter
39 39
             list($scheme, $url) = explode('://', $sourceBase.'/'.$sourcePath, 2);
40 40
             list($host, $path) = explode('/', $url, 2);
41 41
 
42
-            $host = $scheme.'://'.$host;
42
+            $host = $scheme.'://'.$host.'/';
43 43
             $path = false === strpos($path, '/') ? '' : dirname($path);
44 44
             $path .= '/';
45 45
         } else {
@@ -69,8 +69,8 @@ class CssRewriteFilter extends BaseCssFilter
69 69
 
70 70
         $content = $this->filterReferences($asset->getContent(), function($matches) use($host, $path)
71 71
         {
72
-            if (false !== strpos($matches['url'], '://') || 0 === strpos($matches['url'], '//')) {
73
-                // absolute or protocol-relative
72
+            if (false !== strpos($matches['url'], '://') || 0 === strpos($matches['url'], '//') || 0 === strpos($matches['url'], 'data:')) {
73
+                // absolute or protocol-relative or data uri
74 74
                 return $matches[0];
75 75
             }
76 76
 

+ 0 - 0
vendor/assetic/src/Assetic/Filter/FilterCollection.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Filter/FilterInterface.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php View File


+ 5 - 7
vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php View File

@@ -34,13 +34,11 @@ class CompilerJarFilter extends BaseCompilerFilter
34 34
     {
35 35
         $cleanup = array();
36 36
 
37
-        $pb = new ProcessBuilder();
38
-        $pb
39
-            ->inheritEnvironmentVariables()
40
-            ->add($this->javaPath)
41
-            ->add('-jar')
42
-            ->add($this->jarPath)
43
-        ;
37
+        $pb = new ProcessBuilder(array(
38
+            $this->javaPath,
39
+            '-jar',
40
+            $this->jarPath,
41
+        ));
44 42
 
45 43
         if (null !== $this->compilationLevel) {
46 44
             $pb->add('--compilation_level')->add($this->compilationLevel);

+ 1 - 5
vendor/assetic/src/Assetic/Filter/JpegoptimFilter.php View File

@@ -52,11 +52,7 @@ class JpegoptimFilter implements FilterInterface
52 52
 
53 53
     public function filterDump(AssetInterface $asset)
54 54
     {
55
-        $pb = new ProcessBuilder();
56
-        $pb
57
-            ->inheritEnvironmentVariables()
58
-            ->add($this->jpegoptimBin)
59
-        ;
55
+        $pb = new ProcessBuilder(array($this->jpegoptimBin));
60 56
 
61 57
         if ($this->stripAll) {
62 58
             $pb->add('--strip-all');

+ 1 - 5
vendor/assetic/src/Assetic/Filter/JpegtranFilter.php View File

@@ -67,11 +67,7 @@ class JpegtranFilter implements FilterInterface
67 67
 
68 68
     public function filterDump(AssetInterface $asset)
69 69
     {
70
-        $pb = new ProcessBuilder();
71
-        $pb
72
-            ->inheritEnvironmentVariables()
73
-            ->add($this->jpegtranBin)
74
-        ;
70
+        $pb = new ProcessBuilder(array($this->jpegtranBin));
75 71
 
76 72
         if ($this->optimize) {
77 73
             $pb->add('-optimize');

+ 1 - 1
vendor/assetic/src/Assetic/Filter/LessFilter.php View File

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

+ 0 - 0
vendor/assetic/src/Assetic/Filter/LessphpFilter.php View File


+ 2 - 6
vendor/assetic/src/Assetic/Filter/OptiPngFilter.php View File

@@ -46,11 +46,7 @@ class OptiPngFilter implements FilterInterface
46 46
 
47 47
     public function filterDump(AssetInterface $asset)
48 48
     {
49
-        $pb = new ProcessBuilder();
50
-        $pb
51
-            ->inheritEnvironmentVariables()
52
-            ->add($this->optipngBin)
53
-        ;
49
+        $pb = new ProcessBuilder(array($this->optipngBin));
54 50
 
55 51
         if (null !== $this->level) {
56 52
             $pb->add('-o')->add($this->level);
@@ -67,7 +63,7 @@ class OptiPngFilter implements FilterInterface
67 63
 
68 64
         if (0 < $code) {
69 65
             unlink($input);
70
-            throw new \RuntimeException($proc->getOutput());
66
+            throw new \RuntimeException($proc->getErrorOutput());
71 67
         }
72 68
 
73 69
         $asset->setContent(file_get_contents($output));

+ 0 - 0
vendor/assetic/src/Assetic/Filter/PackagerFilter.php View File


+ 1 - 5
vendor/assetic/src/Assetic/Filter/PngoutFilter.php View File

@@ -85,11 +85,7 @@ class PngoutFilter implements FilterInterface
85 85
 
86 86
     public function filterDump(AssetInterface $asset)
87 87
     {
88
-        $pb = new ProcessBuilder();
89
-        $pb
90
-            ->inheritEnvironmentVariables()
91
-            ->add($this->pngoutBin)
92
-        ;
88
+        $pb = new ProcessBuilder(array($this->pngoutBin));
93 89
 
94 90
         if (null !== $this->color) {
95 91
             $pb->add('-c'.$this->color);

+ 1 - 5
vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php View File

@@ -97,11 +97,7 @@ class SassFilter implements FilterInterface
97 97
 
98 98
     public function filterLoad(AssetInterface $asset)
99 99
     {
100
-        $pb = new ProcessBuilder();
101
-        $pb
102
-            ->inheritEnvironmentVariables()
103
-            ->add($this->sassPath)
104
-        ;
100
+        $pb = new ProcessBuilder(array($this->sassPath));
105 101
 
106 102
         $root = $asset->getSourceRoot();
107 103
         $path = $asset->getSourcePath();

+ 0 - 0
vendor/assetic/src/Assetic/Filter/Sass/ScssFilter.php View File


+ 4 - 6
vendor/assetic/src/Assetic/Filter/SprocketsFilter.php View File

@@ -101,12 +101,10 @@ EOF;
101 101
             $more
102 102
         ));
103 103
 
104
-        $pb = new ProcessBuilder();
105
-        $pb
106
-            ->inheritEnvironmentVariables()
107
-            ->add($this->rubyBin)
108
-            ->add($input)
109
-        ;
104
+        $pb = new ProcessBuilder(array(
105
+            $this->rubyBin,
106
+            $input,
107
+        ));
110 108
 
111 109
         $proc = $pb->getProcess();
112 110
         $code = $proc->run();

+ 1 - 1
vendor/assetic/src/Assetic/Filter/StylusFilter.php View File

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

+ 5 - 7
vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php View File

@@ -58,13 +58,11 @@ abstract class BaseCompressorFilter implements FilterInterface
58 58
      */
59 59
     protected function compress($content, $type, $options = array())
60 60
     {
61
-        $pb = new ProcessBuilder();
62
-        $pb
63
-            ->inheritEnvironmentVariables()
64
-            ->add($this->javaPath)
65
-            ->add('-jar')
66
-            ->add($this->jarPath)
67
-        ;
61
+        $pb = new ProcessBuilder(array(
62
+            $this->javaPath,
63
+            '-jar',
64
+            $this->jarPath,
65
+        ));
68 66
 
69 67
         foreach ($options as $option) {
70 68
             $pb->add($option);

+ 0 - 0
vendor/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php View File


+ 0 - 0
vendor/assetic/src/Assetic/FilterManager.php View File


+ 0 - 0
vendor/assetic/src/Assetic/Util/Process.php View File


+ 7 - 2
vendor/assetic/src/Assetic/Util/ProcessBuilder.php View File

@@ -18,7 +18,7 @@ namespace Assetic\Util;
18 18
  */
19 19
 class ProcessBuilder
20 20
 {
21
-    private $arguments = array();
21
+    private $arguments;
22 22
     private $cwd;
23 23
     private $env;
24 24
     private $stdin;
@@ -26,6 +26,11 @@ class ProcessBuilder
26 26
     private $options = array();
27 27
     private $inheritEnv = false;
28 28
 
29
+    public function __construct(array $arguments = array())
30
+    {
31
+        $this->arguments = $arguments;
32
+    }
33
+
29 34
     /**
30 35
      * Adds an unescaped argument to the command string.
31 36
      *
@@ -105,7 +110,7 @@ class ProcessBuilder
105 110
         } else {
106 111
             $script = implode(' ', array_map('escapeshellarg', $this->arguments));
107 112
         }
108
-        $env = $this->inheritEnv ? ($this->env ?: array()) + $_ENV : $this->env;
113
+        $env = $this->inheritEnv && $_ENV ? ($this->env ?: array()) + $_ENV : $this->env;
109 114
 
110 115
         return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);
111 116
     }

+ 0 - 0
vendor/assetic/src/Assetic/Util/TraversableString.php View File


+ 0 - 0
vendor/assetic/src/functions.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/FileAssetTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Asset/StringAssetTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/AssetManagerTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/AssetWriterTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php View File


+ 0 - 0
vendor/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php View File


Some files were not shown because too many files changed in this diff