improve error message + resolve dest path after FProcess

Author: thomas-kl1

Controller/Adminhtml/Index/Save/FileHandler.php

@@ -99,6 +99,7 @@ private function processFile(DocumentTypeInterface $documentType, RequestInterfa
             $data['file_path'] = null;
         } elseif (isset($fileUploader[0]['path'], $fileUploader[0]['file'])) {
             $fileSrcPath = $fileUploader[0]['path'] . $fileUploader[0]['file'];
+            $this->rollbackData['destFilePath'] = $fileSrcPath;
 
             $this->validator->validate($fileSrcPath, $documentType->getFileAllowedExtensions());
 

Model/Document/Operation/CreateFromFile.php

@@ -43,8 +43,7 @@ public function __construct(
 
     public function execute(DocumentTypeInterface $documentType, string $file): DocumentInterface
     {
-        $destFilePath = $this->fileHelper->getFileDestPath($documentType, $file);
-        $document = $this->processorFactory->get($documentType->getCode())->execute($documentType, $destFilePath);
+        $document = $this->processorFactory->get($documentType->getCode())->execute($documentType, $file);
         $destFilePath = $this->fileHelper->getFilePath($document);
         $this->fileHelper->moveFile($file, $destFilePath);
 

Model/Document/Processor/SimpleProcessor.php

@@ -40,12 +40,14 @@ public function __construct(
 
     public function execute(DocumentTypeInterface $documentType, string $filePath): DocumentInterface
     {
-        $fileName = basename($filePath);
+        $destFilePath = $this->fileHelper->getFileDestPath($documentType, $filePath);
+        $fileName = basename($destFilePath);
+
         $this->documentBuilder->setTypeId($documentType->getId());
         $this->documentBuilder->setCode(Format::formatCode($fileName));
         $this->documentBuilder->setName(Format::formatName($fileName));
         $this->documentBuilder->setFileName($fileName);
-        $this->documentBuilder->setFilePath(dirname($this->fileHelper->getRelativeFilePath($filePath)));
+        $this->documentBuilder->setFilePath(dirname($this->fileHelper->getRelativeFilePath($destFilePath)));
 
         return $this->documentBuilder->create();
     }

Model/File/Validator.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\File\Mime;
 use Magento\Framework\Phrase;
+use function implode;
 use function in_array;
 use function pathinfo;
 use function strtolower;
@@ -84,7 +85,10 @@ public function validate(string $file, array $allowedExtensions): bool
         $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
 
         if (!in_array($extension, $allowedExtensions, true)) {
-            throw new ValidatorException(new Phrase('The file extension "%1" is not allowed.', [$extension]));
+            throw new ValidatorException(new Phrase(
+                'The file extension "%1" is not part of the allowed list: "%2".',
+                [$extension, implode(', ', $allowedExtensions)]
+            ));
         }
         if ($this->mime->getMimeType($file) !== (self::MIME_TYPES[$extension] ?? 'application/octet-stream')) {
             throw new ValidatorException(new Phrase('The file extension "%1" does not match its mime type.'));

README.md

@@ -125,17 +125,19 @@ final class CustomProcessor implements ProcessorInterface
 
     public function execute(DocumentTypeInterface $documentType, string $filePath): DocumentInterface
     {
-        // $filePath is the path where the file is being moved
-        // You can change the destination path if you edit the file path value
-        // with $this->documentBuilder->setFilePath($newDestPath)
-        // and $this->documentBuilder->setFileName($newFileName)
+        // $filePath is the path where the source file is currently saved.
+        // You can change the destination path if want to.
+        // Edit the file path value with $this->documentBuilder->setFilePath($newDestPath).
+        // You can also rename the file with $this->documentBuilder->setFileName($newFileName)
+
+        $destFilePath = $this->fileHelper->getFileDestPath($documentType, $filePath);
+        $fileName = basename($destFilePath);
 
-        $fileName = basename($filePath);
         $this->documentBuilder->setTypeId($documentType->getId());
         $this->documentBuilder->setCode(Format::formatCode($fileName));
         $this->documentBuilder->setName(Format::formatName($fileName));
         $this->documentBuilder->setFileName($fileName);
-        $this->documentBuilder->setFilePath(dirname($this->fileHelper->getRelativeFilePath($filePath)));
+        $this->documentBuilder->setFilePath(dirname($this->fileHelper->getRelativeFilePath($destFilePath)));
 
         return $this->documentBuilder->create();
     }