From 829bc54392d49112d52f006a602be8e5d49f23d0 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 25 Apr 2011 11:44:48 +0200 Subject: [PATCH 1/2] [Cache warmers] A few tweaks --- .../CacheWarmer/AssetManagerCacheWarmer.php | 9 +++++++-- .../AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php | 9 +++++++-- .../FrameworkBundle/CacheWarmer/RouterCacheWarmer.php | 4 ++-- .../TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php | 4 ++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetManagerCacheWarmer.php b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetManagerCacheWarmer.php index 35e7e8dc67..f86d6fc421 100644 --- a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetManagerCacheWarmer.php +++ b/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 + */ +class AssetManagerCacheWarmer implements CacheWarmerInterface { private $container; diff --git a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php b/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php index 298ffd235d..1242d7cb89 100644 --- a/src/Symfony/Bundle/AsseticBundle/CacheWarmer/AssetWriterCacheWarmer.php +++ b/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 + */ +class AssetWriterCacheWarmer implements CacheWarmerInterface { private $container; private $writer; diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php index 261f9f2dc9..1b18b878a1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php +++ b/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 */ -class RouterCacheWarmer extends CacheWarmer +class RouterCacheWarmer implements CacheWarmerInterface { protected $router; diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php index aaefc69950..4042396db6 100644 --- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php +++ b/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 */ -class TemplateCacheCacheWarmer extends CacheWarmer +class TemplateCacheCacheWarmer implements CacheWarmerInterface { protected $container; protected $parser; From 4de2b849235d9c8128a5b1286e3b94333650a024 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Sat, 23 Apr 2011 14:27:48 +0200 Subject: [PATCH 2/2] [AsseticBundle] Remove an unused property --- .../Bundle/AsseticBundle/Factory/Resource/FileResource.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Symfony/Bundle/AsseticBundle/Factory/Resource/FileResource.php b/src/Symfony/Bundle/AsseticBundle/Factory/Resource/FileResource.php index a06e425e03..d089d40fb8 100644 --- a/src/Symfony/Bundle/AsseticBundle/Factory/Resource/FileResource.php +++ b/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; /**