From 520cd8ef8bfeccb0fd08f400fd4aa54692e05902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 8 Jan 2026 12:04:01 -0300 Subject: [PATCH] Move UserPreferences class to Config namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- app/services.php | 2 +- app/services_controllers.php | 2 +- phpstan-baseline.neon | 272 +++++++++--------- psalm-baseline.xml | 108 +++---- src/Config.php | 1 + src/Config/PageSettings.php | 1 - src/{ => Config}/UserPreferences.php | 11 +- src/Controllers/ErrorReportController.php | 2 +- .../Preferences/ExportController.php | 2 +- .../Preferences/FeaturesController.php | 2 +- .../Preferences/ImportController.php | 2 +- .../Preferences/MainPanelController.php | 2 +- .../Preferences/ManageController.php | 2 +- .../Preferences/NavigationController.php | 2 +- src/Controllers/Preferences/SqlController.php | 2 +- src/Controllers/ThemeSetController.php | 2 +- src/Header.php | 1 + src/Navigation/Navigation.php | 2 +- src/TwoFactor.php | 1 + tests/unit/Config/PageSettingsTest.php | 2 +- .../unit/{ => Config}/UserPreferencesTest.php | 5 +- .../Controllers/NavigationControllerTest.php | 2 +- .../Table/ChangeControllerTest.php | 2 +- .../Table/ExportControllerTest.php | 2 +- .../Table/ImportControllerTest.php | 2 +- .../Controllers/Table/SqlControllerTest.php | 2 +- .../Table/StructureControllerTest.php | 2 +- .../Controllers/ThemeSetControllerTest.php | 2 +- tests/unit/HeaderTest.php | 2 +- tests/unit/Stubs/ResponseRenderer.php | 2 +- 30 files changed, 227 insertions(+), 217 deletions(-) rename src/{ => Config}/UserPreferences.php (98%) rename tests/unit/{ => Config}/UserPreferencesTest.php (99%) diff --git a/app/services.php b/app/services.php index 9da9c1f9dd..0b6c15ff48 100644 --- a/app/services.php +++ b/app/services.php @@ -7,6 +7,7 @@ use PhpMyAdmin\Application; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\BrowseForeigners; use PhpMyAdmin\Config; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Console\Console; @@ -60,7 +61,6 @@ use PhpMyAdmin\Tracking\TrackingChecker; use PhpMyAdmin\Transformations; use PhpMyAdmin\Triggers\Triggers; use PhpMyAdmin\UserPassword; -use PhpMyAdmin\UserPreferences; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Utils\HttpRequest; use PhpMyAdmin\VersionInformation; diff --git a/app/services_controllers.php b/app/services_controllers.php index f436066bb2..7b09184cd4 100644 --- a/app/services_controllers.php +++ b/app/services_controllers.php @@ -7,6 +7,7 @@ use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\BrowseForeigners; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\BrowseForeignersController; @@ -86,7 +87,6 @@ use PhpMyAdmin\Tracking\Tracking; use PhpMyAdmin\Tracking\TrackingChecker; use PhpMyAdmin\Transformations; use PhpMyAdmin\UserPassword; -use PhpMyAdmin\UserPreferences; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\VersionInformation; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 339e662aa9..af55ec30fc 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1002,6 +1002,57 @@ parameters: count: 1 path: src/Config/SpecialSchemaLinks.php + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 1 + path: src/Config/UserPreferences.php + + - + message: '#^Cannot access offset ''userprefs'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 2 + path: src/Config/UserPreferences.php + + - + message: '#^Cannot access offset non\-falsy\-string on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 2 + path: src/Config/UserPreferences.php + + - + message: '#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\Dbal\\ResultInterface\|false given\.$#' + identifier: booleanNot.exprNotBoolean + count: 1 + path: src/Config/UserPreferences.php + + - + message: '#^Only booleans are allowed in an if condition, string\|false\|null given\.$#' + identifier: if.condNotBoolean + count: 1 + path: src/Config/UserPreferences.php + + - + message: '#^Parameter \#1 \$params of static method PhpMyAdmin\\Url\:\:getCommonRaw\(\) expects array\, array\ given\.$#' + identifier: argument.type + count: 1 + path: src/Config/UserPreferences.php + + - + message: '#^Parameter \#1 \$path of static method PhpMyAdmin\\Core\:\:arrayWrite\(\) expects string, \(int\|string\) given\.$#' + identifier: argument.type + count: 1 + path: src/Config/UserPreferences.php + + - + message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' + identifier: argument.type + count: 2 + path: src/Config/UserPreferences.php + - message: '#^Argument of an invalid type array\\|object supplied for foreach, only iterables are supported\.$#' identifier: foreach.nonIterable @@ -2212,7 +2263,7 @@ parameters: path: src/Controllers/Preferences/ManageController.php - - message: '#^Parameter \#1 \$fileName of method PhpMyAdmin\\UserPreferences\:\:redirect\(\) expects string, string\|false given\.$#' + message: '#^Parameter \#1 \$fileName of method PhpMyAdmin\\Config\\UserPreferences\:\:redirect\(\) expects string, string\|false given\.$#' identifier: argument.type count: 1 path: src/Controllers/Preferences/ManageController.php @@ -13467,57 +13518,6 @@ parameters: count: 1 path: src/UserPassword.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: src/UserPreferences.php - - - - message: '#^Cannot access offset ''userprefs'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 2 - path: src/UserPreferences.php - - - - message: '#^Cannot access offset non\-falsy\-string on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 2 - path: src/UserPreferences.php - - - - message: '#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\Dbal\\ResultInterface\|false given\.$#' - identifier: booleanNot.exprNotBoolean - count: 1 - path: src/UserPreferences.php - - - - message: '#^Only booleans are allowed in an if condition, string\|false\|null given\.$#' - identifier: if.condNotBoolean - count: 1 - path: src/UserPreferences.php - - - - message: '#^Parameter \#1 \$params of static method PhpMyAdmin\\Url\:\:getCommonRaw\(\) expects array\, array\ given\.$#' - identifier: argument.type - count: 1 - path: src/UserPreferences.php - - - - message: '#^Parameter \#1 \$path of static method PhpMyAdmin\\Core\:\:arrayWrite\(\) expects string, \(int\|string\) given\.$#' - identifier: argument.type - count: 1 - path: src/UserPreferences.php - - - - message: '#^Parameter \#1 \$str of method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:quoteString\(\) expects string, string\|false given\.$#' - identifier: argument.type - count: 2 - path: src/UserPreferences.php - - message: '#^Only booleans are allowed in a negated boolean, PhpMyAdmin\\Dbal\\ResultInterface\|false given\.$#' identifier: booleanNot.exprNotBoolean @@ -14706,6 +14706,90 @@ parameters: count: 1 path: tests/unit/Config/SettingsTest.php + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 5 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: ''' + #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: + Use dependency injection instead\.$# + ''' + identifier: staticMethod.deprecated + count: 8 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Cannot access offset ''db'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Cannot access offset ''secret'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Cannot access offset ''server_2'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Cannot access offset ''settings'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Cannot access offset ''ts'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Cannot access offset ''userprefs'' on mixed\.$#' + identifier: offsetAccess.nonOffsetAccessible + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Offset ''userconfig'' does not exist on array\\.$#' + identifier: offsetAccess.notFound + count: 3 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertCount\(\) expects Countable\|iterable, mixed given\.$#' + identifier: argument.type + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Parameter \#2 \$result of method PhpMyAdmin\\Tests\\Stubs\\DbiDummy\:\:addResult\(\) expects bool\|list\\>, array\{array\{non\-empty\-string\|false, 1767029179\}\} given\.$#' + identifier: argument.type + count: 2 + path: tests/unit/Config/UserPreferencesTest.php + + - + message: '#^Parameter \#3 \$subject of function str_replace expects array\\|string, string\|false given\.$#' + identifier: argument.type + count: 1 + 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''\}\.$#' + identifier: assign.propertyType + count: 1 + path: tests/unit/Config/UserPreferencesTest.php + - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: @@ -17376,90 +17460,6 @@ parameters: count: 4 path: tests/unit/UrlTest.php - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 5 - path: tests/unit/UserPreferencesTest.php - - - - message: ''' - #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Dbal\\DatabaseInterface\: - Use dependency injection instead\.$# - ''' - identifier: staticMethod.deprecated - count: 8 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Cannot access offset ''db'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Cannot access offset ''secret'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Cannot access offset ''server_2'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Cannot access offset ''settings'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Cannot access offset ''ts'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Cannot access offset ''userprefs'' on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Offset ''userconfig'' does not exist on array\\.$#' - identifier: offsetAccess.notFound - count: 3 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Parameter \#2 \$haystack of static method PHPUnit\\Framework\\Assert\:\:assertCount\(\) expects Countable\|iterable, mixed given\.$#' - identifier: argument.type - count: 1 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Parameter \#2 \$result of method PhpMyAdmin\\Tests\\Stubs\\DbiDummy\:\:addResult\(\) expects bool\|list\\>, array\{array\{non\-empty\-string\|false, 1767029179\}\} given\.$#' - identifier: argument.type - count: 2 - path: tests/unit/UserPreferencesTest.php - - - - message: '#^Parameter \#3 \$subject of function str_replace expects array\\|string, string\|false given\.$#' - identifier: argument.type - count: 1 - path: tests/unit/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''\}\.$#' - identifier: assign.propertyType - count: 1 - path: tests/unit/UserPreferencesTest.php - - message: ''' #^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\: diff --git a/psalm-baseline.xml b/psalm-baseline.xml index b5577a8c7c..9ca1389aa2 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -432,6 +432,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8706,31 +8731,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9231,6 +9231,35 @@ + + + + + + + + + + + + + + + + + + 'testval123', 'Server/port' => '213']]]> + + + + + + + + + + + @@ -11085,35 +11114,6 @@ - - - - - - - - - - - - - - - - - - 'testval123', 'Server/port' => '213']]]> - - - - - - - - - - - diff --git a/src/Config.php b/src/Config.php index 33958eb666..697afdd45b 100644 --- a/src/Config.php +++ b/src/Config.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin; use PhpMyAdmin\Config\Settings; use PhpMyAdmin\Config\Settings\Server; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\ConnectionType; use PhpMyAdmin\Dbal\DatabaseInterface; diff --git a/src/Config/PageSettings.php b/src/Config/PageSettings.php index e43013ea63..32b8d86d57 100644 --- a/src/Config/PageSettings.php +++ b/src/Config/PageSettings.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Config\Forms\Page\PageFormList; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\UserPreferences; use function __; diff --git a/src/UserPreferences.php b/src/Config/UserPreferences.php similarity index 98% rename from src/UserPreferences.php rename to src/Config/UserPreferences.php index 02b8dfc261..7c871779f4 100644 --- a/src/UserPreferences.php +++ b/src/Config/UserPreferences.php @@ -2,15 +2,22 @@ declare(strict_types=1); -namespace PhpMyAdmin; +namespace PhpMyAdmin\Config; -use PhpMyAdmin\Config\ConfigFile; +use PhpMyAdmin\Config; use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Core; +use PhpMyAdmin\Current; use PhpMyAdmin\Dbal\ConnectionType; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Identifiers\DatabaseName; +use PhpMyAdmin\Message; +use PhpMyAdmin\ResponseRenderer; +use PhpMyAdmin\Template; +use PhpMyAdmin\Url; +use PhpMyAdmin\Util; use function __; use function array_flip; diff --git a/src/Controllers/ErrorReportController.php b/src/Controllers/ErrorReportController.php index 3dfab8ad1a..bd06082f55 100644 --- a/src/Controllers/ErrorReportController.php +++ b/src/Controllers/ErrorReportController.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Error\ErrorHandler; @@ -18,7 +19,6 @@ use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Template; -use PhpMyAdmin\UserPreferences; use function __; use function in_array; diff --git a/src/Controllers/Preferences/ExportController.php b/src/Controllers/Preferences/ExportController.php index 5b88417673..53a92cc5fb 100644 --- a/src/Controllers/Preferences/ExportController.php +++ b/src/Controllers/Preferences/ExportController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\ExportForm; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use function ltrim; diff --git a/src/Controllers/Preferences/FeaturesController.php b/src/Controllers/Preferences/FeaturesController.php index 1a5f852bb5..609e21b1b7 100644 --- a/src/Controllers/Preferences/FeaturesController.php +++ b/src/Controllers/Preferences/FeaturesController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\FeaturesForm; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use function ltrim; diff --git a/src/Controllers/Preferences/ImportController.php b/src/Controllers/Preferences/ImportController.php index de740786b9..a5659a5eac 100644 --- a/src/Controllers/Preferences/ImportController.php +++ b/src/Controllers/Preferences/ImportController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\ImportForm; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use function ltrim; diff --git a/src/Controllers/Preferences/MainPanelController.php b/src/Controllers/Preferences/MainPanelController.php index 67c317ad47..c5bbd3f68e 100644 --- a/src/Controllers/Preferences/MainPanelController.php +++ b/src/Controllers/Preferences/MainPanelController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\MainForm; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use function ltrim; diff --git a/src/Controllers/Preferences/ManageController.php b/src/Controllers/Preferences/ManageController.php index 4e4afba519..12f6cf9c95 100644 --- a/src/Controllers/Preferences/ManageController.php +++ b/src/Controllers/Preferences/ManageController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\UserFormList; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Core; @@ -20,7 +21,6 @@ use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; -use PhpMyAdmin\UserPreferences; use PhpMyAdmin\Util; use function __; diff --git a/src/Controllers/Preferences/NavigationController.php b/src/Controllers/Preferences/NavigationController.php index 41f824a168..de87561cd8 100644 --- a/src/Controllers/Preferences/NavigationController.php +++ b/src/Controllers/Preferences/NavigationController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\NaviForm; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use function ltrim; diff --git a/src/Controllers/Preferences/SqlController.php b/src/Controllers/Preferences/SqlController.php index 41e675ed51..173b291482 100644 --- a/src/Controllers/Preferences/SqlController.php +++ b/src/Controllers/Preferences/SqlController.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Controllers\Preferences; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Config\Forms\User\SqlForm; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use function ltrim; diff --git a/src/Controllers/ThemeSetController.php b/src/Controllers/ThemeSetController.php index abecb016fc..9c2de750b4 100644 --- a/src/Controllers/ThemeSetController.php +++ b/src/Controllers/ThemeSetController.php @@ -5,13 +5,13 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Config; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Routing\Route; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; #[Route('/themes/set', ['POST'])] final readonly class ThemeSetController implements InvocableController diff --git a/src/Header.php b/src/Header.php index 8edfd6d3ff..c61ca836f6 100644 --- a/src/Header.php +++ b/src/Header.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console\Console; use PhpMyAdmin\Container\ContainerBuilder; diff --git a/src/Navigation/Navigation.php b/src/Navigation/Navigation.php index ca2c90a708..dfc8a592af 100644 --- a/src/Navigation/Navigation.php +++ b/src/Navigation/Navigation.php @@ -10,6 +10,7 @@ namespace PhpMyAdmin\Navigation; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Container\ContainerBuilder; use PhpMyAdmin\Current; @@ -21,7 +22,6 @@ use PhpMyAdmin\Server\Select; use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Util; diff --git a/src/TwoFactor.php b/src/TwoFactor.php index b9d1b9b9df..2a7d951399 100644 --- a/src/TwoFactor.php +++ b/src/TwoFactor.php @@ -9,6 +9,7 @@ namespace PhpMyAdmin; use BaconQrCode\Renderer\ImageRenderer; use CodeLts\U2F\U2FServer\U2FServer; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; diff --git a/tests/unit/Config/PageSettingsTest.php b/tests/unit/Config/PageSettingsTest.php index a6ca22712b..fad00701e9 100644 --- a/tests/unit/Config/PageSettingsTest.php +++ b/tests/unit/Config/PageSettingsTest.php @@ -6,13 +6,13 @@ namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Current; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\BackupStaticProperties; use PHPUnit\Framework\Attributes\CoversClass; use ReflectionProperty; diff --git a/tests/unit/UserPreferencesTest.php b/tests/unit/Config/UserPreferencesTest.php similarity index 99% rename from tests/unit/UserPreferencesTest.php rename to tests/unit/Config/UserPreferencesTest.php index f9fc16b962..c63964d604 100644 --- a/tests/unit/UserPreferencesTest.php +++ b/tests/unit/Config/UserPreferencesTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace PhpMyAdmin\Tests; +namespace PhpMyAdmin\Tests\Config; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Current; @@ -14,10 +15,10 @@ use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Template; +use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseRendererStub; use PhpMyAdmin\Url; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\BackupStaticProperties; use PHPUnit\Framework\Attributes\CoversClass; use ReflectionProperty; diff --git a/tests/unit/Controllers/NavigationControllerTest.php b/tests/unit/Controllers/NavigationControllerTest.php index e3d84a00cc..286e8522ce 100644 --- a/tests/unit/Controllers/NavigationControllerTest.php +++ b/tests/unit/Controllers/NavigationControllerTest.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\NavigationController; use PhpMyAdmin\Current; @@ -16,7 +17,6 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; use function sprintf; diff --git a/tests/unit/Controllers/Table/ChangeControllerTest.php b/tests/unit/Controllers/Table/ChangeControllerTest.php index 54e42eaeaa..2880008c73 100644 --- a/tests/unit/Controllers/Table/ChangeControllerTest.php +++ b/tests/unit/Controllers/Table/ChangeControllerTest.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\ChangeController; use PhpMyAdmin\Current; @@ -18,7 +19,6 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Transformations; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; #[CoversClass(ChangeController::class)] diff --git a/tests/unit/Controllers/Table/ExportControllerTest.php b/tests/unit/Controllers/Table/ExportControllerTest.php index 3153577a3f..6459e412a0 100644 --- a/tests/unit/Controllers/Table/ExportControllerTest.php +++ b/tests/unit/Controllers/Table/ExportControllerTest.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\ExportController; use PhpMyAdmin\Current; @@ -20,7 +21,6 @@ use PhpMyAdmin\Plugins\ExportType; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; #[CoversClass(ExportController::class)] diff --git a/tests/unit/Controllers/Table/ImportControllerTest.php b/tests/unit/Controllers/Table/ImportControllerTest.php index 926d6c3692..8aa7226ccd 100644 --- a/tests/unit/Controllers/Table/ImportControllerTest.php +++ b/tests/unit/Controllers/Table/ImportControllerTest.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\ImportController; use PhpMyAdmin\Current; @@ -20,7 +21,6 @@ use PhpMyAdmin\Plugins\Import\Upload\UploadNoplugin; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\RequiresPhpExtension; diff --git a/tests/unit/Controllers/Table/SqlControllerTest.php b/tests/unit/Controllers/Table/SqlControllerTest.php index 3134626492..35f57dc676 100644 --- a/tests/unit/Controllers/Table/SqlControllerTest.php +++ b/tests/unit/Controllers/Table/SqlControllerTest.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\SqlController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; #[CoversClass(SqlController::class)] diff --git a/tests/unit/Controllers/Table/StructureControllerTest.php b/tests/unit/Controllers/Table/StructureControllerTest.php index 0d4a4429c6..e7cb036a06 100644 --- a/tests/unit/Controllers/Table/StructureControllerTest.php +++ b/tests/unit/Controllers/Table/StructureControllerTest.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; @@ -19,7 +20,6 @@ use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Transformations; -use PhpMyAdmin\UserPreferences; use PhpMyAdmin\Util; use PHPUnit\Framework\Attributes\CoversClass; use ReflectionProperty; diff --git a/tests/unit/Controllers/ThemeSetControllerTest.php b/tests/unit/Controllers/ThemeSetControllerTest.php index c9ebb8032e..a029ea6054 100644 --- a/tests/unit/Controllers/ThemeSetControllerTest.php +++ b/tests/unit/Controllers/ThemeSetControllerTest.php @@ -5,13 +5,13 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Config; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\Controllers\ThemeSetController; use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Theme\ThemeManager; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/unit/HeaderTest.php b/tests/unit/HeaderTest.php index 037a6e3c1f..8a38efe6ed 100644 --- a/tests/unit/HeaderTest.php +++ b/tests/unit/HeaderTest.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\Config; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console\Console; use PhpMyAdmin\Console\History; @@ -14,7 +15,6 @@ use PhpMyAdmin\Dbal\DatabaseInterface; use PhpMyAdmin\Header; use PhpMyAdmin\Message; use PhpMyAdmin\Template; -use PhpMyAdmin\UserPreferences; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Medium; diff --git a/tests/unit/Stubs/ResponseRenderer.php b/tests/unit/Stubs/ResponseRenderer.php index 73a850901b..a9a73245e8 100644 --- a/tests/unit/Stubs/ResponseRenderer.php +++ b/tests/unit/Stubs/ResponseRenderer.php @@ -13,6 +13,7 @@ namespace PhpMyAdmin\Tests\Stubs; use PhpMyAdmin\Bookmarks\BookmarkRepository; use PhpMyAdmin\Config; +use PhpMyAdmin\Config\UserPreferences; use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Console\Console; use PhpMyAdmin\Console\History; @@ -25,7 +26,6 @@ use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Message; use PhpMyAdmin\Template; -use PhpMyAdmin\UserPreferences; use function is_array; use function json_encode;