diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 1d5913bbdc..827ca06a4e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -10445,6 +10445,31 @@ parameters:
 			count: 1
 			path: test/classes/Html/GeneratorTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'PhpMyAdmin\\\\\\\\Http\\\\\\\\Factory\\\\\\\\ServerRequestFactory' and PhpMyAdmin\\\\Http\\\\Factory\\\\ServerRequestFactory will always evaluate to true\\.$#"
+			count: 1
+			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
+
+		-
+			message: "#^Class GuzzleHttp\\\\Psr7\\\\HttpFactory not found\\.$#"
+			count: 1
+			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
+
+		-
+			message: "#^Class Laminas\\\\Diactoros\\\\ServerRequestFactory not found\\.$#"
+			count: 1
+			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
+
+		-
+			message: "#^Class Nyholm\\\\Psr7\\\\Factory\\\\Psr17Factory not found\\.$#"
+			count: 1
+			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
+
+		-
+			message: "#^Method PhpMyAdmin\\\\Tests\\\\Http\\\\Factory\\\\ServerRequestFactoryTest\\:\\:dataProviderPsr7Implementations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
+
 		-
 			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with true will always evaluate to true\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index cea98696dc..d4c2784876 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -5636,7 +5636,7 @@
       <code>$row[$keyIndex]</code>
       <code>$row[$keyIndex]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="13">
+    <MixedAssignment occurrences="12">
       <code>$aLength</code>
       <code>$bLength</code>
       <code>$keyIndex</code>