Merge pull request #303 from formapro-forks/cache-manager-fix-browser…

…-path [1.0][cache] cache manager has to use isStored inside getBrowserPath method
liip · Jan 20, 2014 · abc48a0 · abc48a0
2 parents 6fc4d98 + 6bdf92d
commit abc48a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Imagine/Cache/CacheManager.php b/Imagine/Cache/CacheManager.php
@@ -117,11 +117,8 @@ protected function getResolver($filter)
      */
     public function getBrowserPath($path, $filter, $absolute = false)
     {
-        //call it to make sure the resolver for the give filter exists.
-        $this->getResolver($filter);
-
-        return
-            $this->resolve($path, $filter) ?:
+        return $this->isStored($path, $filter) ?
+            $this->resolve($path, $filter) :
             $this->generateUrl($path, $filter, $absolute)
         ;
     }

diff --git a/Tests/Imagine/Cache/CacheManagerTest.php b/Tests/Imagine/Cache/CacheManagerTest.php
@@ -57,6 +57,12 @@ public function testGetBrowserPathWithoutResolver()
     public function testDefaultResolverUsedIfNoneSetOnGetBrowserPath()
     {
         $resolver = $this->getMockResolver();
+        $resolver
+            ->expects($this->once())
+            ->method('isStored')
+            ->with('cats.jpeg', 'thumbnail')
+            ->will($this->returnValue(true))
+        ;
         $resolver
             ->expects($this->once())
             ->method('resolve')
@@ -95,9 +101,13 @@ public function testFilterActionUrlGeneratedAndReturnIfResolverReturnNullOnGetBr
         $resolver = $this->getMockResolver();
         $resolver
             ->expects($this->once())
-            ->method('resolve')
+            ->method('isStored')
             ->with('cats.jpeg', 'thumbnail')
-            ->will($this->returnValue(null))
+            ->will($this->returnValue(false))
+        ;
+        $resolver
+            ->expects($this->never())
+            ->method('resolve')
         ;
 
         $config = $this->getMockFilterConfiguration();