diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6484d54093..47d67db438 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -110,6 +110,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Charsets.php
 
+		-
+			message: "#^Cannot access an offset on array\\|true\\.$#"
+			count: 1
+			path: libraries/classes/CheckUserPrivileges.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\CheckUserPrivileges\\:\\:getItemsFromShowGrantsRow\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1055,6 +1060,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Database/DesignerController.php
 
+		-
+			message: "#^Offset 'db_collation' on array\\<string, mixed\\> on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 2
+			path: libraries/classes/Controllers/Database/Operations/CollationController.php
+
 		-
 			message: "#^Negated boolean expression is always true\\.$#"
 			count: 6
@@ -1495,6 +1505,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/ChangeController.php
 
+		-
+			message: "#^Offset 'goto' on array\\<string, mixed\\> on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Table/ChangeController.php
+
 		-
 			message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:replaceClauses\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#"
 			count: 1
@@ -1520,6 +1535,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/IndexesController.php
 
+		-
+			message: "#^Cannot access offset 'Row_format' on mixed\\.$#"
+			count: 1
+			path: libraries/classes/Controllers/Table/OperationsController.php
+
 		-
 			message: "#^Comparison operation \"\\>\" between int\\<1, max\\> and 0 is always true\\.$#"
 			count: 1
@@ -1875,6 +1895,11 @@ parameters:
 			count: 1
 			path: libraries/classes/CreateAddField.php
 
+		-
+			message: "#^Offset 'tbl_collation' on array\\<string, mixed\\> on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/CreateAddField.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Database\\\\CentralColumns\\:\\:deleteColumnsFromList\\(\\) has parameter \\$field_select with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -5345,6 +5370,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Navigation/NavigationTree.php
 
+		-
+			message: "#^Offset 'pos3_name' on array\\<string, mixed\\> on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/Navigation/NavigationTree.php
+
 		-
 			message: "#^Offset 'text' on array\\{text\\: array\\{route\\: string, params\\: array\\<string, mixed\\>\\}, icon\\: array\\{route\\: string, params\\: array\\<string, mixed\\>\\}, second_icon\\?\\: array\\{route\\: string, params\\: array\\<string, mixed\\>\\}, title\\?\\: string\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
@@ -5635,6 +5665,16 @@ parameters:
 			count: 1
 			path: libraries/classes/Operations.php
 
+		-
+			message: "#^Offset 'db_collation' on array\\<string, mixed\\> on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/Operations.php
+
+		-
+			message: "#^Offset 'tbl_collation' on array\\<string, mixed\\> on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/Operations.php
+
 		-
 			message: "#^Parameter \\#1 \\$query of method PhpMyAdmin\\\\DatabaseInterface\\:\\:query\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
@@ -5785,6 +5825,11 @@ parameters:
 			count: 3
 			path: libraries/classes/Plugins.php
 
+		-
+			message: "#^Offset 'errno' on array\\<string, mixed\\> in isset\\(\\) always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/Plugins/Auth/AuthenticationConfig.php
+
 		-
 			message: "#^Parameter \\#2 \\$remoteIp of method ReCaptcha\\\\ReCaptcha\\:\\:verify\\(\\) expects string\\|null, bool\\|string given\\.$#"
 			count: 1
@@ -6040,6 +6085,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
+		-
+			message: "#^Offset 'table_data' on array\\<string, mixed\\> in isset\\(\\) always exists and is not nullable\\.$#"
+			count: 1
+			path: libraries/classes/Plugins/Export/ExportSql.php
+
 		-
 			message: "#^PHPDoc tag @var has no value type specified in iterable type array\\.$#"
 			count: 5
@@ -8420,6 +8470,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Table.php
 
+		-
+			message: "#^Offset 'sql_constraints…' on non\\-empty\\-array\\<string, mixed\\> in empty\\(\\) always exists and is always falsy\\.$#"
+			count: 1
+			path: libraries/classes/Table.php
+
 		-
 			message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, mixed given\\.$#"
 			count: 1
@@ -8460,6 +8515,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Table.php
 
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: libraries/classes/Table.php
+
 		-
 			message: "#^Right side of \\|\\| is always false\\.$#"
 			count: 1
@@ -9330,6 +9390,21 @@ parameters:
 			count: 1
 			path: test/classes/Config/SettingsTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with arguments 0, array\\{\\} and 'The cache is…' will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/ConfigStorage/RelationTest.php
+
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with arguments 1, array\\{\\} and 'The cache is…' will always evaluate to false\\.$#"
+			count: 5
+			path: test/classes/ConfigStorage/RelationTest.php
+
+		-
+			message: "#^Cannot unset offset 1 on array\\{\\}\\.$#"
+			count: 1
+			path: test/classes/ConfigStorage/RelationTest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\ConfigTest\\:\\:configPaths\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9540,6 +9615,11 @@ parameters:
 			count: 1
 			path: test/classes/CreateAddFieldTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 'URLQueryEncryptionS…' and array\\{\\} will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/Crypto/CryptoTest.php
+
 		-
 			message: "#^Cannot access offset 0 on mixed\\.$#"
 			count: 1
@@ -11105,6 +11185,11 @@ parameters:
 			count: 1
 			path: test/classes/TypesTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with false will always evaluate to false\\.$#"
+			count: 1
+			path: test/classes/UserPreferencesTest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\UtilTest\\:\\:charsetQueryData\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -11275,6 +11360,16 @@ parameters:
 			count: 1
 			path: test/classes/Utils/HttpRequestTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 'cache' and array\\{\\} will always evaluate to false\\.$#"
+			count: 2
+			path: test/classes/Utils/SessionCacheTest.php
+
+		-
+			message: "#^Offset 'cache' does not exist on array\\{\\}\\.$#"
+			count: 4
+			path: test/classes/Utils/SessionCacheTest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Tests\\\\VersionInformationTest\\:\\:dataProviderVersionConditions\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1