diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e3c9039f75..acf34b0ce0 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -95,11 +95,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Config/FormDisplay.php
 
-		-
-			message: "#^Parameter \\#1 \\$path of method PhpMyAdmin\\\\Config\\\\ConfigFile\\:\\:set\\(\\) expects string, int\\|string given\\.$#"
-			count: 2
-			path: libraries/classes/Config/FormDisplay.php
-
 		-
 			message: "#^Parameter \\#2 \\$type of function settype expects string, string\\|null given\\.$#"
 			count: 1
@@ -110,6 +105,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Config/FormDisplay.php
 
+		-
+			message: "#^Parameter \\#1 \\$path of method PhpMyAdmin\\\\Config\\\\ConfigFile\\:\\:set\\(\\) expects string, int\\|string given\\.$#"
+			count: 1
+			path: libraries/classes/Config/FormDisplay.php
+
 		-
 			message: "#^Offset 'values' does not exist on array\\|null\\.$#"
 			count: 1
@@ -280,11 +280,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Server/PrivilegesController.php
 
-		-
-			message: "#^Parameter \\#1 \\$str of function mb_strtolower expects string, int\\|string given\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Server/Status/ProcessesController.php
-
 		-
 			message: "#^Parameter \\#2 \\$pieces of function implode expects array, array\\|null given\\.$#"
 			count: 7
@@ -330,11 +325,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/ChartController.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, int\\|string given\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Table/ChartController.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of function mb_strtolower expects string, array\\<string\\>\\|string given\\.$#"
 			count: 1
@@ -520,11 +510,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Database/Qbe.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Database\\\\Qbe\\:\\:getMasterTable\\(\\) should return string but returns int\\|string\\.$#"
-			count: 1
-			path: libraries/classes/Database/Qbe.php
-
 		-
 			message: "#^Parameter \\#1 \\$mode of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getEditorForm\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
@@ -565,11 +550,6 @@ parameters:
 			count: 1
 			path: libraries/classes/DatabaseInterface.php
 
-		-
-			message: "#^Parameter \\#1 \\$column of method PhpMyAdmin\\\\Index\\:\\:hasColumn\\(\\) expects string, int\\|string given\\.$#"
-			count: 1
-			path: libraries/classes/DatabaseInterface.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\DatabaseInterface\\:\\:getProtoInfo\\(\\) should return bool\\|int but returns int\\|string\\.$#"
 			count: 1
@@ -2440,11 +2420,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Setup/ConfigGenerator.php
 
-		-
-			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, int\\|string given\\.$#"
-			count: 1
-			path: libraries/classes/Setup/ConfigGenerator.php
-
 		-
 			message: "#^Parameter \\#3 \\$is_modify_link of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:mysqlDie\\(\\) expects bool, string given\\.$#"
 			count: 1