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\\.$#' 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 @@ settings]]> settings]]> - - settings, $this->config->asArray())]]> - getCookieName($cookieName)]]]> 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(); } /**