From 56476ed7ee209beb06f61af149340147ecfb6fd5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 29 Dec 2019 11:01:10 +0100 Subject: [PATCH] [ticket/16271] Fix sami parse errors in master PHPBB3-16271 --- phpBB/includes/acp/acp_storage.php | 4 ++-- phpBB/phpbb/attachment/upload.php | 1 + phpBB/phpbb/files/filespec_storage.php | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index c08903f54e..12a4b45d67 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/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) diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php index 37978944aa..21be17ef22 100644 --- a/phpBB/phpbb/attachment/upload.php +++ b/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 */ diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php index adf4135193..bc9d7bf6a1 100644 --- a/phpBB/phpbb/files/filespec_storage.php +++ b/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 *