diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index ee13ec685e..1c03b2ea93 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1305,6 +1305,11 @@ parameters: count: 1 path: libraries/classes/Controllers/Import/ImportController.php + - + message: "#^Parameter \\#2 \\$size of method PhpMyAdmin\\\\Import\\:\\:getNextChunk\\(\\) expects int, float\\|int 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 @@ -2041,22 +2046,22 @@ parameters: path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'DCN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'DCN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\, string\\>, DCN\\: non\\-empty\\-array\\, string\\>, DTN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\, string\\>, STN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'DTN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'DTN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\, string\\>, DCN\\: non\\-empty\\-array\\, string\\>, DTN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\, string\\>, STN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'SCN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'SCN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\, string\\>, DCN\\: non\\-empty\\-array\\, string\\>, DTN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\, string\\>, STN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>\\}\\.$#" count: 1 path: libraries/classes/Database/Designer/Common.php - - message: "#^Offset 'STN' does not exist on array\\{C_NAME\\: array\\, string\\>, DCN\\?\\: non\\-empty\\-array\\, string\\>, DTN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>, SCN\\?\\: non\\-empty\\-array\\, string\\>, STN\\?\\: non\\-empty\\-array\\, non\\-empty\\-string\\>\\}\\.$#" + message: "#^Offset 'STN' does not exist on array\\{C_NAME\\: array\\{\\}\\}\\|array\\{C_NAME\\: non\\-empty\\-array\\, string\\>, DCN\\: non\\-empty\\-array\\, string\\>, DTN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>, SCN\\: non\\-empty\\-array\\, string\\>, STN\\: non\\-empty\\-array\\, non\\-falsy\\-string\\>\\}\\.$#" count: 2 path: libraries/classes/Database/Designer/Common.php @@ -2555,11 +2560,6 @@ parameters: count: 1 path: libraries/classes/DatabaseInterface.php - - - message: "#^Comparison operation \"\\<\\=\\>\" between \\(array\\|float\\|int\\) and \\(array\\|float\\|int\\) results in an error\\.$#" - count: 1 - path: libraries/classes/DatabaseInterface.php - - message: "#^Method PhpMyAdmin\\\\DatabaseInterface\\:\\:attachIndexInfoToColumns\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#" count: 1 @@ -2865,21 +2865,16 @@ parameters: count: 2 path: libraries/classes/Dbal/MysqliResult.php - - - message: "#^Binary operation \"\\+\" between array\\\\|string and array\\{default_action\\: 'insert'\\} results in an error\\.$#" - count: 3 - path: libraries/classes/Display/Results.php - - - - message: "#^Binary operation \"\\+\" between array\\\\|string and array\\{default_action\\: 'update'\\} results in an error\\.$#" - count: 3 - path: libraries/classes/Display/Results.php - - message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#" count: 2 path: libraries/classes/Display/Results.php + - + message: "#^If condition is always true\\.$#" + count: 1 + path: libraries/classes/Display/Results.php + - message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getBulkLinks\\(\\) has parameter \\$analyzedSqlResults with no value type specified in iterable type array\\.$#" count: 1 @@ -6375,6 +6370,11 @@ parameters: count: 1 path: libraries/classes/Plugins/Import/ImportSql.php + - + message: "#^Cannot assign new offset to array\\\\|string\\>\\|string\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportXml.php + - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportXml\\:\\:doImport\\(\\) has parameter \\$sql_data with no value type specified in iterable type array\\.$#" count: 1 @@ -6395,6 +6395,16 @@ parameters: count: 8 path: libraries/classes/Plugins/Import/ImportXml.php + - + message: "#^Parameter \\#1 \\$str1 of function strcmp expects string, array\\\\|string\\>\\|string given\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportXml.php + + - + message: "#^array\\\\|string\\>\\|string does not accept array\\\\.$#" + count: 1 + path: libraries/classes/Plugins/Import/ImportXml.php + - message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\Upload\\\\UploadNoplugin\\:\\:getUploadStatus\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -7141,7 +7151,7 @@ parameters: path: libraries/classes/SavedSearches.php - - message: "#^Offset non\\-empty\\-string does not exist on array\\|string\\.$#" + message: "#^Offset non\\-falsy\\-string does not exist on array\\|string\\.$#" count: 1 path: libraries/classes/SavedSearches.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 4d1a7ea6f0..fdfa268435 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + global $route, $containerBuilder, $request; @@ -13401,7 +13401,8 @@ - + + '' null null null @@ -13463,17 +13464,12 @@ (string) $version - + $dbname - - $statement->name !== null $statement->name !== null isset($statement->options) - - '' -