diff --git a/docs/config.rst b/docs/config.rst index 84c3392cb1..b2eb20803d 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -122,6 +122,10 @@ Basic settings :type: boolean :default: false + .. deprecated:: 6.0.0 + + This setting has been removed. The Suhosin extension is no longer supported. + A warning is displayed on the main page if Suhosin is detected. You can set this parameter to ``true`` to stop this message from appearing. diff --git a/docs/faq.rst b/docs/faq.rst index 620009e14b..79599813e1 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -532,65 +532,8 @@ extension which works fine in this case. .. _faq1_38: -1.38 Can I use phpMyAdmin on a server on which Suhosin is enabled? ------------------------------------------------------------------- - -Yes but the default configuration values of Suhosin are known to cause -problems with some operations, for example editing a table with many -columns and no :term:`primary key` or with textual :term:`primary key`. - -Suhosin configuration might lead to malfunction in some cases and it -can not be fully avoided as phpMyAdmin is kind of application which -needs to transfer big amounts of columns in single HTTP request, what -is something what Suhosin tries to prevent. Generally all -``suhosin.request.*``, ``suhosin.post.*`` and ``suhosin.get.*`` -directives can have negative effect on phpMyAdmin usability. You can -always find in your error logs which limit did cause dropping of -variable, so you can diagnose the problem and adjust matching -configuration variable. - -The default values for most Suhosin configuration options will work in -most scenarios, however you might want to adjust at least following -parameters: - -* `suhosin.request.max\_vars `_ should - be increased (eg. 2048) -* `suhosin.post.max\_vars `_ should be - increased (eg. 2048) -* `suhosin.request.max\_array\_index\_length `_ - should be increased (eg. 256) -* `suhosin.post.max\_array\_index\_length `_ - should be increased (eg. 256) -* `suhosin.request.max\_totalname\_length `_ - should be increased (eg. 8192) -* `suhosin.post.max\_totalname\_length `_ should be - increased (eg. 8192) -* `suhosin.get.max\_value\_length `_ - should be increased (eg. 1024) -* `suhosin.sql.bailout\_on\_error `_ - needs to be disabled (the default) -* `suhosin.log.\* `_ should not - include :term:`SQL`, otherwise you get big - slowdown -* `suhosin.sql.union `_ must be disabled (which is the default). -* `suhosin.sql.multiselect `_ must be disabled (which is the default). -* `suhosin.sql.comment `_ must be disabled (which is the default). - -To further improve security, we also recommend these modifications: - -* `suhosin.executor.include.max\_traversal `_ should be - enabled as a mitigation against local file inclusion attacks. We suggest - setting this to 2 as ``../`` is used with the ReCaptcha library. -* `suhosin.cookie.encrypt `_ should be enabled. -* `suhosin.executor.disable_emodifier `_ should be enabled. - -You can also disable the warning using the :config:option:`$cfg['SuhosinDisableWarning']`. +1.38 (withdrawn). +----------------- .. _faq1_39: @@ -871,8 +814,6 @@ Here are a few points to check: Dorninger for the hint). * In the :file:`php.ini` directive ``arg_separator.input``, a value of ";" will cause this error. Replace it with "&;". -* If you are using `Suhosin `_, you - might want to increase `request limits `_. * The directory specified in the :file:`php.ini` directive ``session.save_path`` does not exist or is read-only (this can be caused by `bug in the PHP installer `_). diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index d85ef08f49..89a7ec3958 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -313,7 +313,7 @@ parameters: 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\\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\\.$#' identifier: assign.propertyType count: 1 path: src/Config.php @@ -970,7 +970,7 @@ parameters: path: src/Config/UserPreferencesHandler.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\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\.$#' identifier: assign.propertyType count: 1 path: src/Config/UserPreferencesHandler.php @@ -1917,18 +1917,6 @@ parameters: count: 5 path: src/Controllers/HomeController.php - - - message: '#^Loose comparison via "\=\=" is not allowed\.$#' - identifier: equal.notAllowed - count: 1 - path: src/Controllers/HomeController.php - - - - message: '#^Only booleans are allowed in &&, string\|false given on the right side\.$#' - identifier: booleanAnd.rightNotBoolean - count: 1 - path: src/Controllers/HomeController.php - - message: '#^Only booleans are allowed in \|\|, string\|false given on the right side\.$#' identifier: booleanOr.rightNotBoolean @@ -14230,7 +14218,7 @@ parameters: path: tests/unit/Config/UserPreferencesTest.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\{''Server/hide_db''\: ''testval123'', ''Server/port''\: ''213''\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{''Server/hide_db''\: ''testval123'', ''Server/port''\: ''213''\}\.$#' identifier: assign.propertyType count: 1 path: tests/unit/Config/UserPreferencesTest.php @@ -16108,7 +16096,7 @@ parameters: path: tests/unit/Plugins/Auth/AuthenticationConfigTest.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, \.\.\.\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' identifier: assign.propertyType count: 1 path: tests/unit/Plugins/Auth/AuthenticationConfigTest.php @@ -16165,7 +16153,7 @@ parameters: path: tests/unit/Plugins/Auth/AuthenticationCookieTest.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, \.\.\.\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' identifier: assign.propertyType count: 6 path: tests/unit/Plugins/Auth/AuthenticationCookieTest.php @@ -16186,7 +16174,7 @@ parameters: path: tests/unit/Plugins/Auth/AuthenticationHttpTest.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, \.\.\.\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' identifier: assign.propertyType count: 2 path: tests/unit/Plugins/Auth/AuthenticationHttpTest.php @@ -16387,7 +16375,7 @@ parameters: path: tests/unit/PluginsTest.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, \.\.\.\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' identifier: assign.propertyType count: 1 path: tests/unit/PluginsTest.php @@ -16516,7 +16504,7 @@ parameters: path: tests/unit/Server/SelectTest.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, \.\.\.\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' identifier: assign.propertyType count: 1 path: tests/unit/Server/SelectTest.php @@ -16930,7 +16918,7 @@ parameters: path: tests/unit/VersionInformationTest.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, \.\.\.\}\.$#' + message: '#^Property PhpMyAdmin\\Config\:\:\$settings \(array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\) does not accept array\{PmaAbsoluteUri\: string, AuthLog\: string, AuthLogSuccess\: bool, PmaNoRelation_DisableWarning\: bool, LoginCookieValidityDisableWarning\: bool, ReservedWordDisableWarning\: bool, TranslationWarningThreshold\: int, \.\.\.\}\.$#' identifier: assign.propertyType count: 3 path: tests/unit/VersionInformationTest.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index bc9b2e822b..b3d57938de 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1255,7 +1255,6 @@ config->selectedServer['verbose'])]]> config->settings['Servers'][Current::$server]['pmadb'])]]> - diff --git a/src/Config/Descriptions.php b/src/Config/Descriptions.php index bedf7be9a1..933602c1ae 100644 --- a/src/Config/Descriptions.php +++ b/src/Config/Descriptions.php @@ -490,9 +490,6 @@ class Descriptions 'SkipLockedTables_desc' => __( 'Mark used tables and make it possible to show databases with locked tables.', ), - 'SuhosinDisableWarning_desc' => __( - 'Disable the default warning that is displayed on the main page if Suhosin is detected.', - ), 'LoginCookieValidityDisableWarning_desc' => __( 'Disable the default warning that is displayed on the main page if the value ' . 'of the PHP setting session.gc_maxlifetime is less than the value of ' . @@ -927,7 +924,6 @@ class Descriptions 'SQLQuery_Explain_name' => __('Explain SQL'), 'SQLQuery_Refresh_name' => __('Refresh'), 'SQLQuery_ShowAsPHP_name' => __('Create PHP code'), - 'SuhosinDisableWarning_name' => __('Suhosin warning'), 'LoginCookieValidityDisableWarning_name' => __('Login cookie validity warning'), 'TextareaCols_name' => __('Textarea columns'), 'TextareaRows_name' => __('Textarea rows'), diff --git a/src/Config/Forms/User/FeaturesForm.php b/src/Config/Forms/User/FeaturesForm.php index c8cd324ba0..9d8fd24d34 100644 --- a/src/Config/Forms/User/FeaturesForm.php +++ b/src/Config/Forms/User/FeaturesForm.php @@ -51,7 +51,6 @@ class FeaturesForm extends BaseForm 'Page_titles' => ['TitleDefault', 'TitleTable', 'TitleDatabase', 'TitleServer'], 'Warnings' => [ 'PmaNoRelation_DisableWarning', - 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning', 'ReservedWordDisableWarning', ], diff --git a/src/Config/Settings.php b/src/Config/Settings.php index 3e575d702a..13834554f5 100644 --- a/src/Config/Settings.php +++ b/src/Config/Settings.php @@ -48,7 +48,6 @@ use const VERSION_CHECK_DEFAULT; * AuthLog: string, * AuthLogSuccess: bool, * PmaNoRelation_DisableWarning: bool, - * SuhosinDisableWarning: bool, * LoginCookieValidityDisableWarning: bool, * ReservedWordDisableWarning: bool, * TranslationWarningThreshold: int, @@ -297,17 +296,6 @@ final class Settings */ public bool $PmaNoRelation_DisableWarning; - /** - * Disable the default warning that is displayed if Suhosin is detected - * - * ```php - * $cfg['SuhosinDisableWarning'] = false; - * ``` - * - * @link https://docs.phpmyadmin.net/en/latest/config.html#cfg_SuhosinDisableWarning - */ - public bool $SuhosinDisableWarning; - /** * Disable the default warning that is displayed if session.gc_maxlifetime * is less than `LoginCookieValidity` @@ -2633,7 +2621,6 @@ final class Settings $this->authLog = $this->setAuthLog($settings); $this->authLogSuccess = $this->setAuthLogSuccess($settings); $this->PmaNoRelation_DisableWarning = $this->setPmaNoRelationDisableWarning($settings); - $this->SuhosinDisableWarning = $this->setSuhosinDisableWarning($settings); $this->LoginCookieValidityDisableWarning = $this->setLoginCookieValidityDisableWarning($settings); $this->ReservedWordDisableWarning = $this->setReservedWordDisableWarning($settings); $this->TranslationWarningThreshold = $this->setTranslationWarningThreshold($settings); @@ -2831,7 +2818,6 @@ final class Settings 'AuthLog' => $this->authLog, 'AuthLogSuccess' => $this->authLogSuccess, 'PmaNoRelation_DisableWarning' => $this->PmaNoRelation_DisableWarning, - 'SuhosinDisableWarning' => $this->SuhosinDisableWarning, 'LoginCookieValidityDisableWarning' => $this->LoginCookieValidityDisableWarning, 'ReservedWordDisableWarning' => $this->ReservedWordDisableWarning, 'TranslationWarningThreshold' => $this->TranslationWarningThreshold, @@ -3062,15 +3048,6 @@ final class Settings return (bool) $settings['PmaNoRelation_DisableWarning']; } - /** @param array $settings */ - private function setSuhosinDisableWarning(array $settings): bool - { - if (! isset($settings['SuhosinDisableWarning'])) { - return false; - } - - return (bool) $settings['SuhosinDisableWarning']; - } /** @param array $settings */ private function setLoginCookieValidityDisableWarning(array $settings): bool diff --git a/src/Controllers/HomeController.php b/src/Controllers/HomeController.php index 8ffab751f4..e9afc1be6e 100644 --- a/src/Controllers/HomeController.php +++ b/src/Controllers/HomeController.php @@ -390,26 +390,6 @@ final class HomeController implements InvocableController ]; } - /** - * Warning about Suhosin only if its simulation mode is not enabled - */ - if ( - ! $this->config->settings['SuhosinDisableWarning'] - && ini_get('suhosin.request.max_value_length') - && ini_get('suhosin.simulation') == '0' - ) { - $this->errors[] = [ - 'message' => sprintf( - __( - 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.', - ), - '[doc@faq1-38]', - '[/doc]', - ), - 'severity' => 'warning', - ]; - } - /* Missing template cache */ if ($this->config->getTempDir('twig') === null) { $this->errors[] = [ diff --git a/tests/unit/Config/Forms/Setup/FeaturesFormTest.php b/tests/unit/Config/Forms/Setup/FeaturesFormTest.php index e2ccb01ef6..e6e995a7f8 100644 --- a/tests/unit/Config/Forms/Setup/FeaturesFormTest.php +++ b/tests/unit/Config/Forms/Setup/FeaturesFormTest.php @@ -106,7 +106,6 @@ final class FeaturesFormTest extends AbstractTestCase self::assertSame( [ 'PmaNoRelation_DisableWarning' => 'PmaNoRelation_DisableWarning', - 'SuhosinDisableWarning' => 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning' => 'LoginCookieValidityDisableWarning', 'ReservedWordDisableWarning' => 'ReservedWordDisableWarning', ], @@ -236,7 +235,6 @@ final class FeaturesFormTest extends AbstractTestCase 'TitleDatabase', 'TitleServer', 'PmaNoRelation_DisableWarning', - 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning', 'ReservedWordDisableWarning', 'Console/Mode', diff --git a/tests/unit/Config/Forms/User/FeaturesFormTest.php b/tests/unit/Config/Forms/User/FeaturesFormTest.php index 9c0556bf48..340d3d004f 100644 --- a/tests/unit/Config/Forms/User/FeaturesFormTest.php +++ b/tests/unit/Config/Forms/User/FeaturesFormTest.php @@ -112,7 +112,6 @@ final class FeaturesFormTest extends AbstractTestCase self::assertSame( [ 'PmaNoRelation_DisableWarning' => 'PmaNoRelation_DisableWarning', - 'SuhosinDisableWarning' => 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning' => 'LoginCookieValidityDisableWarning', 'ReservedWordDisableWarning' => 'ReservedWordDisableWarning', ], @@ -181,7 +180,6 @@ final class FeaturesFormTest extends AbstractTestCase 'TitleDatabase', 'TitleServer', 'PmaNoRelation_DisableWarning', - 'SuhosinDisableWarning', 'LoginCookieValidityDisableWarning', 'ReservedWordDisableWarning', 'Console/Mode', diff --git a/tests/unit/Config/SettingsTest.php b/tests/unit/Config/SettingsTest.php index ca70077236..504e105edd 100644 --- a/tests/unit/Config/SettingsTest.php +++ b/tests/unit/Config/SettingsTest.php @@ -708,15 +708,6 @@ class SettingsTest extends TestCase self::assertSame($expected, $settingsArray['PmaNoRelation_DisableWarning']); } - #[DataProvider('booleanWithDefaultFalseProvider')] - public function testSuhosinDisableWarning(mixed $actual, bool $expected): void - { - $settings = new Settings(['SuhosinDisableWarning' => $actual]); - $settingsArray = $settings->asArray(); - self::assertSame($expected, $settings->SuhosinDisableWarning); - self::assertSame($expected, $settingsArray['SuhosinDisableWarning']); - } - #[DataProvider('booleanWithDefaultFalseProvider')] public function testLoginCookieValidityDisableWarning(mixed $actual, bool $expected): void {