moved TemplateFinder to CacheWarmer as it is only useful in this context

src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateFinder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\Templating\Loader;
+namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Finder\Finder;
@@ -106,4 +106,4 @@ class TemplateFinder implements TemplateFinderInterface
 
         return $templates;
     }
-}
+}

src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateFinderInterface.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\Templating\Loader;
+namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
 
 /**
@@ -25,4 +25,4 @@ interface TemplateFinderInterface
      * @return array An array of templates of type TemplateReferenceInterface
      */
     function findAllTemplates();
-}
+}

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmer;
-use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateFinderInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator;
 
 /**

src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml

@@ -13,7 +13,7 @@
         <parameter key="templating.loader.filesystem.class">Symfony\Bundle\FrameworkBundle\Templating\Loader\FilesystemLoader</parameter>
         <parameter key="templating.loader.cache.class">Symfony\Component\Templating\Loader\CacheLoader</parameter>
         <parameter key="templating.loader.chain.class">Symfony\Component\Templating\Loader\ChainLoader</parameter>
-        <parameter key="templating.finder.class">Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateFinder</parameter>
+        <parameter key="templating.finder.class">Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder</parameter>
     </parameters>
 
     <services>

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateFinderTest.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Loader;
+namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser;
-use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateFinder;
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BaseBundle\BaseBundle;
 
 
@@ -40,7 +40,7 @@ class TemplateFinderTest extends TestCase
 
         $parser = new TemplateNameParser($kernel);
 
-        $finder = new TemplateFinder($kernel, $parser, __DIR__.'/../../Fixtures/Resources');
+        $finder = new TemplateFinder($kernel, $parser, __DIR__.'/../Fixtures/Resources');
 
         $templates = array_map(
             function ($template) { return $template->getLogicalName(); },

src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php

@@ -12,9 +12,8 @@
 namespace Symfony\Bundle\TwigBundle\CacheWarmer;
 
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
-use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplatePathsCacheWarmer;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateFinder;
+use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinderInterface;
 
 /**
  * Generates the Twig cache for all templates.
@@ -32,10 +31,10 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface
     /**
      * Constructor.
      *
-     * @param ContainerInterface $container The dependency injection container
-     * @param TemplateFinder     $finder    The template paths cache warmer
+     * @param ContainerInterface      $container The dependency injection container
+     * @param TemplateFinderInterface $finder    The template paths cache warmer
      */
-    public function __construct(ContainerInterface $container, TemplateFinder $finder)
+    public function __construct(ContainerInterface $container, TemplateFinderInterface $finder)
     {
         // We don't inject the Twig environment directly as it depends on the
         // template locator (via the loader) which might be a cached one.