From a7a90551007d98e81562515153dd96aaa94498b6 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 26 Oct 2022 14:17:56 +0200 Subject: [PATCH] Update baselines Signed-off-by: William Desportes --- phpstan-baseline.neon | 215 +++++++++++++++++++++++++++++------------- psalm-baseline.xml | 4 +- 2 files changed, 153 insertions(+), 66 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 8cd662527f..1aee6d9e8d 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1481,9 +1481,9 @@ parameters: path: libraries/classes/Controllers/Sql/SetValuesController.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$limit \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\) in empty\\(\\) is not falsy\\.$#" + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClauses\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" count: 1 - path: libraries/classes/Controllers/Table/ChartController.php + path: libraries/classes/Controllers/Table/ExportController.php - message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\FindReplaceController\\:\\:getRegexReplaceRows\\(\\) return type has no value type specified in iterable type array\\.$#" @@ -1650,18 +1650,18 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/Structure/PartitioningController.php + - + message: "#^Offset 0 does not exist on array\\\\|null\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/Structure/PartitioningController.php + - message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#" count: 1 path: libraries/classes/Controllers/Table/Structure/PartitioningController.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement\\:\\:\\$partitionsNum \\(int\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: libraries/classes/Controllers/Table/Structure/PartitioningController.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement\\:\\:\\$subpartitionsNum \\(int\\) on left side of \\?\\? is not nullable\\.$#" + message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, array\\\\|null given\\.$#" count: 1 path: libraries/classes/Controllers/Table/Structure/PartitioningController.php @@ -2465,6 +2465,36 @@ parameters: count: 4 path: libraries/classes/Database/Qbe.php + - + message: "#^Cannot access offset 'value' on mixed\\.$#" + count: 1 + path: libraries/classes/Database/Routines.php + + - + message: "#^Cannot access offset int\\<0, max\\> on array\\\\|int\\.$#" + count: 1 + path: libraries/classes/Database/Routines.php + + - + message: "#^Cannot access property \\$name on PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\|null\\.$#" + count: 1 + path: libraries/classes/Database/Routines.php + + - + message: "#^Cannot access property \\$options on PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\|null\\.$#" + count: 1 + path: libraries/classes/Database/Routines.php + + - + message: "#^Cannot access property \\$parameters on PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\|null\\.$#" + count: 1 + path: libraries/classes/Database/Routines.php + + - + message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" + count: 1 + path: libraries/classes/Database/Routines.php + - message: "#^Method PhpMyAdmin\\\\Database\\\\Routines\\:\\:backupPrivileges\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -3180,6 +3210,16 @@ parameters: count: 1 path: libraries/classes/Display/Results.php + - + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:getClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" + count: 2 + path: libraries/classes/Display/Results.php + + - + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" + count: 1 + path: libraries/classes/Display/Results.php + - message: "#^Parameter \\#3 \\$colOrder of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getRowValues\\(\\) expects array\\|false, mixed given\\.$#" count: 1 @@ -3190,6 +3230,11 @@ parameters: count: 1 path: libraries/classes/Display/Results.php + - + message: "#^Parameter \\#5 \\$sortExpressionNoDirection of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getTableHeaders\\(\\) expects array\\, array\\ given\\.$#" + count: 1 + path: libraries/classes/Display/Results.php + - message: "#^Parameter \\#6 \\$colVisib of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getRowValues\\(\\) expects array\\|bool\\|string, mixed given\\.$#" count: 1 @@ -3216,17 +3261,7 @@ parameters: path: libraries/classes/Display/Results.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$limit \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: libraries/classes/Display/Results.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$order \\(array\\\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: libraries/classes/Display/Results.php - - - - message: "#^Result of && is always false\\.$#" + message: "#^Strict comparison using \\!\\=\\= between non\\-empty\\-string and false will always evaluate to true\\.$#" count: 1 path: libraries/classes/Display/Results.php @@ -4511,13 +4546,13 @@ parameters: path: libraries/classes/Import/Ajax.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\DeleteStatement\\:\\:\\$limit \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\) in empty\\(\\) is not falsy\\.$#" + message: "#^Argument of an invalid type array\\\\|null supplied for foreach, only iterables are supported\\.$#" count: 1 path: libraries/classes/Import/SimulateDml.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\UpdateStatement\\:\\:\\$limit \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\) in empty\\(\\) is not falsy\\.$#" - count: 1 + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:getClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" + count: 6 path: libraries/classes/Import/SimulateDml.php - @@ -4960,6 +4995,11 @@ parameters: count: 2 path: libraries/classes/LanguageManager.php + - + message: "#^Binary operation \"\\+\" between int\\|string\\|null and int\\<0, max\\> results in an error\\.$#" + count: 1 + path: libraries/classes/Linter.php + - message: "#^Method PhpMyAdmin\\\\Linter\\:\\:findLineNumberAndColumn\\(\\) has parameter \\$lines with no value type specified in iterable type array\\.$#" count: 1 @@ -4985,6 +5025,11 @@ parameters: count: 1 path: libraries/classes/Linter.php + - + message: "#^Parameter \\#2 \\$pos of static method PhpMyAdmin\\\\Linter\\:\\:findLineNumberAndColumn\\(\\) expects int, int\\|string\\|null given\\.$#" + count: 1 + path: libraries/classes/Linter.php + - message: "#^Right side of && is always true\\.$#" count: 1 @@ -5731,10 +5776,35 @@ parameters: path: libraries/classes/Plugins/Export/ExportPhparray.php - - message: "#^Binary operation \"\\.\" between 'FOREIGN KEY ' and array\\|string results in an error\\.$#" + message: "#^Binary operation \"\\.\" between 'FOREIGN KEY ' and array\\\\|string results in an error\\.$#" count: 1 path: libraries/classes/Plugins/Export/ExportSql.php + - + message: "#^Cannot access property \\$database on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#" + count: 2 + path: libraries/classes/Plugins/Export/ExportSql.php + + - + message: "#^Cannot access property \\$expr on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#" + count: 2 + path: libraries/classes/Plugins/Export/ExportSql.php + + - + message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#" + count: 5 + path: libraries/classes/Plugins/Export/ExportSql.php + + - + message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" + count: 8 + path: libraries/classes/Plugins/Export/ExportSql.php + + - + message: "#^Cannot call method remove\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" + count: 7 + path: libraries/classes/Plugins/Export/ExportSql.php + - message: "#^Casting to int something that's already int\\<1, max\\>\\.$#" count: 1 @@ -5825,38 +5895,18 @@ parameters: count: 1 path: libraries/classes/Plugins/Export/ExportSql.php + - + message: "#^Parameter \\#1 \\$str of static method PhpMyAdmin\\\\SqlParser\\\\Context\\:\\:escape\\(\\) expects array\\\\|string, string\\|null given\\.$#" + count: 1 + path: libraries/classes/Plugins/Export/ExportSql.php + - message: "#^Parameter \\#2 \\$id of method PhpMyAdmin\\\\Plugins\\\\ExportPlugin\\:\\:getAlias\\(\\) expects string, mixed given\\.$#" count: 1 path: libraries/classes/Plugins/Export/ExportSql.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\CreateDefinition\\:\\:\\$key \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\) in empty\\(\\) is not falsy\\.$#" - count: 3 - path: libraries/classes/Plugins/Export/ExportSql.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\CreateDefinition\\:\\:\\$options \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: libraries/classes/Plugins/Export/ExportSql.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\CreateDefinition\\:\\:\\$references \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Reference\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: libraries/classes/Plugins/Export/ExportSql.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\CreateDefinition\\:\\:\\$type \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: libraries/classes/Plugins/Export/ExportSql.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\CreateStatement\\:\\:\\$entityOptions \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\) in empty\\(\\) is not falsy\\.$#" - count: 2 - path: libraries/classes/Plugins/Export/ExportSql.php - - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Token\\:\\:\\$token \\(string\\) does not accept array\\|string\\.$#" + message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Token\\:\\:\\$token \\(string\\) does not accept array\\\\|string\\.$#" count: 1 path: libraries/classes/Plugins/Export/ExportSql.php @@ -7845,6 +7895,21 @@ parameters: count: 1 path: libraries/classes/Sql.php + - + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:getClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" + count: 1 + path: libraries/classes/Sql.php + + - + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" + count: 2 + path: libraries/classes/Sql.php + + - + message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClauses\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#" + count: 1 + path: libraries/classes/Sql.php + - message: "#^Parameter \\#2 \\$table of method PhpMyAdmin\\\\Sql\\:\\:handleSortOrder\\(\\) expects string, string\\|null given\\.$#" count: 1 @@ -7910,6 +7975,11 @@ parameters: count: 1 path: libraries/classes/SystemDatabase.php + - + message: "#^Argument of an invalid type array\\\\|null supplied for foreach, only iterables are supported\\.$#" + count: 2 + path: libraries/classes/Table.php + - message: "#^Cannot cast mixed to string\\.$#" count: 1 @@ -8120,6 +8190,11 @@ parameters: count: 1 path: libraries/classes/Table.php + - + message: "#^Parameter \\#1 \\$string of function substr expects string, mixed given\\.$#" + count: 2 + path: libraries/classes/Table.php + - message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#" count: 1 @@ -8135,11 +8210,6 @@ parameters: count: 1 path: libraries/classes/Table.php - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\AlterOperation\\:\\:\\$field \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept null\\.$#" - count: 2 - path: libraries/classes/Table.php - - message: "#^Property PhpMyAdmin\\\\Table\\:\\:\\$errors type has no value type specified in iterable type array\\.$#" count: 1 @@ -8261,7 +8331,22 @@ parameters: path: libraries/classes/ThemeManager.php - - message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\.$#" + message: "#^Cannot access property \\$dest on PhpMyAdmin\\\\SqlParser\\\\Components\\\\IntoKeyword\\|null\\.$#" + count: 1 + path: libraries/classes/Tracker.php + + - + message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#" + count: 4 + path: libraries/classes/Tracker.php + + - + message: "#^Cannot access property \\$table on PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\|null\\.$#" + count: 1 + path: libraries/classes/Tracker.php + + - + message: "#^Cannot access property \\$tokens on PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null\\.$#" count: 1 path: libraries/classes/Tracker.php @@ -8285,6 +8370,16 @@ parameters: count: 1 path: libraries/classes/Tracker.php + - + message: "#^Offset 0 does not exist on array\\\\|null\\.$#" + count: 4 + path: libraries/classes/Tracker.php + + - + message: "#^Offset 0 does not exist on array\\\\|null\\.$#" + count: 2 + path: libraries/classes/Tracker.php + - message: "#^Only numeric types are allowed in \\-, int\\<0, max\\>\\|false given on the left side\\.$#" count: 2 @@ -8295,11 +8390,6 @@ parameters: count: 1 path: libraries/classes/Tracker.php - - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$options \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: libraries/classes/Tracker.php - - message: "#^Property PhpMyAdmin\\\\Tracker\\:\\:\\$trackingCache type has no value type specified in iterable type array\\.$#" count: 1 @@ -10570,11 +10660,6 @@ parameters: count: 1 path: test/classes/InsertEditTest.php - - - message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#" - count: 26 - path: test/classes/InsertEditTest.php - - message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertIsArray\\(\\) with array will always evaluate to true\\.$#" count: 2 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index e4b9a47392..bec05c1e5d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -6424,8 +6424,10 @@ empty($statementInfo->statement->from) isset($sessionMaxRows) - + $firstStatement->order + $relation[2] !== '' && $relation[2] !== false + $relation[2] !== false isset($meta->internalMediaType)