[ticket/16346] More fixes

PHPBB3-16346

phpBB/config/default/container/services_console.yml

@@ -289,7 +289,6 @@ services:
         class: phpbb\console\command\user\activate
         arguments:
             - '@user'
-            - '@dbal.conn'
             - '@config'
             - '@language'
             - '@log'
@@ -317,7 +316,6 @@ services:
         class: phpbb\console\command\user\delete
         arguments:
             - '@user'
-            - '@dbal.conn'
             - '@language'
             - '@log'
             - '@user_loader'

phpBB/includes/functions_compatibility.php

@@ -869,8 +869,8 @@ function phpbb_to_numeric($input)
 * @param \phpbb\request\request_interface		$request	Request object
 * @param \phpbb\auth\auth						$auth		Auth object
 * @param \phpbb\db\driver\driver_interface		$db			Database connection
- *
- * @deprecated 3.3.1 (To be removed: 4.0.0-a1); use controller helper's display_sql_report()
+*
+* @deprecated 3.3.1 (To be removed: 4.0.0-a1); use controller helper's display_sql_report()
 */
 function phpbb_check_and_display_sql_report(\phpbb\request\request_interface $request, \phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db)
 {

phpBB/includes/functions_mcp.php

@@ -679,11 +679,11 @@ function phpbb_mcp_sorting($mode, &$sort_days_val, &$sort_key_val, &$sort_dir_va
 /**
 * Validate ids
 *
-* @param	array	&$ids			The relevant ids to check
-* @param	string	$table			The table to find the ids in
-* @param	string	$sql_id			The ids relevant column name
-* @param	array	$acl_list		A list of permissions the user need to have
-* @param	mixed	$single_forum	Limit to one forum id (int) or the first forum found (true)
+* @param	array		&$ids			The relevant ids to check
+* @param	string		$table			The table to find the ids in
+* @param	string		$sql_id			The ids relevant column name
+* @param	array|false	$acl_list		A list of permissions the user need to have
+* @param	mixed		$single_forum	Limit to one forum id (int) or the first forum found (true)
 *
 * @return	mixed	False if no ids were able to be retrieved, true if at least one id left.
 *					Additionally, this value can be the forum_id assigned if $single_forum was set.

phpBB/phpbb/files/filespec.php

@@ -19,7 +19,7 @@ use phpbb\language\language;
  * Responsible for holding all file relevant information, as well as doing file-specific operations.
  * The {@link fileupload fileupload class} can be used to upload several files, each of them being this object to operate further on.
  *
- * @deprecated
+ * @deprecated 4.0.0	Use phpbb\files\filespec_storage instead
  */
 class filespec
 {