remove redundant type hint class, re #4946

16 files changed, 24 insertions, 24 deletions

diff --git a/lib/filesystem/CourseDateFolder.php b/lib/filesystem/CourseDateFolder.php
index 64ea819..d1f7018 100644
--- a/lib/filesystem/CourseDateFolder.php
+++ b/lib/filesystem/CourseDateFolder.php
@@ -107,7 +107,7 @@ class CourseDateFolder extends PermissionEnabledFolder
      *
      * @return FolderType|MessageBox The template with the edited data
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $date = CourseDate::find($folderdata['course_date_folder_termin_id']);
         if ($date === null) {
diff --git a/lib/filesystem/CourseGroupFolder.php b/lib/filesystem/CourseGroupFolder.php
index e770332..9697633 100644
--- a/lib/filesystem/CourseGroupFolder.php
+++ b/lib/filesystem/CourseGroupFolder.php
@@ -134,7 +134,7 @@ class CourseGroupFolder extends StandardFolder
      *
      * @return FolderType|MessageBox The template with the edited data
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         if ($folderdata['group'] == null){
             return MessageBox::error(_('Es wurde keine gültige Gruppe ausgewählt.'));
diff --git a/lib/filesystem/CoursePublicFolder.php b/lib/filesystem/CoursePublicFolder.php
index 0edd9df..0aabac4 100644
--- a/lib/filesystem/CoursePublicFolder.php
+++ b/lib/filesystem/CoursePublicFolder.php
@@ -124,11 +124,11 @@ class CoursePublicFolder extends StandardFolder
     /**
      * Sets the data from a submitted edit template.
      *
-     * @param array|ArrayAccess|Request $folderdata The data from the edit template.
+     * @param array|ArrayAccess $folderdata The data from the edit template.
      *
      * @return FolderType|MessageBox
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $this->folderdata['data_content']['worldwide_access'] = $folderdata['course_public_folder_worldwide_access'];
         return parent::setDataFromEditTemplate($folderdata);
diff --git a/lib/filesystem/CourseTopicFolder.php b/lib/filesystem/CourseTopicFolder.php
index 9fcd8b8..10b3838 100644
--- a/lib/filesystem/CourseTopicFolder.php
+++ b/lib/filesystem/CourseTopicFolder.php
@@ -95,7 +95,7 @@ class CourseTopicFolder extends PermissionEnabledFolder
      *
      * @return FolderType|MessageBox The template with the edited data
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $topic = CourseTopic::find($folderdata['topic_id']);
         if ($topic === null) {
diff --git a/lib/filesystem/FolderType.php b/lib/filesystem/FolderType.php
index 6816b62..6ed158d 100644
--- a/lib/filesystem/FolderType.php
+++ b/lib/filesystem/FolderType.php
@@ -160,11 +160,11 @@ interface FolderType
     /**
      * gets data from edit form
      *
-     * @param array|ArrayAccess|Request $folderdata
+     * @param array|ArrayAccess $folderdata
      * @return FolderType|MessageBox FolderType instance on success,
      *     a MessageBox object with an error message on failure.
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox;
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox;
 
     /**
      * Validates a file upload.
diff --git a/lib/filesystem/HiddenFolder.php b/lib/filesystem/HiddenFolder.php
index c47a631..ef6f23b 100644
--- a/lib/filesystem/HiddenFolder.php
+++ b/lib/filesystem/HiddenFolder.php
@@ -90,11 +90,11 @@ class HiddenFolder extends PermissionEnabledFolder
     /**
      * Sets the data from a submitted edit template.
      *
-     * @param array|ArrayAccess|Request $folderdata The data from the edit template.
+     * @param array|ArrayAccess $folderdata The data from the edit template.
      *
      * @return FolderType|MessageBox
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $this->download_allowed = (int) $folderdata['hidden_folder_download_allowed'];
         return parent::setDataFromEditTemplate($folderdata);
diff --git a/lib/filesystem/InboxOutboxFolder.php b/lib/filesystem/InboxOutboxFolder.php
index 36c5900..b2ef39a 100644
--- a/lib/filesystem/InboxOutboxFolder.php
+++ b/lib/filesystem/InboxOutboxFolder.php
@@ -169,7 +169,7 @@ class InboxOutboxFolder implements FolderType
     /**
      * InboxOutboxFolders do not have an edit template.
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         return MessageBox::error(
             _('InboxOutbox-Ordner können nicht bearbeitet werden!')
diff --git a/lib/filesystem/MessageFolder.php b/lib/filesystem/MessageFolder.php
index 3e07858..1a07478 100644
--- a/lib/filesystem/MessageFolder.php
+++ b/lib/filesystem/MessageFolder.php
@@ -226,7 +226,7 @@ class MessageFolder extends StandardFolder
      * MessageFolders don't have an edit template and therefore cannot
      * handle requests from such templates.
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         return MessageBox::error('Not applicable for message folders');
     }
diff --git a/lib/filesystem/PublicFolder.php b/lib/filesystem/PublicFolder.php
index 8184487..285a0df 100644
--- a/lib/filesystem/PublicFolder.php
+++ b/lib/filesystem/PublicFolder.php
@@ -172,11 +172,11 @@ class PublicFolder extends StandardFolder
     /**
      * Sets the data from a submitted edit template.
      *
-     * @param array|ArrayAccess|Request $folderdata The data from the edit template.
+     * @param array|ArrayAccess $folderdata The data from the edit template.
      *
      * @return FolderType|MessageBox A "reference" to this PublicFolder.
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $this->viewable = (int) $folderdata['public_folder_viewable'];
         return parent::setDataFromEditTemplate($folderdata);
diff --git a/lib/filesystem/ResourceFolder.php b/lib/filesystem/ResourceFolder.php
index d86e534..edb7a48 100644
--- a/lib/filesystem/ResourceFolder.php
+++ b/lib/filesystem/ResourceFolder.php
@@ -108,7 +108,7 @@ class ResourceFolder extends StandardFolder
         return [];
     }
 
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         return MessageBox::error(
             _('Ressourcenordner dürfen nicht geändert werden!')
diff --git a/lib/filesystem/RootFolder.php b/lib/filesystem/RootFolder.php
index 46558de..619c07d 100644
--- a/lib/filesystem/RootFolder.php
+++ b/lib/filesystem/RootFolder.php
@@ -127,10 +127,10 @@ class RootFolder extends StandardFolder
     }
 
     /**
-     * @param array|ArrayAccess|Request $folderdata
+     * @param array|ArrayAccess $folderdata
      * @return FolderType|MessageBox
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $locked_status = null;
         if (isset($folderdata['locked'])) {
diff --git a/lib/filesystem/StandardFolder.php b/lib/filesystem/StandardFolder.php
index fdf4b25..e3f1121 100644
--- a/lib/filesystem/StandardFolder.php
+++ b/lib/filesystem/StandardFolder.php
@@ -202,10 +202,10 @@ class StandardFolder implements FolderType
     }
 
     /**
-     * @param array|ArrayAccess|Request $folderdata
+     * @param array|ArrayAccess $folderdata
      * @return FolderType|MessageBox
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         if (!$folderdata['name']) {
             return MessageBox::error(_('Die Bezeichnung des Ordners fehlt.'));
diff --git a/lib/filesystem/TimedFolder.php b/lib/filesystem/TimedFolder.php
index 2bf5ff3..b331f0d 100644
--- a/lib/filesystem/TimedFolder.php
+++ b/lib/filesystem/TimedFolder.php
@@ -178,7 +178,7 @@ class TimedFolder extends PermissionEnabledFolder
      *
      * @return FolderType|MessageBox The template with the edited data
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         $permvalue = ($folderdata['perm_read'] ? $this->perms['r'] : 0) +
             ($folderdata['perm_write'] ? $this->perms['w'] : 0) +
diff --git a/lib/filesystem/UnknownFolderType.php b/lib/filesystem/UnknownFolderType.php
index 923625a..1d3f590 100644
--- a/lib/filesystem/UnknownFolderType.php
+++ b/lib/filesystem/UnknownFolderType.php
@@ -149,9 +149,9 @@ class UnknownFolderType implements FolderType
     }
 
     /**
-     * @param array|ArrayAccess|Request $folderdata
+     * @param array|ArrayAccess $folderdata
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         return MessageBox::error('Not applicable for unknown folder type');
     }
diff --git a/lib/filesystem/VirtualFolderType.php b/lib/filesystem/VirtualFolderType.php
index 30563b1..0409018 100644
--- a/lib/filesystem/VirtualFolderType.php
+++ b/lib/filesystem/VirtualFolderType.php
@@ -163,9 +163,9 @@ class VirtualFolderType implements FolderType
     }
 
     /**
-     * @param array|ArrayAccess|Request $folderdata
+     * @param array|ArrayAccess $folderdata
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         return MessageBox::error('Not applicable for virtual folder type');
     }
diff --git a/lib/models/Courseware/Filesystem/PublicFolder.php b/lib/models/Courseware/Filesystem/PublicFolder.php
index e98d7b5..83c105a 100644
--- a/lib/models/Courseware/Filesystem/PublicFolder.php
+++ b/lib/models/Courseware/Filesystem/PublicFolder.php
@@ -158,7 +158,7 @@ class PublicFolder extends StandardFolder
     /**
      * {@inheritdoc}
      */
-    public function setDataFromEditTemplate(array|ArrayAccess|Request $folderdata): FolderType|MessageBox
+    public function setDataFromEditTemplate(array|ArrayAccess $folderdata): FolderType|MessageBox
     {
         return $this;
     }