[ticket/17281] Update psalm config and fix issues

PHPBB3-17281

Author: marc1706

attachment/upload.php

@@ -219,6 +219,7 @@ public function upload($form_name, $forum_id, $local = false, $local_storage = '
 				$this->storage->delete($thumbnail_file);
 			}
 
+			/** @psalm-suppress NoValue */
 			$this->file_data['error'] = array_merge($this->file_data['error'], $this->file->error);
 			$this->file_data['post_attach'] = false;
 

avatar/manager.php

@@ -190,7 +190,7 @@ public function get_enabled_drivers()
 	* @param array	$row			User data or group data
 	* @param string $prefix			Prefix of data keys (e.g. user), should not include the trailing underscore
 	*
-	* @return array	User or group data with keys that have been
+	* @return array{string, string}	User or group data with keys that have been
 	*			stripped from the preceding "user_" or "group_"
 	*			Also the group id is prefixed with g, when the prefix group is removed.
 	*/
@@ -202,7 +202,7 @@ public static function clean_row($row, $prefix = '')
 			return self::$default_row;
 		}
 
-		$output = array();
+		$output = [];
 		foreach ($row as $key => $value)
 		{
 			$key = preg_replace("#^(?:{$prefix}_)#", '', $key);

captcha/non_gd.php

@@ -78,6 +78,7 @@ function execute($code, $seed)
 
 				for ($j = 0; $j < $code_len; $j++)
 				{
+					/** @psalm-suppress InvalidArrayOffset */
 					$image .= $this->randomise(substr($hold_chars[$code[$j]][$i - $offset_y - 1], 1), $char_widths[$j]);
 				}
 

config/config.php

@@ -27,7 +27,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
 	/**
 	* Creates a configuration container with a default set of values
 	*
-	* @param array<string,string> $config The configuration data.
+	* @param array<string,int|string> $config The configuration data.
 	*/
 	public function __construct(array $config)
 	{
@@ -74,22 +74,22 @@ public function offsetGet($key)
 	* The configuration change will not persist. It will be lost
 	* after the request.
 	*
-	* @param string $key   The configuration option's name.
-	* @param string $value The temporary value.
+	* @param string $offset   The configuration option's name.
+	* @param int|string $value The temporary value.
 	*/
 	#[\ReturnTypeWillChange]
-	public function offsetSet($key, $value)
+	public function offsetSet($offset, $value)
 	{
-		$this->config[$key] = $value;
+		$this->config[$offset] = $value;
 	}
 
 	/**
 	* Called when deleting a configuration value directly, triggers an error.
 	*
-	* @param string $key The configuration option's name.
+	* @param string $offset The configuration option's name.
 	*/
 	#[\ReturnTypeWillChange]
-	public function offsetUnset($key)
+	public function offsetUnset($offset): never
 	{
 		trigger_error('Config values have to be deleted explicitly with the \phpbb\config\config::delete($key) method.', E_USER_ERROR);
 	}
@@ -121,7 +121,7 @@ public function delete($key, $use_cache = true)
 	* Sets a configuration option's value
 	*
 	* @param string $key       The configuration option's name
-	* @param string $value     New configuration value
+	* @param int|string $value     New configuration value
 	* @param bool   $use_cache Whether this variable should be cached or if it
 	*                          changes too frequently to be efficiently cached.
 	*/
@@ -135,8 +135,8 @@ public function set($key, $value, $use_cache = true)
 	* current configuration value or the configuration value does not exist yet.
 	*
 	* @param  string $key       The configuration option's name
-	* @param  string $old_value Current configuration value
-	* @param  string $new_value New configuration value
+	* @param  int|string $old_value Current configuration value
+	* @param  int|string $new_value New configuration value
 	* @param  bool   $use_cache Whether this variable should be cached or if it
 	*                           changes too frequently to be efficiently cached.
 	* @return bool              True if the value was changed, false otherwise.
@@ -157,7 +157,7 @@ public function set_atomic($key, $old_value, $new_value, $use_cache = true)
 	* only after set_atomic has been called.
 	*
 	* @param  string $key       The configuration option's name
-	* @param  string $new_value New configuration value
+	* @param  int|string $new_value New configuration value
 	* @throws \phpbb\exception\http_exception when config value is set and not equal to new_value.
 	* @return bool              True if the value was changed, false otherwise.
 	*/

config/db.php

@@ -127,10 +127,10 @@ public function delete($key, $use_cache = true)
 	/**
 	* Sets a configuration option's value
 	*
-	* @param string $key       The configuration option's name
-	* @param string $value     New configuration value
-	* @param bool   $use_cache Whether this variable should be cached or if it
-	*                          changes too frequently to be efficiently cached.
+	* @param	string		$key		The configuration option's name
+	* @param	int|string	$value		New configuration value
+	* @param	bool		$use_cache	Whether this variable should be cached or if it
+	*									changes too frequently to be efficiently cached.
 	*/
 	public function set($key, $value, $use_cache = true)
 	{
@@ -141,13 +141,13 @@ public function set($key, $value, $use_cache = true)
 	* Sets a configuration option's value only if the old_value matches the
 	* current configuration value or the configuration value does not exist yet.
 	*
-	* @param  string $key       The configuration option's name
-	* @param  mixed  $old_value Current configuration value or false to ignore
-	*                           the old value
-	* @param  string $new_value New configuration value
-	* @param  bool   $use_cache Whether this variable should be cached or if it
-	*                           changes too frequently to be efficiently cached
-	* @return bool              True if the value was changed, false otherwise
+	* @param	string			$key		The configuration option's name
+	* @param	false|int|string	$old_value	Current configuration value or false to ignore
+	*										the old value
+	* @param	int|string		$new_value	New configuration value
+	* @param	bool			$use_cache	Whether this variable should be cached or if it
+	*										changes too frequently to be efficiently cached
+	* @return	bool						True if the value was changed, false otherwise
 	*/
 	public function set_atomic($key, $old_value, $new_value, $use_cache = true)
 	{

cron/manager.php

@@ -86,7 +86,7 @@ public function __construct(ContainerInterface $phpbb_container, helper $routing
 	* Loads tasks given by name, wraps them
 	* and puts them into $this->tasks.
 	*
-	* @param array|\Traversable $tasks		Array of instances of \phpbb\cron\task\task
+	* @param array|\ArrayObject $tasks		Array of instances of \phpbb\cron\task\task
 	*/
 	public function load_tasks($tasks)
 	{
@@ -106,6 +106,7 @@ public function load_tasks_from_container()
 		{
 			$this->is_initialised_from_container = true;
 
+			/** @var array|\phpbb\di\service_collection $tasks */
 			$tasks = $this->phpbb_container->get('cron.task_collection');
 
 			$this->load_tasks($tasks);

cron/task/core/tidy_plupload.php

@@ -105,7 +105,7 @@ public function run()
 			));
 		}
 
-		$this->config->set('plupload_last_gc', time(), true);
+		$this->config->set('plupload_last_gc', time());
 	}
 
 	/**

db/doctrine/type_converter.php

@@ -74,7 +74,7 @@ public static function convert(string $type, string $dbms): array
 	 * @param string	$type	Legacy type name.
 	 * @param int		$length	Type length.
 	 *
-	 * @return array{string, array} Pair of type name and options.
+	 * @return array{string, array{string, ...}} Pair of type name and options.
 	 */
 	private static function mapWithLength(string $type, int $length): array
 	{

db/driver/mssql_odbc.php

@@ -279,7 +279,7 @@ public function sql_last_inserted_id()
 			{
 				$id = odbc_result($result_id, 1);
 				odbc_free_result($result_id);
-				return $id;
+				return $id ? (int) $id : false;
 			}
 			odbc_free_result($result_id);
 		}

db/migration/exception.php

@@ -44,7 +44,7 @@ public function __construct()
 	*
 	* @return string
 	*/
-	public function __toString()
+	public function __toString(): string
 	{
 		return $this->message . ': ' . var_export($this->parameters, true);
 	}