Ver código fonte

Merge remote branch 'vicb/tweaks_110425'

* vicb/tweaks_110425:
  [AsseticBundle] Remove an unused property
  [Cache warmers] A few tweaks
Fabien Potencier 14 anos atrás
pai
commit
d6bdb7af88

+ 7 - 2
src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetManagerCacheWarmer.php

@@ -11,10 +11,15 @@
 
 namespace Symfony\Bundle\AsseticBundle\CacheWarmer;
 
-use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class AssetManagerCacheWarmer extends CacheWarmer
+/**
+ * The AssetManagerCacheWarmer warms up the formula loader.
+ *
+ * @author Kris Wallsmith <kris.wallsmith@symfony.com>
+ */
+class AssetManagerCacheWarmer implements CacheWarmerInterface
 {
     private $container;
 

+ 7 - 2
src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php

@@ -12,10 +12,15 @@
 namespace Symfony\Bundle\AsseticBundle\CacheWarmer;
 
 use Assetic\AssetWriter;
-use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class AssetWriterCacheWarmer extends CacheWarmer
+/**
+ * The AssetWriterCacheWarmer processes and writes the asset files.
+ * 
+ * @author Kris Wallsmith <kris.wallsmith@symfony.com>
+ */
+class AssetWriterCacheWarmer implements CacheWarmerInterface
 {
     private $container;
     private $writer;

+ 0 - 2
src/Symfony/Bundle/AsseticBundle/Factory/Resource/FileResource.php

@@ -23,11 +23,9 @@ use Symfony\Component\Templating\Loader\LoaderInterface;
 class FileResource implements ResourceInterface
 {
     protected $loader;
-    protected $parser;
     protected $bundle;
     protected $baseDir;
     protected $path;
-
     protected $template;
 
     /**

+ 2 - 2
src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
-use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\Routing\Router;
 
 /**
@@ -19,7 +19,7 @@ use Symfony\Component\Routing\Router;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class RouterCacheWarmer extends CacheWarmer
+class RouterCacheWarmer implements CacheWarmerInterface
 {
     protected $router;
 

+ 2 - 2
src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\CacheWarmer;
 
-use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
+use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Finder\Finder;
 
@@ -23,7 +23,7 @@ use Symfony\Component\Finder\Finder;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class TemplateCacheCacheWarmer extends CacheWarmer
+class TemplateCacheCacheWarmer implements CacheWarmerInterface
 {
     protected $container;
     protected $parser;