1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00

Merge pull request #6579 from marc1706/ticket/17281

[ticket/17281] Update to psalm 5.x
This commit is contained in:
Marc Alexander
2024-01-31 21:14:15 +01:00
committed by GitHub
42 changed files with 280 additions and 239 deletions

View File

@@ -74,7 +74,7 @@ class type_converter
* @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
{

View File

@@ -288,7 +288,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
{
$id = odbc_result($result_id, 1);
odbc_free_result($result_id);
return $id;
return $id ? (int) $id : false;
}
odbc_free_result($result_id);
}

View File

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

View File

@@ -103,6 +103,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
foreach ($parent_sqls as $parent_sql)
{
/** @psalm-suppress NoValue */
$sql = 'SELECT module_id
FROM ' . $this->modules_table . "
WHERE module_class = '" . $this->db->sql_escape($class) . "'