[1.0][resolver] remove request parameter

Controller/ImagineController.php

@@ -51,16 +51,17 @@ public function __construct(DataManager $dataManager, FilterManager $filterManag
      */
     public function filterAction(Request $request, $path, $filter)
     {
-        $targetPath = $this->cacheManager->resolve($request, $path, $filter);
-        if ($targetPath instanceof Response) {
-            return $targetPath;
+        $originalImagePath = $path;
+        $filteredImagePath = $this->cacheManager->resolve($originalImagePath, $filter);
+        if ($filteredImagePath instanceof Response) {
+            return $filteredImagePath;
         }
 
-        $image = $this->dataManager->find($filter, $path);
-        $response = $this->filterManager->get($request, $filter, $image, $path);
+        $originalImage = $this->dataManager->find($filter, $originalImagePath);
+        $response = $this->filterManager->get($request, $filter, $originalImage, $originalImagePath);
 
-        if ($targetPath) {
-            $response = $this->cacheManager->store($response, $targetPath, $filter);
+        if ($filteredImagePath) {
+            $response = $this->cacheManager->store($response, $filteredImagePath, $filter);
         }
 
         return $response;

Imagine/Cache/CacheManager.php

@@ -173,7 +173,7 @@ public function generateUrl($path, $filter, $absolute = false)
      *
      * @throws NotFoundHttpException if the path can not be resolved
      */
-    public function resolve(Request $request, $path, $filter)
+    public function resolve($path, $filter)
     {
         if (false !== strpos($path, '/../') || 0 === strpos($path, '../')) {
             throw new NotFoundHttpException(sprintf("Source image was searched with '%s' outside of the defined root path", $path));
@@ -185,7 +185,7 @@ public function resolve(Request $request, $path, $filter)
             return false;
         }
 
-        return $resolver->resolve($request, $path, $filter);
+        return $resolver->resolve($path, $filter);
     }
 
     /**

Imagine/Cache/Resolver/AmazonS3Resolver.php

@@ -84,7 +84,7 @@ public function setCacheManager(CacheManager $cacheManager)
     /**
      * {@inheritDoc}
      */
-    public function resolve(Request $request, $path, $filter)
+    public function resolve($path, $filter)
     {
         $objectPath = $this->getObjectPath($path, $filter);
         if ($this->objectExists($objectPath)) {

Imagine/Cache/Resolver/AwsS3Resolver.php

@@ -85,7 +85,7 @@ public function setCacheManager(CacheManager $cacheManager)
     /**
      * {@inheritDoc}
      */
-    public function resolve(Request $request, $path, $filter)
+    public function resolve($path, $filter)
     {
         $objectPath = $this->getObjectPath($path, $filter);
         if ($this->objectExists($objectPath)) {

Imagine/Cache/Resolver/CacheResolver.php

@@ -4,7 +4,7 @@
 
 use Doctrine\Common\Cache\Cache;
 
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -55,14 +55,14 @@ public function __construct(Cache $cache, ResolverInterface $cacheResolver, arra
     /**
      * {@inheritDoc}
      */
-    public function resolve(Request $request, $path, $filter)
+    public function resolve($path, $filter)
     {
         $key = $this->generateCacheKey('resolve', $path, $filter);
         if ($this->cache->contains($key)) {
             return $this->cache->fetch($key);
         }
 
-        $targetPath = $this->resolver->resolve($request, $path, $filter);
+        $targetPath = $this->resolver->resolve($path, $filter);
         $this->saveToCache($key, $targetPath);
 
         /*

Imagine/Cache/Resolver/NoCacheResolver.php

@@ -2,7 +2,6 @@
 
 namespace Liip\ImagineBundle\Imagine\Cache\Resolver;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -13,9 +12,9 @@ class NoCacheResolver extends WebPathResolver
     /**
      * {@inheritDoc}
      */
-    public function resolve(Request $request, $path, $filter)
+    public function resolve($path, $filter)
     {
-        $this->setBasePath($request->getBaseUrl());
+        $this->setBasePath($this->container->get('request')->getBaseUrl());
 
         return $this->getFilePath($path, $filter);
     }

Imagine/Cache/Resolver/ResolverInterface.php

@@ -2,15 +2,13 @@
 
 namespace Liip\ImagineBundle\Imagine\Cache\Resolver;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 interface ResolverInterface
 {
     /**
      * Resolves filtered path for rendering in the browser.
      *
-     * @param Request $request The request made against a _imagine_* filter route.
      * @param string $path The path where the resolved file is expected.
      * @param string $filter The name of the imagine filter in effect.
      *
@@ -19,7 +17,7 @@ interface ResolverInterface
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException In case the path can not be resolved.
      */
-    function resolve(Request $request, $path, $filter);
+    function resolve($path, $filter);
 
     /**
      * Stores the content of the given Response.

Imagine/Cache/Resolver/WebPathResolver.php

@@ -4,15 +4,31 @@
 
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class WebPathResolver extends AbstractFilesystemResolver
+class WebPathResolver extends AbstractFilesystemResolver implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     /**
      * {@inheritDoc}
      */
-    public function resolve(Request $request, $path, $filter)
+    public function resolve($path, $filter)
     {
+        $request = $this->container->get('request');
+
         $browserPath = $this->decodeBrowserPath($this->getBrowserPath($path, $filter));
         $this->basePath = $request->getBaseUrl();
         $targetPath = $this->getFilePath($path, $filter);

Resources/config/imagine.xml

@@ -185,11 +185,17 @@
             <call method="setFolderPermissions">
                 <argument type="string">%liip_imagine.cache_mkdir_mode%</argument>
             </call>
+            <call method="setContainer">
+                <argument type="service">service_container</argument>
+            </call>
         </service>
 
         <service id="liip_imagine.cache.resolver.no_cache" class="%liip_imagine.cache.resolver.no_cache.class%">
             <tag name="liip_imagine.cache.resolver" resolver="no_cache" />
             <argument type="service" id="filesystem" />
+            <call method="setContainer">
+                <argument type="service">service_container</argument>
+            </call>
         </service>
 
         <!-- Form types -->

Resources/doc/filters.md

@@ -172,7 +172,7 @@ but it illustrates the core idea.
 ``` php
 public function filterAction(Request $request, $path, $filter)
 {
-    $targetPath = $this->cacheManager->resolve($request, $path, $filter);
+    $targetPath = $this->cacheManager->resolve($path, $filter);
     if ($targetPath instanceof Response) {
         return $targetPath;
     }

Tests/Controller/ImagineControllerTest.php

@@ -18,6 +18,7 @@
 
 use Liip\ImagineBundle\Tests\AbstractTest;
 
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -100,6 +101,11 @@ public function testFilterActionLive()
         $controller = new ImagineController($dataManager, $filterManager, $cacheManager);
 
         $request = Request::create('/media/cache/thumbnail/cats.jpeg');
+
+        $container = new Container();
+        $container->set('request', $request);
+        $webPathResolver->setContainer($container);
+
         $response = $controller->filterAction($request, 'cats.jpeg', 'thumbnail');
 
         $targetPath = realpath($this->webRoot).'/media/cache/thumbnail/cats.jpeg';

Tests/Imagine/Cache/CacheManagerTest.php

@@ -89,26 +89,25 @@ public function testResolveInvalidPath($path)
         $cacheManager = new CacheManager($this->getMockFilterConfiguration(), $this->getMockRouter(), $this->fixturesDir.'/assets');
 
         $this->setExpectedException('Symfony\Component\HttpKernel\Exception\NotFoundHttpException');
-        $cacheManager->resolve(new Request(), $path, 'thumbnail');
+        $cacheManager->resolve($path, 'thumbnail');
     }
 
     public function testResolveWithoutResolver()
     {
         $cacheManager = new CacheManager($this->getMockFilterConfiguration(), $this->getMockRouter(), $this->fixturesDir.'/assets');
 
-        $this->assertFalse($cacheManager->resolve(new Request(), 'cats.jpeg', 'thumbnail'));
+        $this->assertFalse($cacheManager->resolve('cats.jpeg', 'thumbnail'));
     }
 
     public function testFallbackToDefaultResolver()
     {
         $response = new Response('', 200);
-        $request = new Request();
 
         $resolver = $this->getMockResolver();
         $resolver
             ->expects($this->once())
             ->method('resolve')
-            ->with($request, 'cats.jpeg', 'thumbnail')
+            ->with('cats.jpeg', 'thumbnail')
             ->will($this->returnValue('/thumbs/cats.jpeg'))
         ;
         $resolver
@@ -140,7 +139,7 @@ public function testFallbackToDefaultResolver()
         $cacheManager->addResolver('default', $resolver);
 
         // Resolve fallback to default resolver
-        $this->assertEquals('/thumbs/cats.jpeg', $cacheManager->resolve($request, 'cats.jpeg', 'thumbnail'));
+        $this->assertEquals('/thumbs/cats.jpeg', $cacheManager->resolve('cats.jpeg', 'thumbnail'));
 
         // Store fallback to default resolver
         $this->assertEquals($response, $cacheManager->store($response, '/thumbs/cats.jpeg', 'thumbnail'));

Tests/Imagine/Cache/Resolver/AmazonS3ResolverTest.php

@@ -149,7 +149,7 @@ public function testResolveNewObject()
         ;
 
         $resolver = new AmazonS3Resolver($s3, 'images.example.com');
-        $targetPath = $resolver->resolve(new Request(), '/some-folder/targetpath.jpg', 'thumb');
+        $targetPath = $resolver->resolve('/some-folder/targetpath.jpg', 'thumb');
 
         $this->assertEquals('thumb/some-folder/targetpath.jpg', $targetPath);
     }
@@ -170,7 +170,7 @@ public function testResolveRedirectsOnExisting()
         ;
 
         $resolver = new AmazonS3Resolver($s3, 'images.example.com');
-        $response = $resolver->resolve(new Request(), '/some-folder/targetpath.jpg', 'thumb');
+        $response = $resolver->resolve('/some-folder/targetpath.jpg', 'thumb');
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
         $this->assertEquals(301, $response->getStatusCode());

Tests/Imagine/Cache/Resolver/AwsS3ResolverTest.php

@@ -160,7 +160,7 @@ public function testResolveNewObject()
         ;
 
         $resolver = new AwsS3Resolver($s3, 'images.example.com');
-        $targetPath = $resolver->resolve(new Request(), '/some-folder/targetpath.jpg', 'thumb');
+        $targetPath = $resolver->resolve('/some-folder/targetpath.jpg', 'thumb');
 
         $this->assertEquals('thumb/some-folder/targetpath.jpg', $targetPath);
     }
@@ -181,7 +181,7 @@ public function testResolveRedirectsOnExisting()
         ;
 
         $resolver = new AwsS3Resolver($s3, 'images.example.com');
-        $response = $resolver->resolve(new Request(), '/some-folder/targetpath.jpg', 'thumb');
+        $response = $resolver->resolve('/some-folder/targetpath.jpg', 'thumb');
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
         $this->assertEquals(301, $response->getStatusCode());

Tests/Imagine/Cache/Resolver/CacheResolverTest.php

@@ -7,7 +7,6 @@
 use Liip\ImagineBundle\Tests\AbstractTest;
 use Liip\ImagineBundle\Tests\Fixtures\MemoryCache;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -21,23 +20,21 @@ class CacheResolverTest extends AbstractTest
 
     public function testResolveIsSavedToCache()
     {
-        $request = new Request();
-
         $resolver = $this->getMockResolver();
         $resolver
             ->expects($this->once())
             ->method('resolve')
-            ->with($request, $this->path, $this->filter)
+            ->with($this->path, $this->filter)
             ->will($this->returnValue($this->targetPath))
         ;
 
         $cacheResolver = new CacheResolver(new MemoryCache(), $resolver);
 
-        $this->assertEquals($this->targetPath, $cacheResolver->resolve($request, $this->path, $this->filter));
+        $this->assertEquals($this->targetPath, $cacheResolver->resolve($this->path, $this->filter));
 
         // Call multiple times to verify the cache is used.
-        $this->assertEquals($this->targetPath, $cacheResolver->resolve($request, $this->path, $this->filter));
-        $this->assertEquals($this->targetPath, $cacheResolver->resolve($request, $this->path, $this->filter));
+        $this->assertEquals($this->targetPath, $cacheResolver->resolve($this->path, $this->filter));
+        $this->assertEquals($this->targetPath, $cacheResolver->resolve($this->path, $this->filter));
     }
 
     public function testStoreIsForwardedToResolver()
@@ -92,13 +89,11 @@ public function testGetBrowserPath()
      */
     public function testRemoveUsesIndex()
     {
-        $request = new Request();
-
         $resolver = $this->getMockResolver();
         $resolver
             ->expects($this->once())
             ->method('resolve')
-            ->with($request, $this->path, $this->filter)
+            ->with($this->path, $this->filter)
             ->will($this->returnValue($this->targetPath))
         ;
         $resolver
@@ -110,7 +105,7 @@ public function testRemoveUsesIndex()
         $cache = new MemoryCache();
 
         $cacheResolver = new CacheResolver($cache, $resolver);
-        $cacheResolver->resolve($request, $this->path, $this->filter);
+        $cacheResolver->resolve($this->path, $this->filter);
 
         /*
          * Three items: