Ability to remove file for ReplacingFile (#1462)

src/FileAbstraction/ReplacingFile.php

@@ -5,16 +5,34 @@
 namespace Vich\UploaderBundle\FileAbstraction;
 
 use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * This class can be used to signal that the given file should be "uploaded" into the Vich-abstraction
  * in cases where it is not possible to construct an `UploadedFile`.
  */
 class ReplacingFile extends File
 {
+    public function __construct(
+        string $path,
+        bool $checkPath = true,
+        private readonly bool $removeReplacedFile = false,
+        private readonly bool $removeReplacedFileOnError = false
+    ) {
+        parent::__construct($path, $checkPath);
+    }
+
     public function getClientOriginalName(): string
     {
         return $this->getFilename();
     }
+
+    public function isRemoveReplacedFile(): bool
+    {
+        return $this->removeReplacedFile;
+    }
+
+    public function isRemoveReplacedFileOnError(): bool
+    {
+        return $this->removeReplacedFileOnError;
+    }
 }

src/Storage/AbstractStorage.php

@@ -46,7 +46,23 @@ public function upload(object $obj, PropertyMapping $mapping): void
 
         $dir = $mapping->getUploadDir($obj);
 
-        $this->doUpload($mapping, $file, $dir, $name);
+        try {
+            $this->doUpload($mapping, $file, $dir, $name);
+        } catch (\Exception $e) {
+            if ($file instanceof ReplacingFile
+                && $file->isRemoveReplacedFileOnError()
+            ) {
+                unlink($file->getPathname());
+            }
+
+            throw $e;
+        }
+
+        if ($file instanceof ReplacingFile
+            && $file->isRemoveReplacedFile()
+        ) {
+            unlink($file->getPathname());
+        }
     }
 
     abstract protected function doRemove(PropertyMapping $mapping, ?string $dir, string $name): ?bool;