diff --git a/composer.json b/composer.json index 7167a42d3f..d3722ff3fc 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "symfony/finder": "^4.4", "symfony/twig-bridge": "^4.4", "tecnickcom/tcpdf": "^6.3", - "vimeo/psalm": "^3.11" + "vimeo/psalm": "^3.13" }, "extra": { "branch-alias": { diff --git a/psalm-baseline.xml b/psalm-baseline.xml index ebdef1b716..5ef330fd31 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + Util::formatByteDown($value, $limes, $comma) @@ -21,6 +21,9 @@ $this->dbi->getError() $this->dbi->getError(DatabaseInterface::CONNECT_CONTROL) + + $table == '' + @@ -28,6 +31,72 @@ + + $name + $variant + $name + $unicode + $name + $name + $name + $name + $name + $name + $unicode + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $unknown + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $level + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $name + $level + $name + $name + $name + $name + $name + $name + $name + $found + $name @@ -401,6 +470,9 @@ $where_clause ?? null + + $biggest_max_file_size > 0 + @@ -535,6 +607,11 @@ is_string($data) + + PMA_USR_BROWSER_AGENT + PMA_USR_BROWSER_AGENT + PMA_USR_BROWSER_VER + @@ -566,7 +643,8 @@ null - + + $table $sortOrder @@ -579,6 +657,9 @@ + + $affected + $routine['item_type_toggle'] $routine['item_returntype'] @@ -816,6 +897,13 @@ $errorNumber + + + PMA_USR_BROWSER_AGENT + PMA_USR_BROWSER_VER + PMA_USR_OS + + $memory_limit @@ -834,6 +922,10 @@ $line $line + + PMA_USR_BROWSER_AGENT + PMA_USR_BROWSER_VER + @@ -1029,6 +1121,9 @@ $current_result + + $dispval + $tmp $insert_id @@ -1100,12 +1195,6 @@ getPresence - - $icons - - - $icons - $table $container->realName @@ -1180,6 +1269,12 @@ $text $text + + $property_class == BoolPropertyItem::class + $property_class == MessageOnlyPropertyItem::class + $property_class == SelectPropertyItem::class + $property_class == TextPropertyItem::class + @@ -1335,11 +1430,6 @@ $mime_map - - - $pos - - OptionsPropertyMainGroup|void @@ -2145,6 +2235,9 @@ $tmp_initial $result['password'] + + $array_initials + $_POST['pred_dbname'] @@ -2392,14 +2485,19 @@ $ret[_pgettext('string types', 'String')] + + '-' + 'INET6' + $group[$group_name]['tab' . $sep . 'count'] - + $group[$group_name]['is' . $sep . 'group'] $group[$group_name]['tab' . $sep . 'count'] + $byteUnits[$d] $units[$d] @@ -2442,6 +2540,10 @@ $value $value + + $max_size + $max_unit + $max_size $max_unit