fixed post processors using FileBinary

xavierlacot · Feb 13, 2016 · b763eaa · b763eaa
1 parent 708785a
commit b763eaa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/Binary/FileBinaryInterface.php b/Binary/FileBinaryInterface.php
@@ -8,4 +8,9 @@ interface FileBinaryInterface extends BinaryInterface
      * @return string
      */
     public function getPath();
+
+    /**
+     * @return boolean
+     */
+    public function unlink();
 }
diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
@@ -92,12 +92,17 @@ public function filterAction(Request $request, $path, $filter)
                     throw new NotFoundHttpException('Source image could not be found', $e);
                 }
 
+                $outBinary = $this->filterManager->applyFilter($binary, $filter);
                 $this->cacheManager->store(
-                    $this->filterManager->applyFilter($binary, $filter),
+                    $outBinary,
                     $path,
                     $filter,
                     $resolver
                 );
+
+                if ($outBinary instanceof FileBinaryInterface) {
+                    $outBinary->unlink();
+                }
             }
 
             return new RedirectResponse($this->cacheManager->resolve($path, $filter, $resolver), 301);

diff --git a/Imagine/Filter/PostProcessor/JpegOptimPostProcessor.php b/Imagine/Filter/PostProcessor/JpegOptimPostProcessor.php
@@ -129,8 +129,6 @@ public function process(BinaryInterface $binary)
 
         $result = new FileBinary($input, $binary->getMimeType(), $binary->getFormat());
 
-        unlink($input);
-
         return $result;
     }
 }
diff --git a/Imagine/Filter/PostProcessor/OptiPngPostProcessor.php b/Imagine/Filter/PostProcessor/OptiPngPostProcessor.php
@@ -59,8 +59,6 @@ public function process(BinaryInterface $binary)
 
         $result = new FileBinary($input, $binary->getMimeType(), $binary->getFormat());
 
-        unlink($input);
-
         return $result;
     }
 }
diff --git a/Model/FileBinary.php b/Model/FileBinary.php
@@ -64,4 +64,12 @@ public function getFormat()
     {
         return $this->format;
     }
+
+    /**
+     * @return boolean
+     */
+    public function unlink()
+    {
+        return unlink($outBinary->getPath());
+    }
 }