Merge pull request #5797 from marc1706/ticket/16271

[ticket/16271] Fix sami parse errors in master

phpBB/includes/acp/acp_storage.php

@@ -192,7 +192,7 @@ class acp_storage
 	/**
 	 * Get the current provider from config
 	 *
-	 * @param string $key Storage name
+	 * @param string $storage_name Storage name
 	 * @return string The current provider
 	 */
 	protected function get_current_provider($storage_name)
@@ -203,7 +203,7 @@ class acp_storage
 	/**
 	 * Get the new provider from the request
 	 *
-	 * @param string $key Storage name
+	 * @param string $storage_name Storage name
 	 * @return string The new provider
 	 */
 	protected function get_new_provider($storage_name)

phpBB/phpbb/attachment/upload.php

@@ -84,6 +84,7 @@ class upload
 	 * @param guesser $mimetype_guesser
 	 * @param dispatcher $phpbb_dispatcher
 	 * @param plupload $plupload
+	 * @param storage $storage
 	 * @param temp $temp
 	 * @param user $user
 	 */

phpBB/phpbb/files/filespec_storage.php

@@ -382,6 +382,7 @@ class filespec_storage
 	/**
 	 * Move file to destination folder
 	 *
+	 * @param \phpbb\storage\storage $storage
 	 * @param bool $overwrite If set to true, an already existing file will be overwritten
 	 * @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped
 	 *