Merge branch '6.2' of https://github.com/WoltLab/WCF into 6.2

Author: dtdesign

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php

@@ -194,7 +194,6 @@ public function addSettingsNodes(array $settingsNodes)
      * @param null|string $objectType name of attachment object type or `null` to unset previous attachment data
      * @param int $parentObjectID id of the parent of the object the attachments belong to or `0` if no such parent exists
      * @param ?int $objectID id of the object the attachments belong to
-     * @return  WysiwygFormContainer            this form container
      * @throws  \BadMethodCallException         if the attachment form field has already been initialized
      */
     public function attachmentData(?string $objectType = null, int $parentObjectID = 0, ?int $objectID = null): static

wcfsetup/install/files/lib/util/FileUtil.class.php

@@ -223,13 +223,8 @@ public static function unifyDirSeparator(string $path): string
     /**
      * Scans a folder (and subfolder) for a specific file.
      * Returns the filename if found, otherwise false.
-     *
-     * @param string $folder
-     * @param string $searchfile
-     * @param bool $recursive
-     * @return  mixed
      */
-    public static function scanFolder($folder, $searchfile, $recursive = true)
+    public static function scanFolder(string $folder, string $searchfile, bool $recursive = true): string|false
     {
         if (!@\is_dir($folder)) {
             return false;
@@ -259,6 +254,8 @@ public static function scanFolder($folder, $searchfile, $recursive = true)
             }
         }
         @\closedir($dirh);
+
+        return false;
     }
 
     /**