浏览代码

uppgrade to 2.0.19

Sevajol Bastien 12 年前
父节点
当前提交
c7c71342c9
共有 100 个文件被更改,包括 278 次插入175 次删除
  1. 19 5
      app/bootstrap.php.cache
  2. 6 5
      deps
  3. 7 7
      deps.lock
  4. 7 0
      vendor/assetic/CHANGELOG-1.0.md
  5. 1 1
      vendor/assetic/README.md
  6. 3 3
      vendor/assetic/composer.json
  7. 9 3
      vendor/assetic/src/Assetic/Asset/AssetCache.php
  8. 2 3
      vendor/assetic/src/Assetic/Asset/AssetCollection.php
  9. 13 13
      vendor/assetic/src/Assetic/Asset/AssetInterface.php
  10. 1 2
      vendor/assetic/src/Assetic/Asset/AssetReference.php
  11. 1 1
      vendor/assetic/src/Assetic/Asset/BaseAsset.php
  12. 1 1
      vendor/assetic/src/Assetic/Asset/FileAsset.php
  13. 1 1
      vendor/assetic/src/Assetic/Asset/GlobAsset.php
  14. 1 1
      vendor/assetic/src/Assetic/Asset/HttpAsset.php
  15. 1 1
      vendor/assetic/src/Assetic/Asset/StringAsset.php
  16. 1 1
      vendor/assetic/src/Assetic/AssetManager.php
  17. 2 2
      vendor/assetic/src/Assetic/AssetWriter.php
  18. 5 5
      vendor/assetic/src/Assetic/Cache/CacheInterface.php
  19. 1 1
      vendor/assetic/src/Assetic/Cache/ConfigCache.php
  20. 1 1
      vendor/assetic/src/Assetic/Cache/ExpiringCache.php
  21. 1 1
      vendor/assetic/src/Assetic/Cache/FilesystemCache.php
  22. 1 1
      vendor/assetic/src/Assetic/Extension/Twig/AsseticExtension.php
  23. 1 1
      vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php
  24. 1 3
      vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php
  25. 1 1
      vendor/assetic/src/Assetic/Extension/Twig/AsseticNode.php
  26. 7 4
      vendor/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php
  27. 1 1
      vendor/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php
  28. 1 1
      vendor/assetic/src/Assetic/Extension/Twig/TwigResource.php
  29. 3 3
      vendor/assetic/src/Assetic/Factory/AssetFactory.php
  30. 1 1
      vendor/assetic/src/Assetic/Factory/LazyAssetManager.php
  31. 3 3
      vendor/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php
  32. 1 1
      vendor/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php
  33. 2 2
      vendor/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php
  34. 1 1
      vendor/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php
  35. 1 1
      vendor/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php
  36. 3 3
      vendor/assetic/src/Assetic/Factory/Resource/DirectoryResource.php
  37. 1 1
      vendor/assetic/src/Assetic/Factory/Resource/FileResource.php
  38. 1 1
      vendor/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php
  39. 4 4
      vendor/assetic/src/Assetic/Factory/Resource/ResourceInterface.php
  40. 1 1
      vendor/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php
  41. 2 2
      vendor/assetic/src/Assetic/Factory/Worker/WorkerInterface.php
  42. 1 1
      vendor/assetic/src/Assetic/Filter/BaseCssFilter.php
  43. 1 1
      vendor/assetic/src/Assetic/Filter/CallablesFilter.php
  44. 1 1
      vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php
  45. 15 8
      vendor/assetic/src/Assetic/Filter/CompassFilter.php
  46. 1 1
      vendor/assetic/src/Assetic/Filter/CssEmbedFilter.php
  47. 2 3
      vendor/assetic/src/Assetic/Filter/CssImportFilter.php
  48. 1 1
      vendor/assetic/src/Assetic/Filter/CssMinFilter.php
  49. 2 3
      vendor/assetic/src/Assetic/Filter/CssRewriteFilter.php
  50. 1 1
      vendor/assetic/src/Assetic/Filter/FilterCollection.php
  51. 3 3
      vendor/assetic/src/Assetic/Filter/FilterInterface.php
  52. 1 1
      vendor/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php
  53. 1 1
      vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php
  54. 1 1
      vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php
  55. 27 0
      vendor/assetic/src/Assetic/Filter/HashableInterface.php
  56. 1 1
      vendor/assetic/src/Assetic/Filter/JpegoptimFilter.php
  57. 1 1
      vendor/assetic/src/Assetic/Filter/JpegtranFilter.php
  58. 1 1
      vendor/assetic/src/Assetic/Filter/LessFilter.php
  59. 1 1
      vendor/assetic/src/Assetic/Filter/LessphpFilter.php
  60. 1 1
      vendor/assetic/src/Assetic/Filter/OptiPngFilter.php
  61. 1 1
      vendor/assetic/src/Assetic/Filter/PackagerFilter.php
  62. 1 1
      vendor/assetic/src/Assetic/Filter/PngoutFilter.php
  63. 1 1
      vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php
  64. 1 1
      vendor/assetic/src/Assetic/Filter/Sass/ScssFilter.php
  65. 1 1
      vendor/assetic/src/Assetic/Filter/SprocketsFilter.php
  66. 2 2
      vendor/assetic/src/Assetic/Filter/StylusFilter.php
  67. 1 1
      vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
  68. 1 1
      vendor/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php
  69. 1 1
      vendor/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php
  70. 1 1
      vendor/assetic/src/Assetic/FilterManager.php
  71. 1 2
      vendor/assetic/src/Assetic/Util/Process.php
  72. 3 3
      vendor/assetic/src/Assetic/Util/ProcessBuilder.php
  73. 1 1
      vendor/assetic/src/Assetic/Util/TraversableString.php
  74. 1 1
      vendor/assetic/src/functions.php
  75. 1 1
      vendor/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php
  76. 4 6
      vendor/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php
  77. 1 1
      vendor/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php
  78. 1 1
      vendor/assetic/tests/Assetic/Test/Asset/FileAssetTest.php
  79. 1 1
      vendor/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php
  80. 1 1
      vendor/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php
  81. 1 1
      vendor/assetic/tests/Assetic/Test/Asset/StringAssetTest.php
  82. 1 1
      vendor/assetic/tests/Assetic/Test/AssetManagerTest.php
  83. 1 1
      vendor/assetic/tests/Assetic/Test/AssetWriterTest.php
  84. 1 1
      vendor/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php
  85. 1 1
      vendor/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php
  86. 2 3
      vendor/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php
  87. 9 1
      vendor/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php
  88. 12 1
      vendor/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php
  89. 1 1
      vendor/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php
  90. 5 0
      vendor/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig
  91. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php
  92. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php
  93. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php
  94. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php
  95. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php
  96. 25 1
      vendor/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php
  97. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php
  98. 1 1
      vendor/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php
  99. 2 2
      vendor/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php
  100. 0 0
      vendor/assetic/tests/Assetic/Test/Filter/CallablesFilterTest.php

+ 19 - 5
app/bootstrap.php.cache 查看文件

23
 namespace Symfony\Component\DependencyInjection
23
 namespace Symfony\Component\DependencyInjection
24
 {
24
 {
25
 
25
 
26
+use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
27
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
28
+
26
 
29
 
27
 interface ContainerInterface
30
 interface ContainerInterface
28
 {
31
 {
455
     protected $startTime;
458
     protected $startTime;
456
     protected $classes;
459
     protected $classes;
457
 
460
 
458
-    const VERSION         = '2.0.17';
459
-    const VERSION_ID      = '20017';
461
+    const VERSION         = '2.0.19';
462
+    const VERSION_ID      = '20019';
460
     const MAJOR_VERSION   = '2';
463
     const MAJOR_VERSION   = '2';
461
     const MINOR_VERSION   = '0';
464
     const MINOR_VERSION   = '0';
462
-    const RELEASE_VERSION = '17';
465
+    const RELEASE_VERSION = '19';
463
     const EXTRA_VERSION   = '';
466
     const EXTRA_VERSION   = '';
464
 
467
 
465
     
468
     
579
     public function getBundle($name, $first = true)
582
     public function getBundle($name, $first = true)
580
     {
583
     {
581
         if (!isset($this->bundleMap[$name])) {
584
         if (!isset($this->bundleMap[$name])) {
582
-            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)));
585
+            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)));
583
         }
586
         }
584
 
587
 
585
         if (true === $first) {
588
         if (true === $first) {
946
 class ClassCollectionLoader
949
 class ClassCollectionLoader
947
 {
950
 {
948
     private static $loaded;
951
     private static $loaded;
952
+    private static $useTokenizer = true;
949
 
953
 
950
     
954
     
951
     public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
955
     public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
1028
     
1032
     
1029
     public static function fixNamespaceDeclarations($source)
1033
     public static function fixNamespaceDeclarations($source)
1030
     {
1034
     {
1031
-        if (!function_exists('token_get_all')) {
1035
+        if (!function_exists('token_get_all') || !self::$useTokenizer) {
1036
+            if (preg_match('/namespace(.*?)\s*;/', $source)) {
1037
+                $source = preg_replace('/namespace(.*?)(\s*);/', "namespace$1$2\n{", $source)."}\n";
1038
+            }
1039
+
1032
             return $source;
1040
             return $source;
1033
         }
1041
         }
1034
 
1042
 
1103
 
1111
 
1104
         return $output;
1112
         return $output;
1105
     }
1113
     }
1114
+
1115
+    
1116
+    public static function enableTokenizer($bool)
1117
+    {
1118
+        self::$useTokenizer = (Boolean) $bool;
1119
+    }
1106
 }
1120
 }
1107
 }
1121
 }
1108
  
1122
  

+ 6 - 5
deps 查看文件

1
 [symfony]
1
 [symfony]
2
     git=http://github.com/symfony/symfony.git
2
     git=http://github.com/symfony/symfony.git
3
-    version=v2.0.17
3
+    version=v2.0.19
4
 
4
 
5
 [twig]
5
 [twig]
6
     git=http://github.com/fabpot/Twig.git
6
     git=http://github.com/fabpot/Twig.git
7
-    version=v1.9.2
7
+    version=v1.10.3
8
 
8
 
9
 [monolog]
9
 [monolog]
10
     git=http://github.com/Seldaek/monolog.git
10
     git=http://github.com/Seldaek/monolog.git
11
-    version=1.0.2
11
+    version=1.2.1
12
 
12
 
13
 [doctrine-common]
13
 [doctrine-common]
14
     git=http://github.com/doctrine/common.git
14
     git=http://github.com/doctrine/common.git
24
 
24
 
25
 [swiftmailer]
25
 [swiftmailer]
26
     git=http://github.com/swiftmailer/swiftmailer.git
26
     git=http://github.com/swiftmailer/swiftmailer.git
27
-    version=v4.2.1
27
+    version=v4.2.2
28
 
28
 
29
 [assetic]
29
 [assetic]
30
     git=http://github.com/kriswallsmith/assetic.git
30
     git=http://github.com/kriswallsmith/assetic.git
31
-    version=v1.0.3
31
+    version=v1.0.4
32
 
32
 
33
 [twig-extensions]
33
 [twig-extensions]
34
     git=http://github.com/fabpot/Twig-extensions.git
34
     git=http://github.com/fabpot/Twig-extensions.git
35
+    version=v1.0.0-alpha
35
 
36
 
36
 [metadata]
37
 [metadata]
37
     git=http://github.com/schmittjoh/metadata.git
38
     git=http://github.com/schmittjoh/metadata.git

+ 7 - 7
deps.lock 查看文件

1
-symfony v2.0.17
2
-twig v1.9.2
3
-monolog 1.0.2
1
+symfony v2.0.19
2
+twig v1.10.3
3
+monolog 1.2.1
4
 doctrine-common 2.1.4
4
 doctrine-common 2.1.4
5
 doctrine-dbal 2.1.7
5
 doctrine-dbal 2.1.7
6
 doctrine 2.1.7
6
 doctrine 2.1.7
7
-swiftmailer v4.2.1
8
-assetic v1.0.3
9
-twig-extensions feb6d3f10c411e2631997c0a905aa581c80305c1
7
+swiftmailer v4.2.2
8
+assetic v1.0.4
9
+twig-extensions v1.0.0-alpha
10
 metadata 1.0.0
10
 metadata 1.0.0
11
 SensioFrameworkExtraBundle v2.0.17
11
 SensioFrameworkExtraBundle v2.0.17
12
 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102
12
 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102
13
 SensioDistributionBundle v2.0.17
13
 SensioDistributionBundle v2.0.17
14
-SensioGeneratorBundle v2.0.17
14
+SensioGeneratorBundle v2.0.19
15
 AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052
15
 AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052

+ 7 - 0
vendor/assetic/CHANGELOG-1.0.md 查看文件

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

+ 1 - 1
vendor/assetic/README.md 查看文件

280
 
280
 
281
 [1]: http://elsdoerfer.name/docs/webassets
281
 [1]: http://elsdoerfer.name/docs/webassets
282
 [2]: https://github.com/miracle2k/webassets
282
 [2]: https://github.com/miracle2k/webassets
283
-[3]: http://www.twig-project.org
283
+[3]: http://twig.sensiolabs.org

+ 3 - 3
vendor/assetic/composer.json 查看文件

1
 {
1
 {
2
     "name": "kriswallsmith/assetic",
2
     "name": "kriswallsmith/assetic",
3
-    "description": "Asset Management for PHP 5.3",
3
+    "description": "Asset Management for PHP",
4
     "keywords": ["assets", "compression", "minification"],
4
     "keywords": ["assets", "compression", "minification"],
5
     "homepage": "https://github.com/kriswallsmith/assetic",
5
     "homepage": "https://github.com/kriswallsmith/assetic",
6
     "type": "library",
6
     "type": "library",
13
         }
13
         }
14
     ],
14
     ],
15
     "require": {
15
     "require": {
16
-        "php": ">=5.3.0"
16
+        "php": ">=5.3.1"
17
     },
17
     },
18
     "autoload": {
18
     "autoload": {
19
         "psr-0": { "Assetic": "src/" }
19
         "psr-0": { "Assetic": "src/" }
20
     }
20
     }
21
-}
21
+}

+ 9 - 3
vendor/assetic/src/Assetic/Asset/AssetCache.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
13
 
13
 
14
 use Assetic\Cache\CacheInterface;
14
 use Assetic\Cache\CacheInterface;
15
 use Assetic\Filter\FilterInterface;
15
 use Assetic\Filter\FilterInterface;
16
+use Assetic\Filter\HashableInterface;
16
 
17
 
17
 /**
18
 /**
18
  * Caches an asset to avoid the cost of loading and dumping.
19
  * Caches an asset to avoid the cost of loading and dumping.
50
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
51
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
51
         if ($this->cache->has($cacheKey)) {
52
         if ($this->cache->has($cacheKey)) {
52
             $this->asset->setContent($this->cache->get($cacheKey));
53
             $this->asset->setContent($this->cache->get($cacheKey));
54
+
53
             return;
55
             return;
54
         }
56
         }
55
 
57
 
122
      *
124
      *
123
      * @return string A key for identifying the current asset
125
      * @return string A key for identifying the current asset
124
      */
126
      */
125
-    static private function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
127
+    private static function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
126
     {
128
     {
127
         if ($additionalFilter) {
129
         if ($additionalFilter) {
128
             $asset = clone $asset;
130
             $asset = clone $asset;
135
         $cacheKey .= $asset->getLastModified();
137
         $cacheKey .= $asset->getLastModified();
136
 
138
 
137
         foreach ($asset->getFilters() as $filter) {
139
         foreach ($asset->getFilters() as $filter) {
138
-            $cacheKey .= serialize($filter);
140
+            if ($filter instanceof HashableInterface) {
141
+                $cacheKey .= $filter->hash();
142
+            } else {
143
+                $cacheKey .= serialize($filter);
144
+            }
139
         }
145
         }
140
 
146
 
141
         return md5($cacheKey.$salt);
147
         return md5($cacheKey.$salt);

+ 2 - 3
vendor/assetic/src/Assetic/Asset/AssetCollection.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
140
             return;
140
             return;
141
         }
141
         }
142
 
142
 
143
-        $mapper = function (AssetInterface $asset)
144
-        {
143
+        $mapper = function (AssetInterface $asset) {
145
             return $asset->getLastModified();
144
             return $asset->getLastModified();
146
         };
145
         };
147
 
146
 

+ 13 - 13
vendor/assetic/src/Assetic/Asset/AssetInterface.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
25
      *
25
      *
26
      * @param FilterInterface $filter A filter
26
      * @param FilterInterface $filter A filter
27
      */
27
      */
28
-    function ensureFilter(FilterInterface $filter);
28
+    public function ensureFilter(FilterInterface $filter);
29
 
29
 
30
     /**
30
     /**
31
      * Returns an array of filters currently applied.
31
      * Returns an array of filters currently applied.
32
      *
32
      *
33
      * @return array An array of filters
33
      * @return array An array of filters
34
      */
34
      */
35
-    function getFilters();
35
+    public function getFilters();
36
 
36
 
37
     /**
37
     /**
38
      * Clears all filters from the current asset.
38
      * Clears all filters from the current asset.
39
      */
39
      */
40
-    function clearFilters();
40
+    public function clearFilters();
41
 
41
 
42
     /**
42
     /**
43
      * Loads the asset into memory and applies load filters.
43
      * Loads the asset into memory and applies load filters.
46
      *
46
      *
47
      * @param FilterInterface $additionalFilter An additional filter
47
      * @param FilterInterface $additionalFilter An additional filter
48
      */
48
      */
49
-    function load(FilterInterface $additionalFilter = null);
49
+    public function load(FilterInterface $additionalFilter = null);
50
 
50
 
51
     /**
51
     /**
52
      * Applies dump filters and returns the asset as a string.
52
      * Applies dump filters and returns the asset as a string.
62
      *
62
      *
63
      * @return string The filtered content of the current asset
63
      * @return string The filtered content of the current asset
64
      */
64
      */
65
-    function dump(FilterInterface $additionalFilter = null);
65
+    public function dump(FilterInterface $additionalFilter = null);
66
 
66
 
67
     /**
67
     /**
68
      * Returns the loaded content of the current asset.
68
      * Returns the loaded content of the current asset.
69
      *
69
      *
70
      * @return string The content
70
      * @return string The content
71
      */
71
      */
72
-    function getContent();
72
+    public function getContent();
73
 
73
 
74
     /**
74
     /**
75
      * Sets the content of the current asset.
75
      * Sets the content of the current asset.
78
      *
78
      *
79
      * @param string $content The asset content
79
      * @param string $content The asset content
80
      */
80
      */
81
-    function setContent($content);
81
+    public function setContent($content);
82
 
82
 
83
     /**
83
     /**
84
      * Returns an absolute path or URL to the source asset's root directory.
84
      * Returns an absolute path or URL to the source asset's root directory.
94
      *
94
      *
95
      * @return string|null The asset's root
95
      * @return string|null The asset's root
96
      */
96
      */
97
-    function getSourceRoot();
97
+    public function getSourceRoot();
98
 
98
 
99
     /**
99
     /**
100
      * Returns the relative path for the source asset.
100
      * Returns the relative path for the source asset.
110
      *
110
      *
111
      * @return string|null The source asset path
111
      * @return string|null The source asset path
112
      */
112
      */
113
-    function getSourcePath();
113
+    public function getSourcePath();
114
 
114
 
115
     /**
115
     /**
116
      * Returns the URL for the current asset.
116
      * Returns the URL for the current asset.
117
      *
117
      *
118
      * @return string|null A web URL where the asset will be dumped
118
      * @return string|null A web URL where the asset will be dumped
119
      */
119
      */
120
-    function getTargetPath();
120
+    public function getTargetPath();
121
 
121
 
122
     /**
122
     /**
123
      * Sets the URL for the current asset.
123
      * Sets the URL for the current asset.
124
      *
124
      *
125
      * @param string $targetPath A web URL where the asset will be dumped
125
      * @param string $targetPath A web URL where the asset will be dumped
126
      */
126
      */
127
-    function setTargetPath($targetPath);
127
+    public function setTargetPath($targetPath);
128
 
128
 
129
     /**
129
     /**
130
      * Returns the time the current asset was last modified.
130
      * Returns the time the current asset was last modified.
131
      *
131
      *
132
      * @return integer|null A UNIX timestamp
132
      * @return integer|null A UNIX timestamp
133
      */
133
      */
134
-    function getLastModified();
134
+    public function getLastModified();
135
 }
135
 }

+ 1 - 2
vendor/assetic/src/Assetic/Asset/AssetReference.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Asset/BaseAsset.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Asset/FileAsset.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Asset/GlobAsset.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Asset/HttpAsset.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Asset/StringAsset.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/AssetManager.php 查看文件

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

+ 2 - 2
vendor/assetic/src/Assetic/AssetWriter.php 查看文件

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

+ 5 - 5
vendor/assetic/src/Assetic/Cache/CacheInterface.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
25
      *
25
      *
26
      * @return Boolean Whether the cache has a value for this key
26
      * @return Boolean Whether the cache has a value for this key
27
      */
27
      */
28
-    function has($key);
28
+    public function has($key);
29
 
29
 
30
     /**
30
     /**
31
      * Returns the value for a key.
31
      * Returns the value for a key.
34
      *
34
      *
35
      * @return string|null The value in the cache
35
      * @return string|null The value in the cache
36
      */
36
      */
37
-    function get($key);
37
+    public function get($key);
38
 
38
 
39
     /**
39
     /**
40
      * Sets a value in the cache.
40
      * Sets a value in the cache.
42
      * @param string $key   A unique key
42
      * @param string $key   A unique key
43
      * @param string $value The value to cache
43
      * @param string $value The value to cache
44
      */
44
      */
45
-    function set($key, $value);
45
+    public function set($key, $value);
46
 
46
 
47
     /**
47
     /**
48
      * Removes a value from the cache.
48
      * Removes a value from the cache.
49
      *
49
      *
50
      * @param string $key A unique key
50
      * @param string $key A unique key
51
      */
51
      */
52
-    function remove($key);
52
+    public function remove($key);
53
 }
53
 }

+ 1 - 1
vendor/assetic/src/Assetic/Cache/ConfigCache.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Cache/ExpiringCache.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Cache/FilesystemCache.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Extension/Twig/AsseticExtension.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php 查看文件

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

+ 1 - 3
vendor/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Extension/Twig/AsseticNode.php 查看文件

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

+ 7 - 4
vendor/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
101
 
101
 
102
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
102
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
103
 
103
 
104
-        $endtag = 'end'.$this->getTag();
105
-        $test = function(\Twig_Token $token) use($endtag) { return $token->test($endtag); };
106
-        $body = $this->parser->subparse($test, true);
104
+        $body = $this->parser->subparse(array($this, 'testEndTag'), true);
107
 
105
 
108
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
106
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
109
 
107
 
125
         return $this->tag;
123
         return $this->tag;
126
     }
124
     }
127
 
125
 
126
+    public function testEndTag(\Twig_Token $token)
127
+    {
128
+        return $token->test(array('end'.$this->getTag()));
129
+    }
130
+
128
     protected function createNode(AssetInterface $asset, \Twig_NodeInterface $body, array $inputs, array $filters, $name, array $attributes = array(), $lineno = 0, $tag = null)
131
     protected function createNode(AssetInterface $asset, \Twig_NodeInterface $body, array $inputs, array $filters, $name, array $attributes = array(), $lineno = 0, $tag = null)
129
     {
132
     {
130
         return new AsseticNode($asset, $body, $inputs, $filters, $name, $attributes, $lineno, $tag);
133
         return new AsseticNode($asset, $body, $inputs, $filters, $name, $attributes, $lineno, $tag);

+ 1 - 1
vendor/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Extension/Twig/TwigResource.php 查看文件

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

+ 3 - 3
vendor/assetic/src/Assetic/Factory/AssetFactory.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Factory/LazyAssetManager.php 查看文件

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

+ 3 - 3
vendor/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
147
      */
147
      */
148
     abstract protected function registerSetupCode();
148
     abstract protected function registerSetupCode();
149
 
149
 
150
-    static protected function tokenToString($token)
150
+    protected static function tokenToString($token)
151
     {
151
     {
152
         return is_array($token) ? $token[1] : $token;
152
         return is_array($token) ? $token[1] : $token;
153
     }
153
     }
154
 
154
 
155
-    static protected function argumentToArray($argument)
155
+    protected static function argumentToArray($argument)
156
     {
156
     {
157
         return is_array($argument) ? $argument : array_filter(array_map('trim', explode(',', $argument)));
157
         return is_array($argument) ? $argument : array_filter(array_map('trim', explode(',', $argument)));
158
     }
158
     }

+ 1 - 1
vendor/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php 查看文件

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

+ 2 - 2
vendor/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php 查看文件

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

+ 3 - 3
vendor/assetic/src/Assetic/Factory/Resource/DirectoryResource.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
79
 
79
 
80
     protected function getInnerIterator()
80
     protected function getInnerIterator()
81
     {
81
     {
82
-        return new DirectoryResourceFilterIterator(new \RecursiveDirectoryIterator($this->path), $this->pattern);
82
+        return new DirectoryResourceFilterIterator(new \RecursiveDirectoryIterator($this->path, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS), $this->pattern);
83
     }
83
     }
84
 }
84
 }
85
 
85
 
128
 
128
 
129
     public function getChildren()
129
     public function getChildren()
130
     {
130
     {
131
-        return new self(new \RecursiveDirectoryIterator($this->current()->getPathname()), $this->pattern);
131
+        return new self(new \RecursiveDirectoryIterator($this->current()->getPathname(), \RecursiveDirectoryIterator::FOLLOW_SYMLINKS), $this->pattern);
132
     }
132
     }
133
 }
133
 }

+ 1 - 1
vendor/assetic/src/Assetic/Factory/Resource/FileResource.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php 查看文件

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

+ 4 - 4
vendor/assetic/src/Assetic/Factory/Resource/ResourceInterface.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
25
      *
25
      *
26
      * @return Boolean True if the timestamp is up to date
26
      * @return Boolean True if the timestamp is up to date
27
      */
27
      */
28
-    function isFresh($timestamp);
28
+    public function isFresh($timestamp);
29
 
29
 
30
     /**
30
     /**
31
      * Returns the content of the resource.
31
      * Returns the content of the resource.
32
      *
32
      *
33
      * @return string The content
33
      * @return string The content
34
      */
34
      */
35
-    function getContent();
35
+    public function getContent();
36
 
36
 
37
     /**
37
     /**
38
      * Returns a unique string for the current resource.
38
      * Returns a unique string for the current resource.
39
      *
39
      *
40
      * @return string A unique string to identity the current resource
40
      * @return string A unique string to identity the current resource
41
      */
41
      */
42
-    function __toString();
42
+    public function __toString();
43
 }
43
 }

+ 1 - 1
vendor/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php 查看文件

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

+ 2 - 2
vendor/assetic/src/Assetic/Factory/Worker/WorkerInterface.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/BaseCssFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/CallablesFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php 查看文件

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

+ 15 - 8
vendor/assetic/src/Assetic/Filter/CompassFilter.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
46
     private $httpPath;
46
     private $httpPath;
47
     private $httpImagesPath;
47
     private $httpImagesPath;
48
     private $httpJavascriptsPath;
48
     private $httpJavascriptsPath;
49
-    
49
+
50
     public function __construct($compassPath = '/usr/bin/compass')
50
     public function __construct($compassPath = '/usr/bin/compass')
51
     {
51
     {
52
         $this->compassPath = $compassPath;
52
         $this->compassPath = $compassPath;
108
     {
108
     {
109
         $this->noLineComments = $noLineComments;
109
         $this->noLineComments = $noLineComments;
110
     }
110
     }
111
-    
111
+
112
     public function setImagesDir($imagesDir)
112
     public function setImagesDir($imagesDir)
113
     {
113
     {
114
         $this->imagesDir = $imagesDir;
114
         $this->imagesDir = $imagesDir;
139
     {
139
     {
140
         $this->httpPath = $httpPath;
140
         $this->httpPath = $httpPath;
141
     }
141
     }
142
-    
142
+
143
     public function setHttpImagesPath($httpImagesPath)
143
     public function setHttpImagesPath($httpImagesPath)
144
     {
144
     {
145
         $this->httpImagesPath = $httpImagesPath;
145
         $this->httpImagesPath = $httpImagesPath;
146
     }
146
     }
147
-    
147
+
148
     public function setHttpJavascriptsPath($httpJavascriptsPath)
148
     public function setHttpJavascriptsPath($httpJavascriptsPath)
149
     {
149
     {
150
         $this->httpJavascriptsPath = $httpJavascriptsPath;
150
         $this->httpJavascriptsPath = $httpJavascriptsPath;
271
         unlink($tempName); // FIXME: don't use tempnam() here
271
         unlink($tempName); // FIXME: don't use tempnam() here
272
 
272
 
273
         // input
273
         // input
274
-        $pb->add($input = $tempName.'.'.$type);
274
+        $input = $tempName.'.'.$type;
275
+
276
+        // work-around for https://github.com/chriseppstein/compass/issues/748
277
+        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
278
+            $input = str_replace('\\', '/', $input);
279
+        }
280
+
281
+        $pb->add($input);
275
         file_put_contents($input, $asset->getContent());
282
         file_put_contents($input, $asset->getContent());
276
 
283
 
277
         // output
284
         // output
311
 
318
 
312
         // does we have an associative array ?
319
         // does we have an associative array ?
313
         if (count(array_filter(array_keys($array), "is_numeric")) != count($array)) {
320
         if (count(array_filter(array_keys($array), "is_numeric")) != count($array)) {
314
-            foreach($array as $name => $value) {
321
+            foreach ($array as $name => $value) {
315
                 $output[] = sprintf('    :%s => "%s"', $name, addcslashes($value, '\\'));
322
                 $output[] = sprintf('    :%s => "%s"', $name, addcslashes($value, '\\'));
316
             }
323
             }
317
             $output = "{\n".implode(",\n", $output)."\n}";
324
             $output = "{\n".implode(",\n", $output)."\n}";
318
         } else {
325
         } else {
319
-            foreach($array as $name => $value) {
326
+            foreach ($array as $name => $value) {
320
                 $output[] = sprintf('    "%s"', addcslashes($value, '\\'));
327
                 $output[] = sprintf('    "%s"', addcslashes($value, '\\'));
321
             }
328
             }
322
             $output = "[\n".implode(",\n", $output)."\n]";
329
             $output = "[\n".implode(",\n", $output)."\n]";

+ 1 - 1
vendor/assetic/src/Assetic/Filter/CssEmbedFilter.php 查看文件

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

+ 2 - 3
vendor/assetic/src/Assetic/Filter/CssImportFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/CssMinFilter.php 查看文件

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

+ 2 - 3
vendor/assetic/src/Assetic/Filter/CssRewriteFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/FilterCollection.php 查看文件

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

+ 3 - 3
vendor/assetic/src/Assetic/Filter/FilterInterface.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
25
      *
25
      *
26
      * @param AssetInterface $asset An asset
26
      * @param AssetInterface $asset An asset
27
      */
27
      */
28
-    function filterLoad(AssetInterface $asset);
28
+    public function filterLoad(AssetInterface $asset);
29
 
29
 
30
     /**
30
     /**
31
      * Filters an asset just before it's dumped.
31
      * Filters an asset just before it's dumped.
32
      *
32
      *
33
      * @param AssetInterface $asset An asset
33
      * @param AssetInterface $asset An asset
34
      */
34
      */
35
-    function filterDump(AssetInterface $asset);
35
+    public function filterDump(AssetInterface $asset);
36
 }
36
 }

+ 1 - 1
vendor/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php 查看文件

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

+ 27 - 0
vendor/assetic/src/Assetic/Filter/HashableInterface.php 查看文件

1
+<?php
2
+
3
+/*
4
+ * This file is part of the Assetic package, an OpenSky project.
5
+ *
6
+ * (c) 2010-2012 OpenSky Project Inc
7
+ *
8
+ * For the full copyright and license information, please view the LICENSE
9
+ * file that was distributed with this source code.
10
+ */
11
+
12
+namespace Assetic\Filter;
13
+
14
+/**
15
+ * A filter can implement a hash function
16
+ *
17
+ * @author Francisco Facioni <fran6co@gmail.com>
18
+ */
19
+interface HashableInterface
20
+{
21
+    /**
22
+     * Generates a hash for the object
23
+     *
24
+     * @return string Object hash
25
+     */
26
+    public function hash();
27
+}

+ 1 - 1
vendor/assetic/src/Assetic/Filter/JpegoptimFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/JpegtranFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/LessFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/LessphpFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/OptiPngFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/PackagerFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/PngoutFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/Sass/ScssFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/SprocketsFilter.php 查看文件

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

+ 2 - 2
vendor/assetic/src/Assetic/Filter/StylusFilter.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
40
     /**
40
     /**
41
      * Enable output compression.
41
      * Enable output compression.
42
      *
42
      *
43
-     * @param   boolean     $compress
43
+     * @param boolean $compress
44
      */
44
      */
45
     public function setCompress($compress)
45
     public function setCompress($compress)
46
     {
46
     {

+ 1 - 1
vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php 查看文件

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

+ 1 - 1
vendor/assetic/src/Assetic/FilterManager.php 查看文件

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

+ 1 - 2
vendor/assetic/src/Assetic/Util/Process.php 查看文件

106
         $this->stdout = '';
106
         $this->stdout = '';
107
         $this->stderr = '';
107
         $this->stderr = '';
108
         $that = $this;
108
         $that = $this;
109
-        $callback = function ($type, $data) use ($that, $callback)
110
-        {
109
+        $callback = function ($type, $data) use ($that, $callback) {
111
             if ('out' == $type) {
110
             if ('out' == $type) {
112
                 $that->addOutput($data);
111
                 $that->addOutput($data);
113
             } else {
112
             } else {

+ 3 - 3
vendor/assetic/src/Assetic/Util/ProcessBuilder.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
97
 
97
 
98
         $options = $this->options;
98
         $options = $this->options;
99
 
99
 
100
-        if (defined('PHP_WINDOWS_MAJOR_VERSION')) {
100
+        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
101
             $options += array('bypass_shell' => true);
101
             $options += array('bypass_shell' => true);
102
 
102
 
103
             $args = $this->arguments;
103
             $args = $this->arguments;
105
 
105
 
106
             $script = '"'.$cmd.'"';
106
             $script = '"'.$cmd.'"';
107
             if ($args) {
107
             if ($args) {
108
-                $script .= ' '.implode(' ', array_map('escapeshellarg', $parts));
108
+                $script .= ' '.implode(' ', array_map('escapeshellarg', $args));
109
             }
109
             }
110
         } else {
110
         } else {
111
             $script = implode(' ', array_map('escapeshellarg', $this->arguments));
111
             $script = implode(' ', array_map('escapeshellarg', $this->arguments));

+ 1 - 1
vendor/assetic/src/Assetic/Util/TraversableString.php 查看文件

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

+ 1 - 1
vendor/assetic/src/functions.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php 查看文件

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

+ 4 - 6
vendor/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
47
 
47
 
48
         $count = 0;
48
         $count = 0;
49
         $matches = array();
49
         $matches = array();
50
-        $filter = new CallablesFilter(function($asset) use ($content, & $matches, & $count)
51
-        {
50
+        $filter = new CallablesFilter(function($asset) use ($content, &$matches, &$count) {
52
             ++$count;
51
             ++$count;
53
             if ($content == $asset->getContent()) {
52
             if ($content == $asset->getContent()) {
54
                 $matches[] = $asset;
53
                 $matches[] = $asset;
70
         $innerColl = new AssetCollection(array($nestedAsset));
69
         $innerColl = new AssetCollection(array($nestedAsset));
71
 
70
 
72
         $contents = array();
71
         $contents = array();
73
-        $filter = new CallablesFilter(function($asset) use(& $contents)
74
-        {
72
+        $filter = new CallablesFilter(function($asset) use (&$contents) {
75
             $contents[] = $asset->getContent();
73
             $contents[] = $asset->getContent();
76
         });
74
         });
77
 
75
 
126
     public function testIterationFilters()
124
     public function testIterationFilters()
127
     {
125
     {
128
         $count = 0;
126
         $count = 0;
129
-        $filter = new CallablesFilter(function() use(&$count) { ++$count; });
127
+        $filter = new CallablesFilter(function() use (&$count) { ++$count; });
130
 
128
 
131
         $coll = new AssetCollection();
129
         $coll = new AssetCollection();
132
         $coll->add(new StringAsset(''));
130
         $coll->add(new StringAsset(''));

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Asset/FileAssetTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Asset/StringAssetTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/AssetManagerTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/AssetWriterTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php 查看文件

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

+ 2 - 3
vendor/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
34
     {
34
     {
35
         $dir = sys_get_temp_dir().'/assetic/fscachetest';
35
         $dir = sys_get_temp_dir().'/assetic/fscachetest';
36
 
36
 
37
-        $tearDown = function() use($dir)
38
-        {
37
+        $tearDown = function() use ($dir) {
39
             array_map('unlink', glob($dir.'/*'));
38
             array_map('unlink', glob($dir.'/*'));
40
             @rmdir($dir);
39
             @rmdir($dir);
41
         };
40
         };

+ 9 - 1
vendor/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
183
         $this->assertStringEndsWith('.css', (string) $xml->asset[0]['url']);
183
         $this->assertStringEndsWith('.css', (string) $xml->asset[0]['url']);
184
     }
184
     }
185
 
185
 
186
+    /**
187
+     * @expectedException Twig_Error
188
+     */
189
+    public function testUnclosedTag()
190
+    {
191
+        $this->renderXml('unclosed_tag.twig');
192
+    }
193
+
186
     private function renderXml($name, $context = array())
194
     private function renderXml($name, $context = array())
187
     {
195
     {
188
         return new \SimpleXMLElement($this->twig->loadTemplate($name)->render($context));
196
         return new \SimpleXMLElement($this->twig->loadTemplate($name)->render($context));

+ 12 - 1
vendor/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
93
         $formulae = $this->loader->load($resource);
93
         $formulae = $this->loader->load($resource);
94
         $this->assertEquals($expected, $formulae);
94
         $this->assertEquals($expected, $formulae);
95
     }
95
     }
96
+
97
+    public function testUnclosedTag()
98
+    {
99
+        $resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
100
+        $resource->expects($this->once())
101
+            ->method('getContent')
102
+            ->will($this->returnValue(file_get_contents(__DIR__.'/templates/unclosed_tag.twig')));
103
+
104
+        $formulae = $this->loader->load($resource);
105
+        $this->assertEquals(array(), $formulae);
106
+    }
96
 }
107
 }

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php 查看文件

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

+ 5 - 0
vendor/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php 查看文件

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

+ 25 - 1
vendor/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php 查看文件

3
 /*
3
 /*
4
  * This file is part of the Assetic package, an OpenSky project.
4
  * This file is part of the Assetic package, an OpenSky project.
5
  *
5
  *
6
- * (c) 2010-2011 OpenSky Project Inc
6
+ * (c) 2010-2012 OpenSky Project Inc
7
  *
7
  *
8
  * For the full copyright and license information, please view the LICENSE
8
  * For the full copyright and license information, please view the LICENSE
9
  * file that was distributed with this source code.
9
  * file that was distributed with this source code.
105
         $resource = new DirectoryResource(__DIR__.'foo');
105
         $resource = new DirectoryResource(__DIR__.'foo');
106
         $this->assertEquals(0, iterator_count($resource), 'works for non-existent directory');
106
         $this->assertEquals(0, iterator_count($resource), 'works for non-existent directory');
107
     }
107
     }
108
+
109
+    public function testFollowSymlinks()
110
+    {
111
+        // Create the symlink if it doesn't already exist yet (if someone broke the entire testsuite perhaps)
112
+        if (!is_dir(__DIR__.'/Fixtures/dir3')) {
113
+            symlink(__DIR__.'/Fixtures/dir2', __DIR__.'/Fixtures/dir3');
114
+        }
115
+
116
+        $resource = new DirectoryResource(__DIR__.'/Fixtures');
117
+
118
+        $count = 0;
119
+        foreach ($resource as $r) {
120
+            ++$count;
121
+        }
122
+
123
+        $this->assertEquals(6, $count);
124
+    }
125
+
126
+    public function tearDown()
127
+    {
128
+        if (is_dir(__DIR__.'/Fixtures/dir3')) {
129
+            unlink(__DIR__.'/Fixtures/dir3');
130
+        }
131
+    }
108
 }
132
 }

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php 查看文件

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

+ 1 - 1
vendor/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php 查看文件

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

+ 2 - 2
vendor/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php 查看文件

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

+ 0 - 0
vendor/assetic/tests/Assetic/Test/Filter/CallablesFilterTest.php 查看文件


部分文件因为文件数量过多而无法显示