From 296e6b62cef88d925d646eabb03ea7cb12a6c14b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 3 Nov 2022 20:28:54 +0100 Subject: [PATCH] Update phpstan and psalm baseline Signed-off-by: William Desportes --- phpstan-baseline.neon | 137 ++++++++++++++++++++++++++++++++++++++++-- psalm-baseline.xml | 40 +++--------- 2 files changed, 138 insertions(+), 39 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 0997eac0d9..9d17c4205a 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -35,6 +35,11 @@ parameters: count: 1 path: libraries/classes/Advisor.php + - + message: "#^Parameter \\#3 \\$subject of function preg_replace_callback expects array\\|string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Advisor.php + - message: "#^Property PhpMyAdmin\\\\Advisor\\:\\:\\$globals type has no value type specified in iterable type array\\.$#" count: 1 @@ -120,6 +125,11 @@ parameters: count: 1 path: libraries/classes/CheckUserPrivileges.php + - + message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/CheckUserPrivileges.php + - message: "#^Cannot call method getExtension\\(\\) on mixed\\.$#" count: 1 @@ -1035,6 +1045,11 @@ parameters: count: 1 path: libraries/classes/Controllers/Database/CentralColumnsController.php + - + message: "#^Parameter \\#2 \\$field_select of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:deleteColumnsFromList\\(\\) expects array, array\\\\|string given\\.$#" + count: 1 + path: libraries/classes/Controllers/Database/CentralColumnsController.php + - message: "#^Cannot cast mixed to string\\.$#" count: 1 @@ -1310,6 +1325,11 @@ parameters: count: 1 path: libraries/classes/Controllers/Import/ImportController.php + - + message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Import/ImportController.php + - message: "#^Parameter \\#1 \\$dependencies of method PhpMyAdmin\\\\Normalization\\:\\:getHtmlForNewTables3NF\\(\\) expects object, mixed given\\.$#" count: 1 @@ -1545,6 +1565,11 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/RelationController.php + - + message: "#^Argument of an invalid type array\\\\|string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + - message: "#^PHPDoc tag @var for variable \\$relation_fields has no value type specified in iterable type array\\.$#" count: 1 @@ -1565,6 +1590,21 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/SearchController.php + - + message: "#^Parameter \\#1 \\$str of function strtoupper expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/SearchController.php + + - + message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getIntegerRange\\(\\) expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/SearchController.php + + - + message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getTypeOperatorsHtml\\(\\) expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/SearchController.php + - message: "#^Property PhpMyAdmin\\\\Controllers\\\\Table\\\\SearchController\\:\\:\\$columnCollations type has no value type specified in iterable type array\\.$#" count: 1 @@ -1735,6 +1775,21 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/ZoomSearchController.php + - + message: "#^Parameter \\#1 \\$str of function strtoupper expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ZoomSearchController.php + + - + message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getIntegerRange\\(\\) expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ZoomSearchController.php + + - + message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getTypeOperatorsHtml\\(\\) expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ZoomSearchController.php + - message: "#^Parameter \\#2 \\$column_index of method PhpMyAdmin\\\\Controllers\\\\Table\\\\ZoomSearchController\\:\\:getColumnProperties\\(\\) expects int, int\\|string\\|false given\\.$#" count: 1 @@ -1795,6 +1850,11 @@ parameters: count: 1 path: libraries/classes/Controllers/View/CreateController.php + - + message: "#^Binary operation \"\\*\" between string and 1024\\|1048576\\|1073741824\\|1099511627776 results in an error\\.$#" + count: 1 + path: libraries/classes/Core.php + - message: "#^Method PhpMyAdmin\\\\Core\\:\\:arrayRead\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#" count: 1 @@ -2950,11 +3010,6 @@ parameters: count: 1 path: libraries/classes/Display/Results.php - - - message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOffsets\\(\\) should return array\\ but returns array\\\\.$#" - count: 1 - path: libraries/classes/Display/Results.php - - message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOptionsBlock\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -4320,6 +4375,11 @@ parameters: count: 1 path: libraries/classes/Header.php + - + message: "#^Cannot cast array\\\\|string\\|null to string\\.$#" + count: 1 + path: libraries/classes/Html/Generator.php + - message: "#^Method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getDefaultFunctionForField\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#" count: 1 @@ -4520,6 +4580,16 @@ parameters: count: 2 path: libraries/classes/Import.php + - + message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\:\\:runQuery\\(\\) expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Import.php + + - + message: "#^Parameter \\#2 \\$full of method PhpMyAdmin\\\\Import\\:\\:runQuery\\(\\) expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Import.php + - message: "#^Method PhpMyAdmin\\\\Import\\\\Ajax\\:\\:uploadProgressSetup\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -5095,6 +5165,11 @@ parameters: count: 1 path: libraries/classes/InternalRelations.php + - + message: "#^Binary operation \"\\-\" between string and 1 results in an error\\.$#" + count: 1 + path: libraries/classes/IpAllowDeny.php + - message: "#^Parameter \\#2 \\$ipToTest of method PhpMyAdmin\\\\IpAllowDeny\\:\\:ipMaskTest\\(\\) expects string, string\\|true given\\.$#" count: 1 @@ -5735,6 +5810,11 @@ parameters: count: 1 path: libraries/classes/Plugins/Auth/AuthenticationCookie.php + - + message: "#^Binary operation \"\\.\" between 'WWW\\-Authenticate\\:…' and array\\\\|string\\|null results in an error\\.$#" + count: 1 + path: libraries/classes/Plugins/Auth/AuthenticationHttp.php + - message: "#^Property PhpMyAdmin\\\\Plugins\\\\AuthenticationPlugin\\:\\:\\$user \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -5885,11 +5965,21 @@ parameters: count: 1 path: libraries/classes/Plugins/Export/ExportPdf.php + - + message: "#^Binary operation \"\\.\" between '_' and array\\\\|string\\|null results in an error\\.$#" + count: 1 + path: libraries/classes/Plugins/Export/ExportPhparray.php + - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Export\\\\ExportPhparray\\:\\:exportData\\(\\) has parameter \\$aliases with no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/Plugins/Export/ExportPhparray.php + - + message: "#^Parameter \\#2 \\$subject of function preg_match expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Plugins/Export/ExportPhparray.php + - message: "#^Binary operation \"\\.\" between 'FOREIGN KEY ' and array\\|string results in an error\\.$#" count: 1 @@ -5965,6 +6055,11 @@ parameters: count: 5 path: libraries/classes/Plugins/Export/ExportSql.php + - + message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Plugins/Export/ExportSql.php + - message: "#^Parameter \\#1 \\$str of function strtoupper expects string, mixed given\\.$#" count: 1 @@ -7190,6 +7285,11 @@ parameters: count: 1 path: libraries/classes/Server/Plugins.php + - + message: "#^Binary operation \"\\.\" between 'PASSWORD\\(\\\\'' and array\\\\|string\\|null results in an error\\.$#" + count: 2 + path: libraries/classes/Server/Privileges.php + - message: "#^Method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:addUser\\(\\) has parameter \\$dbname with no value type specified in iterable type array\\.$#" count: 1 @@ -7900,6 +8000,11 @@ parameters: count: 1 path: libraries/classes/Sql.php + - + message: "#^Method PhpMyAdmin\\\\Sql\\:\\:getDetailedProfilingStats\\(\\) should return array\\ but returns array\\\\|float\\|int\\>\\.$#" + count: 1 + path: libraries/classes/Sql.php + - message: "#^Method PhpMyAdmin\\\\Sql\\:\\:getHtmlForPreviousUpdateQuery\\(\\) has parameter \\$sqlData with no value type specified in iterable type array\\.$#" count: 1 @@ -8360,6 +8465,11 @@ parameters: count: 1 path: libraries/classes/Table/ColumnsDefinition.php + - + message: "#^Parameter \\#1 \\$str of function rtrim expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Table/ColumnsDefinition.php + - message: "#^Parameter \\#1 \\$str of function trim expects string, mixed given\\.$#" count: 1 @@ -8445,6 +8555,11 @@ parameters: count: 2 path: libraries/classes/ThemeManager.php + - + message: "#^Binary operation \"\\.\" between non\\-falsy\\-string and array\\\\|string\\|null results in an error\\.$#" + count: 1 + path: libraries/classes/Tracker.php + - message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\.$#" count: 1 @@ -8745,6 +8860,11 @@ parameters: count: 1 path: libraries/classes/Tracking.php + - + message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, array\\\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Tracking.php + - message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#" count: 1 @@ -9156,7 +9276,7 @@ parameters: path: test/classes/Command/SetVersionCommandTest.php - - message: "#^Parameter \\#1 \\$array_arg of function sort expects array, mixed given\\.$#" + message: "#^Parameter \\#1 \\$array_arg of function sort expects TArray of array\\, mixed given\\.$#" count: 2 path: test/classes/Command/TwigLintCommandTest.php @@ -9285,6 +9405,11 @@ parameters: count: 1 path: test/classes/ConfigTest.php + - + message: "#^Parameter \\#1 \\$haystack of function mb_strstr expects string, array\\ given\\.$#" + count: 1 + path: test/classes/ConfigTest.php + - message: "#^Cannot access offset 'favoriteTables' on mixed\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 305525d86e..a32d986483 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -13762,17 +13762,14 @@ - + $available_mime[$mime_type . '_file'][$mimekey] $columnMeta $columnMeta['Default'] - $columnMeta['Default'] - $columnMeta['DefaultValue'] $columnMeta['DefaultValue'] $columnMeta['Field'] $columnMeta['Field'] $columnMeta['Type'] - $columnMeta['Type'] $db $db $db @@ -13792,33 +13789,18 @@ Util::getValueByKey($_POST, 'field_key.' . $columnNumber, '') Util::getValueByKey($extracted_columnspec, 'attribute', '') - + $available_mime[$mime_type . '_file'][$mimekey] - $columnMeta['Default'] $columnMeta['Extra'] $columnMeta['Field'] $columnMeta['Field'] - $columnMeta['Null'] - $columnMeta['Type'] $columnMeta['column_status']['isEditable'] $columnMeta['column_status']['isEditable'] $mime_map[$columnMeta['Field']] - + $available_mime[$mime_type . '_file_quoted'][$mimekey] - $columnMeta['Default'] - $columnMeta['DefaultType'] - $columnMeta['DefaultType'] - $columnMeta['DefaultType'] - $columnMeta['DefaultType'] - $columnMeta['DefaultType'] - $columnMeta['DefaultValue'] - $columnMeta['DefaultValue'] - $columnMeta['DefaultValue'] - $columnMeta['DefaultValue'] - $columnMeta['DefaultValue'] $columnMeta['Expression'] - $columnMeta['Type'] $mime_map[$columnMeta['Field']] @@ -13827,12 +13809,10 @@ $mime_map[$columnMeta['Field']] $mime_map[$columnMeta['Field']] - + $columnMeta $columnMeta['Default'] $columnMeta['Default'] - $columnMeta['DefaultValue'] - $columnMeta['DefaultValue'] $columnMeta['Expression'] $columnMeta['Key'] $comments_map[$columnMeta['Field']] @@ -13848,13 +13828,8 @@ $submit_attribute $type - - $form_params['db'] - $form_params['table'] - - - $form_params['db'] - $form_params['table'] + + $_POST['after_field'] @@ -15700,7 +15675,7 @@ $_SESSION['tmpval']['relational_display'] $_SESSION['tmpval']['relational_display'] - + $actual $actual $result @@ -15729,7 +15704,6 @@ $result $result $result - $result array