Merge pull request #67 from havvg/feature/amazons3-resolver

move getFilePath to AbstractFilesystemResolver
liip · May 4, 2012 · fc4ef48 · fc4ef48
2 parents ddeebf2 + 4645098
commit fc4ef48
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php
@@ -49,4 +49,33 @@ public function store(Response $response, $targetPath, $filter)
 
         return $response;
     }
+
+    /**
+     * Removes a stored image resource.
+     *
+     * @param string $targetPath The target path provided by the resolve method.
+     * @param string $filter The name of the imagine filter in effect.
+     *
+     * @return bool Whether the file has been removed successfully.
+     */
+    public function remove($targetPath, $filter)
+    {
+        $filename = $this->getFilePath($targetPath, $filter);
+        $this->filesystem->remove($filename);
+
+        return file_exists($filename);
+    }
+
+    /**
+     * Return the local filepath.
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+     *
+     * @param string $path The resource path to convert.
+     * @param string $filter The name of the imagine filter.
+     * @param string $basePath An optional base path to remove from the path.
+     *
+     * @return string
+     */
+    abstract protected function getFilePath($path, $filter, $basePath = '');
 }
diff --git a/Imagine/Cache/Resolver/WebPathResolver.php b/Imagine/Cache/Resolver/WebPathResolver.php
@@ -64,25 +64,6 @@ public function getBrowserPath($targetPath, $filter, $absolute = false)
     /**
      * {@inheritDoc}
      */
-    public function remove($targetPath, $filter)
-    {
-        $filename = $this->getFilePath($targetPath, $filter);
-        $this->filesystem->remove($filename);
-
-        return file_exists($filename);
-    }
-
-    /**
-     * Return the local filepath.
-     *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     *
-     * @param string $path The resource path to convert.
-     * @param string $filter The name of the imagine filter.
-     * @param string $basePath An optional base path to remove from the path.
-     *
-     * @return string
-     */
     protected function getFilePath($path, $filter, $basePath = '')
     {
         $browserPath = $this->decodeBrowserPath($this->getBrowserPath($path, $filter));