diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7ea065e0bd..d41bdc3424 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -457,7 +457,7 @@ parameters:
 
 		-
 			message: "#^Cannot access an offset on mixed\\.$#"
-			count: 1
+			count: 2
 			path: libraries/classes/Config/Forms/Setup/SqlForm.php
 
 		-
@@ -4535,6 +4535,26 @@ parameters:
 			count: 2
 			path: libraries/classes/Html/Generator.php
 
+		-
+			message: "#^Instantiated class Slim\\\\Psr7\\\\Factory\\\\ServerRequestFactory not found\\.$#"
+			count: 1
+			path: libraries/classes/Http/Factory/ServerRequestFactory.php
+
+		-
+			message: "#^Instantiated class Slim\\\\Psr7\\\\Factory\\\\UriFactory not found\\.$#"
+			count: 1
+			path: libraries/classes/Http/Factory/ServerRequestFactory.php
+
+		-
+			message: "#^Method PhpMyAdmin\\\\Http\\\\Factory\\\\ServerRequestFactory\\:\\:createServerRequestFactory\\(\\) should return Psr\\\\Http\\\\Message\\\\ServerRequestFactoryInterface but returns Psr\\\\Http\\\\Message\\\\ServerRequestFactoryInterface\\|Slim\\\\Psr7\\\\Factory\\\\ServerRequestFactory\\.$#"
+			count: 1
+			path: libraries/classes/Http/Factory/ServerRequestFactory.php
+
+		-
+			message: "#^Method PhpMyAdmin\\\\Http\\\\Factory\\\\ServerRequestFactory\\:\\:createUriFactory\\(\\) should return Psr\\\\Http\\\\Message\\\\UriFactoryInterface but returns Psr\\\\Http\\\\Message\\\\UriFactoryInterface\\|Slim\\\\Psr7\\\\Factory\\\\UriFactory\\.$#"
+			count: 1
+			path: libraries/classes/Http/Factory/ServerRequestFactory.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Http\\\\ServerRequest\\:\\:getAttributes\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9381,10 +9401,15 @@ parameters:
 			path: test/classes/Http/Factory/ServerRequestFactoryTest.php
 
 		-
-			message: "#^Class Nyholm\\\\Psr7\\\\Factory\\\\Psr17Factory not found\\.$#"
+			message: "#^Class Slim\\\\Psr7\\\\Factory\\\\ServerRequestFactory not found\\.$#"
 			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
+			path: test/classes/Import/AjaxTest.php
+
 		-
 			message: "#^Parameter \\#1 \\$columns of method PhpMyAdmin\\\\Index\\:\\:addColumns\\(\\) expects array, mixed given\\.$#"
 			count: 2
@@ -9750,6 +9775,11 @@ parameters:
 			count: 1
 			path: test/classes/Theme/ThemeManagerTest.php
 
+		-
+			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertTrue\\(\\) with true will always evaluate to true\\.$#"
+			count: 1
+			path: test/classes/Theme/ThemeManagerTest.php
+
 		-
 			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'PhpMyAdmin\\\\\\\\Theme\\\\\\\\Theme' and PhpMyAdmin\\\\Theme\\\\Theme will always evaluate to true\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 05ae6c4619..3df7d6a655 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.10.0@a5effd2d2dddd1a7ea7a0f6a051ce63ff979e356">
+<files psalm-version="5.11.0@c9b192ab8400fdaf04b2b13d110575adc879aa90">
   <file src="libraries/classes/Advisory/Advisor.php">
     <MixedArgument>
       <code>$matches[1]</code>
@@ -7505,6 +7505,30 @@
       <code><![CDATA[$_REQUEST['unlim_num_rows']]]></code>
     </RiskyCast>
   </file>
+  <file src="libraries/classes/Http/Factory/ServerRequestFactory.php">
+    <MixedArgument>
+      <code>$serverRequest</code>
+    </MixedArgument>
+    <MixedAssignment>
+      <code>$factory</code>
+      <code>$factory</code>
+      <code>$serverRequest</code>
+    </MixedAssignment>
+    <MixedInferredReturnType>
+      <code>ServerRequestFactoryInterface</code>
+      <code>UriFactoryInterface</code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement>
+      <code>$factory</code>
+      <code>$factory</code>
+      <code>$factory</code>
+      <code>$factory</code>
+    </MixedReturnStatement>
+    <UndefinedClass>
+      <code>SlimServerRequestFactory</code>
+      <code>SlimUriFactory</code>
+    </UndefinedClass>
+  </file>
   <file src="libraries/classes/Image/ImageWrapper.php">
     <PossiblyUnusedReturnValue>
       <code>bool</code>
@@ -14686,7 +14710,7 @@
     <UndefinedClass>
       <code>GuzzleHttpFactory</code>
       <code>LaminasServerRequestFactory</code>
-      <code>NyholmPsr17Factory</code>
+      <code>SlimServerRequestFactory</code>
     </UndefinedClass>
   </file>
   <file src="test/classes/ImportTest.php">