fix return none when bool expected

thomas-kl1 · thomas-kl1 · commit dd4200bf7b3d · 2021-02-26T09:42:25.000+01:00
diff --git a/Model/Document/Helper/File.php b/Model/Document/Helper/File.php
@@ -115,14 +115,12 @@ public function deleteFile(string $filePath): bool
     {
         try {
             $directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-            if ($filePath && $directoryWrite->isFile($filePath)) {
-                return $directoryWrite->delete($filePath);
-            }
+            return $filePath && $directoryWrite->isFile($filePath) && $directoryWrite->delete($filePath);
         } catch (FileSystemException $e) {
             $this->logger->error($e->getLogMessage(), $e->getTrace());
-
-            return false;
         }
+
+        return false;
     }
 
     private function resolveFileSubPath(DocumentTypeInterface $documentType, string $fileName): string

Original file line number	Diff line number	Diff line change
`@@ -115,14 +115,12 @@ public function deleteFile(string $filePath): bool`
`115`	`115`	`{`
`116`	`116`	`try {`
`117`	`117`	`$directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);`
`118`		`- if ($filePath && $directoryWrite->isFile($filePath)) {`
`119`		`- return $directoryWrite->delete($filePath);`
`120`		`- }`
	`118`	`+ return $filePath && $directoryWrite->isFile($filePath) && $directoryWrite->delete($filePath);`
`121`	`119`	`} catch (FileSystemException $e) {`
`122`	`120`	`$this->logger->error($e->getLogMessage(), $e->getTrace());`
`123`		`-`
`124`		`- return false;`
`125`	`121`	`}`
	`122`	`+`
	`123`	`+ return false;`
`126`	`124`	`}`
`127`	`125`
`128`	`126`	`private function resolveFileSubPath(DocumentTypeInterface $documentType, string $fileName): string`