diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 92f5c9ffbf..823484edcf 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -15498,12 +15498,6 @@ parameters: count: 4 path: tests/unit/Display/ResultsTest.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\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, SuhosinDisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' - identifier: assign.propertyType - count: 1 - path: tests/unit/Display/ResultsTest.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 769b8604b7..6d834bb62c 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -9925,9 +9925,6 @@ - - settings]]> - diff --git a/src/Display/Results.php b/src/Display/Results.php index b88661acc3..f40481a4ac 100644 --- a/src/Display/Results.php +++ b/src/Display/Results.php @@ -2681,7 +2681,7 @@ class Results // or transformation plugin is of non text type // such as image $isTypeBlob = $meta->isType(FieldMetadata::TYPE_BLOB); - $cfgProtectBinary = $this->config->settings['ProtectBinary']; + $cfgProtectBinary = $this->config->config->ProtectBinary; if ( ($meta->isBinary() && ( diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php index 20f8760f71..c60d80833d 100644 --- a/tests/unit/Display/ResultsTest.php +++ b/tests/unit/Display/ResultsTest.php @@ -455,7 +455,7 @@ class ResultsTest extends AbstractTestCase /** * @return arraysettings['ProtectBinary'] = $protectBinary; + $config->set('ProtectBinary', $protectBinary); $statementInfo = new StatementInfo(new Parser(), null, new StatementFlags(), [], []); self::assertStringContainsString( $output,