gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove array_replace_recursive

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

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2026-01-21 01:13:05 +00:00 committed by Maurício Meneghini Fauth
parent 4c2a4b4cd4
commit 24fba41d3d
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpstan-baseline.neon
View File

@ -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

3
psalm-baseline.xml
View File

@ -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>

3
src/Config.php
View File

@ -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();
}
/**