diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php index 4376f1ead341..df7261bd5376 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php @@ -12,6 +12,7 @@ namespace Symfony\Bundle\FrameworkBundle\CacheWarmer; use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface; +use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface; use Symfony\Component\Routing\RouterInterface; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 1fd3aef0fc54..230a760f2975 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -15,7 +15,7 @@ use Symfony\Component\Routing\RequestContext; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Routing\RouteCollection; -use Symfony\Bundle\FrameworkBundle\CacheWarmer\WarmableInterface; +use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface; /** * This Router only creates the Loader only when the cache is empty. diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php index 58ddb83fc9b5..e4251c78b588 100644 --- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php +++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php @@ -15,15 +15,8 @@ * * @author Fabien Potencier */ -interface CacheWarmerInterface +interface CacheWarmerInterface extends WarmableInterface { - /** - * Warms up the cache. - * - * @param string $cacheDir The cache directory - */ - function warmUp($cacheDir); - /** * Checks whether this warmer is optional or not. * diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/WarmableInterface.php b/src/Symfony/Component/HttpKernel/CacheWarmer/WarmableInterface.php similarity index 80% rename from src/Symfony/Bundle/FrameworkBundle/CacheWarmer/WarmableInterface.php rename to src/Symfony/Component/HttpKernel/CacheWarmer/WarmableInterface.php index 4e2120c9fbc0..0476161621c5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/WarmableInterface.php +++ b/src/Symfony/Component/HttpKernel/CacheWarmer/WarmableInterface.php @@ -9,10 +9,10 @@ * file that was distributed with this source code. */ -namespace Symfony\Bundle\FrameworkBundle\CacheWarmer; +namespace Symfony\Component\HttpKernel\CacheWarmer; /** - * Interface for services that support warming their cache. + * Interface for classes that support warming their cache. * * @author Fabien Potencier */