From cc4cf319f3d1faacebd39e2d8415134b8e90b7c6 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 7 Jan 2025 12:36:07 +0100
Subject: adjust signature to prevent error

---
 lib/filesystem/FolderType.php                     | 4 ++--
 lib/filesystem/InboxOutboxFolder.php              | 2 +-
 lib/filesystem/MessageFolder.php                  | 4 ++--
 lib/filesystem/StandardFolder.php                 | 6 ++----
 lib/filesystem/UnknownFolderType.php              | 4 ++--
 lib/filesystem/VirtualFolderType.php              | 4 ++--
 lib/models/Courseware/Filesystem/PublicFolder.php | 2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/filesystem/FolderType.php b/lib/filesystem/FolderType.php
index 385aef6..ce976d5 100644
--- a/lib/filesystem/FolderType.php
+++ b/lib/filesystem/FolderType.php
@@ -188,9 +188,9 @@ interface FolderType
      * Deletes a file in this folder.
      *
      * @param string $file_ref_id The ID of the FileRef object of the file that shall be deleted.
-     * @return bool True on success, False on failure.
+     * @return bool|array True on success, array with error message(s) on failure.
      */
-    public function deleteFile(string $file_ref_id):bool;
+    public function deleteFile(string $file_ref_id): bool|array;
 
     /**
      * @param  $foldertype FolderType
diff --git a/lib/filesystem/InboxOutboxFolder.php b/lib/filesystem/InboxOutboxFolder.php
index 2ac5aa8..8077d04 100644
--- a/lib/filesystem/InboxOutboxFolder.php
+++ b/lib/filesystem/InboxOutboxFolder.php
@@ -198,7 +198,7 @@ class InboxOutboxFolder implements FolderType
     /**
      * InboxOutboxFolders do not allow deleting files.
      */
-    public function deleteFile(string $file_ref_id): bool
+    public function deleteFile(string $file_ref_id): bool|array
     {
         return false;
     }
diff --git a/lib/filesystem/MessageFolder.php b/lib/filesystem/MessageFolder.php
index 7d5976c..f0d5cf6 100644
--- a/lib/filesystem/MessageFolder.php
+++ b/lib/filesystem/MessageFolder.php
@@ -256,9 +256,9 @@ class MessageFolder extends StandardFolder
      * @param string $file_ref_id The ID of the FileRef whose file
      *     shall be deleted.
      *
-     * @return bool, if the file has been deleted successfully, false otherwise.
+     * @return bool|array, if the file has been deleted successfully, false otherwise.
      */
-    public function deleteFile(string $file_ref_id): bool
+    public function deleteFile(string $file_ref_id): bool|array
     {
         $file_refs = $this->folderdata->file_refs;
 
diff --git a/lib/filesystem/StandardFolder.php b/lib/filesystem/StandardFolder.php
index d8d3c14..9f5bf7b 100644
--- a/lib/filesystem/StandardFolder.php
+++ b/lib/filesystem/StandardFolder.php
@@ -328,7 +328,6 @@ class StandardFolder implements FolderType
             foreach ($files as $folderfile) {
                 if ($folderfile->getFilename() === $filename) {
                     $name_available = false;
-                    $filename;
                     $filename = $name . '[' . ++$c . ']';
                     if ($ext) {
                         $filename .= '.' . $ext;
@@ -342,9 +341,9 @@ class StandardFolder implements FolderType
 
     /**
      * @param string $file_ref_id
-     * @return bool
+     * @return bool|array
      */
-    public function deleteFile(string $file_ref_id): bool
+    public function deleteFile(string $file_ref_id): bool|array
     {
         $file_ref = $this->folderdata->file_refs->find($file_ref_id);
 
@@ -363,7 +362,6 @@ class StandardFolder implements FolderType
         return 0;
     }
 
-
     /**
      * @param FolderType $foldertype
      * @return FolderType|null
diff --git a/lib/filesystem/UnknownFolderType.php b/lib/filesystem/UnknownFolderType.php
index 804ab31..5b38509 100644
--- a/lib/filesystem/UnknownFolderType.php
+++ b/lib/filesystem/UnknownFolderType.php
@@ -198,9 +198,9 @@ class UnknownFolderType implements FolderType
 
     /**
      * @param string $file_ref_id
-     * @return bool
+     * @return bool|array
      */
-    public function deleteFile(string $file_ref_id): bool
+    public function deleteFile(string $file_ref_id): bool|array
     {
         return false;
     }
diff --git a/lib/filesystem/VirtualFolderType.php b/lib/filesystem/VirtualFolderType.php
index 9155829..269dd59 100644
--- a/lib/filesystem/VirtualFolderType.php
+++ b/lib/filesystem/VirtualFolderType.php
@@ -226,9 +226,9 @@ class VirtualFolderType implements FolderType
 
     /**
      * @param string $file_ref_id
-     * @return bool
+     * @return bool|array
      */
-    public function deleteFile(string $file_ref_id): bool
+    public function deleteFile(string $file_ref_id): bool|array
     {
         return true;
     }
diff --git a/lib/models/Courseware/Filesystem/PublicFolder.php b/lib/models/Courseware/Filesystem/PublicFolder.php
index 3fada8b..10af85c 100644
--- a/lib/models/Courseware/Filesystem/PublicFolder.php
+++ b/lib/models/Courseware/Filesystem/PublicFolder.php
@@ -166,7 +166,7 @@ class PublicFolder extends StandardFolder
     /**
      * {@inheritdoc}
      */
-    public function deleteFile(string $file_ref_id): bool
+    public function deleteFile(string $file_ref_id): bool|array
     {
         $fileRefs = $this->folder->file_refs;
 
-- 
cgit v1.0