diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index bbb2244206..c78f450b0c 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -400,11 +400,6 @@ parameters:
count: 1
path: libraries/classes/Config/FormDisplay.php
- -
- message: "#^Cannot cast mixed to string\\.$#"
- count: 1
- path: libraries/classes/Config/FormDisplay.php
-
-
message: "#^Call to function function_exists\\(\\) with 'bzcompress'\\|'gzcompress'\\|'gzencode' will always evaluate to true\\.$#"
count: 1
@@ -420,6 +415,11 @@ parameters:
count: 2
path: libraries/classes/Config/FormDisplay.php
+ -
+ message: "#^Cannot cast mixed to string\\.$#"
+ count: 1
+ path: libraries/classes/Config/FormDisplay.php
+
-
message: "#^Method PhpMyAdmin\\\\Config\\\\FormDisplay\\:\\:displayFieldInput\\(\\) has parameter \\$jsDefault with no value type specified in iterable type array\\.$#"
count: 1
@@ -1540,11 +1540,56 @@ parameters:
count: 1
path: libraries/classes/Controllers/Table/SearchController.php
+ -
+ message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/AddIndexController.php
+
+ -
+ message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/AddIndexController.php
+
+ -
+ message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/AddIndexController.php
+
+ -
+ message: "#^Parameter \\#1 \\$field_select of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:syncUniqueColumns\\(\\) expects array, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php
+
+ -
+ message: "#^Parameter \\#2 \\$field_select of method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:deleteColumnsFromList\\(\\) expects array, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php
+
-
message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\Structure\\\\ChangeController\\:\\:displayHtmlForColumnChange\\(\\) has parameter \\$selected with no value type specified in iterable type array\\.$#"
count: 1
path: libraries/classes/Controllers/Table/Structure/ChangeController.php
+ -
+ message: "#^Parameter \\#1 \\$selected of method PhpMyAdmin\\\\Controllers\\\\Table\\\\Structure\\\\ChangeController\\:\\:displayHtmlForColumnChange\\(\\) expects array\\|null, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/ChangeController.php
+
+ -
+ message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/FulltextController.php
+
+ -
+ message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/FulltextController.php
+
+ -
+ message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/FulltextController.php
+
-
message: "#^Cannot cast mixed to string\\.$#"
count: 6
@@ -1570,6 +1615,31 @@ parameters:
count: 1
path: libraries/classes/Controllers/Table/Structure/PartitioningController.php
+ -
+ message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/PrimaryController.php
+
+ -
+ message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/PrimaryController.php
+
+ -
+ message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/PrimaryController.php
+
+ -
+ message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php
+
+ -
+ message: "#^Parameter \\#1 \\$str of function trim expects string, mixed given\\.$#"
+ count: 2
+ path: libraries/classes/Controllers/Table/Structure/ReservedWordCheckController.php
+
-
message: "#^Cannot cast mixed to string\\.$#"
count: 1
@@ -1620,6 +1690,36 @@ parameters:
count: 2
path: libraries/classes/Controllers/Table/Structure/SaveController.php
+ -
+ message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/SpatialController.php
+
+ -
+ message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/SpatialController.php
+
+ -
+ message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/SpatialController.php
+
+ -
+ message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/UniqueController.php
+
+ -
+ message: "#^Parameter \\#1 \\$identifier of static method PhpMyAdmin\\\\Util\\:\\:backquote\\(\\) expects string\\|Stringable\\|null, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/UniqueController.php
+
+ -
+ message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, mixed given\\.$#"
+ count: 1
+ path: libraries/classes/Controllers/Table/Structure/UniqueController.php
+
-
message: "#^Cannot use array destructuring on array\\|null\\.$#"
count: 7
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index dda73454c1..5af461fd9d 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1933,10 +1933,8 @@
$_SESSION['tmpval']['aliases']
-
+
$GLOBALS['active_page']
- $GLOBALS['aliases']
- $GLOBALS['aliases']
$GLOBALS['allrows']
$GLOBALS['allrows']
$GLOBALS['as_separate_files']
@@ -3905,18 +3903,14 @@
-
+
$field
+ $selected
-
+
$field
+ $selected
-
- $selected
-
-
- $selected
-
@@ -3938,24 +3932,31 @@
-
- $selected
-
-
-
-
- $selected
-
-
-
- $selected[$i]
+ $selected
- $GLOBALS['num_fields']
-
-
$selected
+
+
+
+
+ $selected
+
+
+ $selected
+
+
+
+
+ $selected
+ $selected[$i]
+
+
+ $GLOBALS['num_fields']
+ $selected
+
+
$selected[$i]
@@ -3963,21 +3964,21 @@
-
+
$field
+ $selected
-
+
$field
+ $selected
-
- $selected
-
-
- $selected
-
-
+
+ $column
+ $column
+ $column
+ $column
$current_timestamp ? '' : $data['Default']
$data['Collation'] ?? ''
$data['Expression']
@@ -4004,24 +4005,16 @@
$data['Expression']
$data['Virtuality']
-
+
+ $columns[$column]
+ $expressions[$column]
+
+
+ $column
$data
$data['Expression']
-
- $column
- $column
- $column
-
-
- $columns[$column]
- $expressions[$column]
-
-
- $column
- $column
-
$current_timestamp ? '' : $data['Default']
$data['Collation'] ?? ''
@@ -4046,39 +4039,30 @@
-
+
$field
+ $selected
-
+
$GLOBALS['errorUrl']
$field
$mult_btn
+ $selected
+ $selected
+ $selected_fld
-
- $selected
-
-
- $selected
-
$row['Column_name']
-
- $column
+
$column
-
+
$column
-
-
- $column
- $column
-
-
$columns_names
-
+
@@ -4164,32 +4148,24 @@
-
+
$field
+ $selected
-
+
$field
+ $selected
-
- $selected
-
-
- $selected
-
-
+
$field
+ $selected
-
+
$field
+ $selected
-
- $selected
-
-
- $selected
-