From 24fba41d3deeace2d1f3893e828829458fb16b60 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Wed, 21 Jan 2026 01:13:05 +0000
Subject: [PATCH] Remove array_replace_recursive

This was only necessary in the past to ensure we only load the existing settings.

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

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 50fbc96048..efdc696e7b 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -312,12 +312,6 @@ parameters:
 			count: 1
 			path: src/Config.php
 
-		-
-			message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, SuhosinDisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Config.php
-
 		-
 			message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, SuhosinDisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept non\-empty\-array\<string, mixed\>\.$#'
 			identifier: assign.propertyType
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 867abc8c6c..5cf72a4be7 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -118,9 +118,6 @@
       <code><![CDATA[$this->settings]]></code>
       <code><![CDATA[$this->settings]]></code>
     </InvalidPropertyAssignmentValue>
-    <MixedPropertyTypeCoercion>
-      <code><![CDATA[array_replace_recursive($this->settings, $this->config->asArray())]]></code>
-    </MixedPropertyTypeCoercion>
     <PossiblyInvalidArrayOffset>
       <code><![CDATA[$_COOKIE[$this->getCookieName($cookieName)]]]></code>
     </PossiblyInvalidArrayOffset>
diff --git a/src/Config.php b/src/Config.php
index 19e6ad5ca0..0565896cfa 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -13,7 +13,6 @@ use Throwable;
 
 use function __;
 use function array_key_last;
-use function array_replace_recursive;
 use function array_slice;
 use function count;
 use function defined;
@@ -204,7 +203,7 @@ class Config
         }
 
         $this->config = new Settings($cfg);
-        $this->settings = array_replace_recursive($this->settings, $this->config->asArray());
+        $this->settings = $this->config->asArray();
     }
 
     /**