From a8249efd9bcb6aa7928f0987406e09bfc07db8e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Thu, 4 Sep 2025 01:06:42 +0200
Subject: [PATCH] Fix linting errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
---
 phpstan-baseline.neon                             | 15 ++++++++++-----
 psalm-baseline.xml                                |  3 ++-
 .../Table/Structure/MoveColumnsControllerTest.php |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7f59f3b6c0..ec19fe65cd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -38155,6 +38155,11 @@ parameters:
 			count: 2
 			path: libraries/classes/Utils/HttpRequest.php
 
+		-
+			message: "#^Cannot access offset 0 on mixed\\.$#"
+			count: 1
+			path: libraries/classes/Utils/HttpRequest.php
+
 		-
 			message: "#^Method PhpMyAdmin\\\\Utils\\\\HttpRequest\\:\\:handleContext\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -38190,6 +38195,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Utils/HttpRequest.php
 
+		-
+			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, mixed given\\.$#"
+			count: 1
+			path: libraries/classes/Utils/HttpRequest.php
+
 		-
 			message: "#^Property PhpMyAdmin\\\\Utils\\\\HttpRequest\\:\\:\\$proxyPass \\(string\\) does not accept mixed\\.$#"
 			count: 1
@@ -38205,11 +38215,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Utils/HttpRequest.php
 
-		-
-			message: "#^Variable \\$http_response_header in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: libraries/classes/Utils/HttpRequest.php
-
 		-
 			message: "#^Cannot access offset 'Server' on mixed\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index a459f3f668..3c41f5e434 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -14485,9 +14485,10 @@
     <MixedArgument occurrences="1">
       <code>$httpStatus</code>
     </MixedArgument>
-    <MixedAssignment occurrences="2">
+    <MixedAssignment occurrences="3">
       <code>$context['http']['content']</code>
       <code>$httpStatus</code>
+      <code>$http_response_header</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>string|bool|null</code>
diff --git a/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php b/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
index 15ad5e2e02..a267ffea76 100644
--- a/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
+++ b/test/classes/Controllers/Table/Structure/MoveColumnsControllerTest.php
@@ -167,6 +167,7 @@ SQL
 ALTER TABLE `test_table`
   CHANGE `note` `note` varchar(100) DEFAULT NULL AFTER `id`
 SQL
+,
             ],
         ];
     }