Update phpstan and psalm baseline

Signed-off-by: William Desportes <williamdes@wdes.fr>

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
@@ -36,6 +36,11 @@ parameters:
 			path: libraries/classes/Advisor.php
 
 		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace_callback expects array\\|string, array\\<int, string\\>\\|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
 			path: libraries/classes/Advisor.php
@@ -121,6 +126,11 @@ parameters:
 			path: libraries/classes/CheckUserPrivileges.php
 
 		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/CheckUserPrivileges.php
+
+		-
 			message: "#^Cannot call method getExtension\\(\\) on mixed\\.$#"
 			count: 1
 			path: libraries/classes/Command/CacheWarmupCommand.php
@@ -1036,6 +1046,11 @@ parameters:
 			path: libraries/classes/Controllers/Database/CentralColumnsController.php
 
 		-
+			message: "#^Parameter \\#2 \\$field_select of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:deleteColumnsFromList\\(\\) expects array, array\\<int, string\\>\\|string given\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Database/CentralColumnsController.php
+
+		-
 			message: "#^Cannot cast mixed to string\\.$#"
 			count: 1
 			path: libraries/classes/Controllers/Database/DataDictionaryController.php
@@ -1311,6 +1326,11 @@ parameters:
 			path: libraries/classes/Controllers/Import/ImportController.php
 
 		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, array\\<int, string\\>\\|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
 			path: libraries/classes/Controllers/NormalizationController.php
@@ -1546,6 +1566,11 @@ parameters:
 			path: libraries/classes/Controllers/Table/RelationController.php
 
 		-
+			message: "#^Argument of an invalid type array\\<int, string\\>\\|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
 			path: libraries/classes/Controllers/Table/ReplaceController.php
@@ -1566,6 +1591,21 @@ parameters:
 			path: libraries/classes/Controllers/Table/SearchController.php
 
 		-
+			message: "#^Parameter \\#1 \\$str of function strtoupper expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Table/SearchController.php
+
+		-
+			message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getIntegerRange\\(\\) expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Table/SearchController.php
+
+		-
+			message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getTypeOperatorsHtml\\(\\) expects string, array\\<int, string\\>\\|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
 			path: libraries/classes/Controllers/Table/SearchController.php
@@ -1736,6 +1776,21 @@ parameters:
 			path: libraries/classes/Controllers/Table/ZoomSearchController.php
 
 		-
+			message: "#^Parameter \\#1 \\$str of function strtoupper expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Table/ZoomSearchController.php
+
+		-
+			message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getIntegerRange\\(\\) expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Table/ZoomSearchController.php
+
+		-
+			message: "#^Parameter \\#1 \\$type of method PhpMyAdmin\\\\Types\\:\\:getTypeOperatorsHtml\\(\\) expects string, array\\<int, string\\>\\|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
 			path: libraries/classes/Controllers/Table/ZoomSearchController.php
@@ -1796,6 +1851,11 @@ parameters:
 			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
 			path: libraries/classes/Core.php
@@ -2951,11 +3011,6 @@ parameters:
 			path: libraries/classes/Display/Results.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Display\\\\Results\\:\\:getOffsets\\(\\) should return array\\<int\\> but returns array\\<int, \\(array\\|float\\|int\\)\\>\\.$#"
-			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
 			path: libraries/classes/Display/Results.php
@@ -4321,6 +4376,11 @@ parameters:
 			path: libraries/classes/Header.php
 
 		-
+			message: "#^Cannot cast array\\<int, string\\>\\|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
 			path: libraries/classes/Html/Generator.php
@@ -4521,6 +4581,16 @@ parameters:
 			path: libraries/classes/Import.php
 
 		-
+			message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Import\\:\\:runQuery\\(\\) expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Import.php
+
+		-
+			message: "#^Parameter \\#2 \\$full of method PhpMyAdmin\\\\Import\\:\\:runQuery\\(\\) expects string, array\\<int, string\\>\\|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
 			path: libraries/classes/Import/Ajax.php
@@ -5096,6 +5166,11 @@ parameters:
 			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
 			path: libraries/classes/IpAllowDeny.php
@@ -5736,6 +5811,11 @@ parameters:
 			path: libraries/classes/Plugins/Auth/AuthenticationCookie.php
 
 		-
+			message: "#^Binary operation \"\\.\" between 'WWW\\-Authenticate\\:…' and array\\<int, string\\>\\|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
 			path: libraries/classes/Plugins/Auth/AuthenticationHttp.php
@@ -5886,11 +5966,21 @@ parameters:
 			path: libraries/classes/Plugins/Export/ExportPdf.php
 
 		-
+			message: "#^Binary operation \"\\.\" between '_' and array\\<int, string\\>\\|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\\<int, string\\>\\|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
 			path: libraries/classes/Plugins/Export/ExportSql.php
@@ -5966,6 +6056,11 @@ parameters:
 			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\\<int, string\\>\\|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
 			path: libraries/classes/Plugins/Export/ExportSql.php
@@ -7191,6 +7286,11 @@ parameters:
 			path: libraries/classes/Server/Plugins.php
 
 		-
+			message: "#^Binary operation \"\\.\" between 'PASSWORD\\(\\\\'' and array\\<int, string\\>\\|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
 			path: libraries/classes/Server/Privileges.php
@@ -7901,6 +8001,11 @@ parameters:
 			path: libraries/classes/Sql.php
 
 		-
+			message: "#^Method PhpMyAdmin\\\\Sql\\:\\:getDetailedProfilingStats\\(\\) should return array\\<string, array\\|int\\> but returns array\\<string, array\\<int\\|string, mixed\\>\\|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
 			path: libraries/classes/Sql.php
@@ -8361,6 +8466,11 @@ parameters:
 			path: libraries/classes/Table/ColumnsDefinition.php
 
 		-
+			message: "#^Parameter \\#1 \\$str of function rtrim expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Table/ColumnsDefinition.php
+
+		-
 			message: "#^Parameter \\#1 \\$str of function trim expects string, mixed given\\.$#"
 			count: 1
 			path: libraries/classes/Table/ColumnsDefinition.php
@@ -8446,6 +8556,11 @@ parameters:
 			path: libraries/classes/ThemeManager.php
 
 		-
+			message: "#^Binary operation \"\\.\" between non\\-falsy\\-string and array\\<int, string\\>\\|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
 			path: libraries/classes/Tracker.php
@@ -8746,6 +8861,11 @@ parameters:
 			path: libraries/classes/Tracking.php
 
 		-
+			message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, array\\<int, string\\>\\|string\\|null given\\.$#"
+			count: 1
+			path: libraries/classes/Tracking.php
+
+		-
 			message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
 			count: 1
 			path: libraries/classes/Tracking.php
@@ -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\\<T\\>, mixed given\\.$#"
 			count: 2
 			path: test/classes/Command/TwigLintCommandTest.php
 
@@ -9286,6 +9406,11 @@ parameters:
 			path: test/classes/ConfigTest.php
 
 		-
+			message: "#^Parameter \\#1 \\$haystack of function mb_strstr expects string, array\\<string\\> given\\.$#"
+			count: 1
+			path: test/classes/ConfigTest.php
+
+		-
 			message: "#^Cannot access offset 'favoriteTables' on mixed\\.$#"
 			count: 1
 			path: test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
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 @@
     </UnusedVariable>
   </file>
   <file src="libraries/classes/Table/ColumnsDefinition.php">
-    <MixedArgument occurrences="28">
+    <MixedArgument occurrences="25">
       <code>$available_mime[$mime_type . '_file'][$mimekey]</code>
       <code>$columnMeta</code>
       <code>$columnMeta['Default']</code>
-      <code>$columnMeta['Default']</code>
-      <code>$columnMeta['DefaultValue']</code>
       <code>$columnMeta['DefaultValue']</code>
       <code>$columnMeta['Field']</code>
       <code>$columnMeta['Field']</code>
       <code>$columnMeta['Type']</code>
-      <code>$columnMeta['Type']</code>
       <code>$db</code>
       <code>$db</code>
       <code>$db</code>
@@ -13792,33 +13789,18 @@
       <code>Util::getValueByKey($_POST, 'field_key.' . $columnNumber, '')</code>
       <code>Util::getValueByKey($extracted_columnspec, 'attribute', '')</code>
     </MixedArgument>
-    <MixedArrayAccess occurrences="10">
+    <MixedArrayAccess occurrences="7">
       <code>$available_mime[$mime_type . '_file'][$mimekey]</code>
-      <code>$columnMeta['Default']</code>
       <code>$columnMeta['Extra']</code>
       <code>$columnMeta['Field']</code>
       <code>$columnMeta['Field']</code>
-      <code>$columnMeta['Null']</code>
-      <code>$columnMeta['Type']</code>
       <code>$columnMeta['column_status']['isEditable']</code>
       <code>$columnMeta['column_status']['isEditable']</code>
       <code>$mime_map[$columnMeta['Field']]</code>
     </MixedArrayAccess>
-    <MixedArrayAssignment occurrences="15">
+    <MixedArrayAssignment occurrences="3">
       <code>$available_mime[$mime_type . '_file_quoted'][$mimekey]</code>
-      <code>$columnMeta['Default']</code>
-      <code>$columnMeta['DefaultType']</code>
-      <code>$columnMeta['DefaultType']</code>
-      <code>$columnMeta['DefaultType']</code>
-      <code>$columnMeta['DefaultType']</code>
-      <code>$columnMeta['DefaultType']</code>
-      <code>$columnMeta['DefaultValue']</code>
-      <code>$columnMeta['DefaultValue']</code>
-      <code>$columnMeta['DefaultValue']</code>
-      <code>$columnMeta['DefaultValue']</code>
-      <code>$columnMeta['DefaultValue']</code>
       <code>$columnMeta['Expression']</code>
-      <code>$columnMeta['Type']</code>
       <code>$mime_map[$columnMeta['Field']]</code>
     </MixedArrayAssignment>
     <MixedArrayOffset occurrences="4">
@@ -13827,12 +13809,10 @@
       <code>$mime_map[$columnMeta['Field']]</code>
       <code>$mime_map[$columnMeta['Field']]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="19">
+    <MixedAssignment occurrences="17">
       <code>$columnMeta</code>
       <code>$columnMeta['Default']</code>
       <code>$columnMeta['Default']</code>
-      <code>$columnMeta['DefaultValue']</code>
-      <code>$columnMeta['DefaultValue']</code>
       <code>$columnMeta['Expression']</code>
       <code>$columnMeta['Key']</code>
       <code>$comments_map[$columnMeta['Field']]</code>
@@ -13848,13 +13828,8 @@
       <code>$submit_attribute</code>
       <code>$type</code>
     </MixedAssignment>
-    <PossiblyInvalidArgument occurrences="2">
-      <code>$form_params['db']</code>
-      <code>$form_params['table']</code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidCast occurrences="2">
-      <code>$form_params['db']</code>
-      <code>$form_params['table']</code>
+    <PossiblyInvalidCast occurrences="1">
+      <code>$_POST['after_field']</code>
     </PossiblyInvalidCast>
   </file>
   <file src="libraries/classes/Table/Indexes.php">
@@ -15700,7 +15675,7 @@
       <code>$_SESSION['tmpval']['relational_display']</code>
       <code>$_SESSION['tmpval']['relational_display']</code>
     </MixedArrayAssignment>
-    <MixedAssignment occurrences="29">
+    <MixedAssignment occurrences="28">
       <code>$actual</code>
       <code>$actual</code>
       <code>$result</code>
@@ -15729,7 +15704,6 @@
       <code>$result</code>
       <code>$result</code>
       <code>$result</code>
-      <code>$result</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>array</code>