From 2dc32a96b1c67a77c6ce642ed0141a2d9910e202 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Fri, 20 Feb 2026 17:46:43 +0000
Subject: [PATCH] Add type hint

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon                 | 24 ------------------------
 psalm-baseline.xml                    |  3 ---
 src/Config/UserPreferencesHandler.php |  1 +
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index abc19e6a95..78488d125f 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -915,30 +915,12 @@ parameters:
 			count: 1
 			path: src/Config/UserPreferencesHandler.php
 
-		-
-			message: '#^Cannot access offset ''Server'' on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
-			path: src/Config/UserPreferencesHandler.php
-
-		-
-			message: '#^Cannot access offset ''ThemeDefault'' on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 2
-			path: src/Config/UserPreferencesHandler.php
-
 		-
 			message: '#^Cannot access offset ''config_mtime'' on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
 			count: 2
 			path: src/Config/UserPreferencesHandler.php
 
-		-
-			message: '#^Cannot access offset ''lang'' on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 3
-			path: src/Config/UserPreferencesHandler.php
-
 		-
 			message: '#^Cannot access offset ''userprefs'' on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
@@ -975,12 +957,6 @@ parameters:
 			count: 1
 			path: src/Config/UserPreferencesHandler.php
 
-		-
-			message: '#^Parameter \#2 \.\.\.\$replacements of function array_replace_recursive expects array, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Config/UserPreferencesHandler.php
-
 		-
 			message: '#^Parameter \#3 \$default of method PhpMyAdmin\\Config\:\:setCookie\(\) expects string\|null, mixed given\.$#'
 			identifier: argument.type
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index fd578699d6..c109ac1b80 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -408,7 +408,6 @@
   </file>
   <file src="src/Config/UserPreferencesHandler.php">
     <MixedArgument>
-      <code><![CDATA[$configData]]></code>
       <code><![CDATA[$configData['lang']]]></code>
       <code><![CDATA[$defaultValue]]></code>
     </MixedArgument>
@@ -416,7 +415,6 @@
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs']]]></code>
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs']['LoginCookieValidity']]]></code>
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs_type']]]></code>
-      <code><![CDATA[$configData['lang']]]></code>
     </MixedArrayAccess>
     <MixedArrayAssignment>
       <code><![CDATA[$_SESSION['cache'][$cacheKey]]]></code>
@@ -427,7 +425,6 @@
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs_type']]]></code>
     </MixedArrayAssignment>
     <MixedAssignment>
-      <code><![CDATA[$configData]]></code>
       <code><![CDATA[$defaultValue]]></code>
       <code><![CDATA[$defaultValue]]></code>
       <code><![CDATA[$this->storageType]]></code>
diff --git a/src/Config/UserPreferencesHandler.php b/src/Config/UserPreferencesHandler.php
index 504ddf0197..3bcc87d41c 100644
--- a/src/Config/UserPreferencesHandler.php
+++ b/src/Config/UserPreferencesHandler.php
@@ -58,6 +58,7 @@ class UserPreferencesHandler
             return;
         }
 
+        /** @var mixed[] $configData */
         $configData = $_SESSION['cache'][$cacheKey]['userprefs'];
         // type is 'db' or 'session'
         $this->storageType = $_SESSION['cache'][$cacheKey]['userprefs_type'];