11 files changed, 18 insertions, 8 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index c31b63a403..21c630d495 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -44,7 +44,7 @@ class bbcode
 	/**
 	* Init bbcode cache entries if bitfield is specified
 	*
-	* @param	string	$bbcode_bitfield	The bbcode bitfield
+	* @param	string	$bitfield	The bbcode bitfield
 	*/
 	function bbcode_set_bitfield($bitfield = '')
 	{
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index 6a78136e5f..43699f7d6e 100644
--- a/phpBB/phpbb/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
@@ -40,8 +40,8 @@ class ldap extends base
 	/**
 	 * LDAP Authentication Constructor
 	 *
-	 * @param	driver_interface	$db			DBAL driver interface
 	 * @param	config				$config		Config object
+	 * @param	driver_interface	$db			DBAL driver interface
 	 * @param	language			$language	Language object
 	 * @param	user				$user		User object
 	 */
diff --git a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php
index ea9ef43788..239e661989 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php
@@ -73,8 +73,6 @@ interface service_interface
 
 	/**
 	 * Returns the external library service provider once it has been set
-	 *
-	 * @param \OAuth\Common\Service\ServiceInterface|null
 	 */
 	public function get_external_service_provider();
 
diff --git a/phpBB/phpbb/console/command/cron/run.php b/phpBB/phpbb/console/command/cron/run.php
index df8bcf44f9..511c6bc01b 100644
--- a/phpBB/phpbb/console/command/cron/run.php
+++ b/phpBB/phpbb/console/command/cron/run.php
@@ -145,9 +145,11 @@ class run extends \phpbb\console\command\command
 	*		and returns with status 2.
 	*
 	* @see execute
-	* @param string $task_name The name of the task that should be run.
+	*
 	* @param InputInterface $input The input stream used to get the argument and verbose option.
 	* @param OutputInterface $output The output stream, used for printing verbose-mode and error information.
+	* @param string $task_name The name of the task that should be run.
+	*
 	* @return int 0 if all is well, 2 if no task matches $task_name.
 	*/
 	protected function run_one(InputInterface $input, OutputInterface $output, $task_name)
diff --git a/phpBB/phpbb/console/command/update/check.php b/phpBB/phpbb/console/command/update/check.php
index 85c6cf7379..4cd7d2155c 100644
--- a/phpBB/phpbb/console/command/update/check.php
+++ b/phpBB/phpbb/console/command/update/check.php
@@ -223,6 +223,7 @@ class check extends \phpbb\console\command\command
 	* Check if all the available extensions are up to date
 	*
 	* @param SymfonyStyle	$io			IO handler, for formatted and unified IO
+	* @param string			$stability	Stability specifier string
 	* @param bool			$recheck	Disallow the use of the cache
 	* @return int
 	*/
diff --git a/phpBB/phpbb/language/language_file_loader.php b/phpBB/phpbb/language/language_file_loader.php
index b6816afd16..2910dd3c4a 100644
--- a/phpBB/phpbb/language/language_file_loader.php
+++ b/phpBB/phpbb/language/language_file_loader.php
@@ -151,6 +151,7 @@ class language_file_loader
 	 *
 	 * @param string	$path		Path to language directory
 	 * @param string	$filename	Filename to load language strings from
+	 * @param array		$locales	Array containing language fallback options
 	 *
 	 * @return string	Relative path to language file
 	 *
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index 5a5b8a1874..80d7e914db 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -325,6 +325,8 @@ class plupload
 	* by PHP and actually exists, if not, it generates an error
 	*
 	* @param string $form_name The name of the file in the form data
+	* @param int $chunk Chunk number
+	* @param string $file_path File path
 	*
 	* @return null
 	*/
diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php
index 5c30f9b062..4d7bc9ea48 100644
--- a/phpBB/phpbb/request/request.php
+++ b/phpBB/phpbb/request/request.php
@@ -268,7 +268,7 @@ class request implements \phpbb\request\request_interface
 	* whatever).
 	*
 	* @param	string|array	$var_name		See \phpbb\request\request_interface::variable
-	* @param	mixed			$Default		See \phpbb\request\request_interface::variable
+	* @param	mixed			$default		See \phpbb\request\request_interface::variable
 	*
 	* @return	mixed	The server variable value.
 	*/
diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php
index 54dd8cef15..a1fbf0ae45 100644
--- a/phpBB/phpbb/request/request_interface.php
+++ b/phpBB/phpbb/request/request_interface.php
@@ -104,7 +104,7 @@ interface request_interface
 	*
 	* @return	mixed	The header value.
 	*/
-	public function header($var_name, $default = '');
+	public function header($header_name, $default = '');
 
 	/**
 	* Checks whether a certain variable was sent via POST.
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index 8bdc31e128..42ac6eaba2 100644
--- a/phpBB/phpbb/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
@@ -83,7 +83,7 @@ class fulltext_mysql extends \phpbb\search\base
 	 * @param string $phpEx PHP file extension
 	 * @param \phpbb\auth\auth $auth Auth object
 	 * @param \phpbb\config\config $config Config object
-	 * @param \phpbb\db\driver\driver_interface Database object
+	 * @param \phpbb\db\driver\driver_interface $db Database object
 	 * @param \phpbb\user $user User object
 	 * @param \phpbb\event\dispatcher_interface	$phpbb_dispatcher	Event dispatcher object
 	 */
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 295c2cf33c..63ac242ea2 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -109,6 +109,12 @@ class fulltext_native extends \phpbb\search\base
 	* Initialises the fulltext_native search backend with min/max word length
 	*
 	* @param	boolean|string	&$error	is passed by reference and should either be set to false on success or an error message on failure
+	* @param	string	$phpbb_root_path	phpBB root path
+	* @param	string	$phpEx	PHP file extension
+	* @param	\phpbb\auth\auth	$auth	Auth object
+	* @param	\phpbb\config\config	$config	Config object
+	* @param	\phpbb\db\driver\driver_interface	$db	Database object
+	* @param	\phpbb\user	$user	User object
 	* @param	\phpbb\event\dispatcher_interface	$phpbb_dispatcher	Event dispatcher object
 	*/
 	public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher)