diff options
130 files changed, 22 insertions, 165 deletions
@@ -9,7 +9,6 @@ declare(strict_types=1); use FastRoute\Dispatcher; use PhpMyAdmin\Message; use PhpMyAdmin\Response; - use function FastRoute\simpleDispatcher; if (! defined('ROOT_PATH')) { diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index fa2b85f6a6..18116e4466 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -7,8 +7,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Charsets; -use PhpMyAdmin\Charsets; - /** * Value object class for a collation * @package PhpMyAdmin\Charsets diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 861e78412f..67d78d27fc 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -15,9 +15,7 @@ use PhpMyAdmin\Error; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ThemeManager; -use PhpMyAdmin\Url; use PhpMyAdmin\UserPreferences; -use PhpMyAdmin\Util; use PhpMyAdmin\Utils\HttpRequest; /** diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php index f3f232c8a8..f5401cda55 100644 --- a/libraries/classes/Config/ConfigFile.php +++ b/libraries/classes/Config/ConfigFile.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Config; -use PhpMyAdmin\Config; use PhpMyAdmin\Core; /** diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index cfb48a2ab4..0fce6cf57f 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -12,8 +12,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * PhpMyAdmin\Config\FormDisplayTemplate class diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index 635217464a..edc4c81d07 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin; use PhpMyAdmin\Bookmark; use PhpMyAdmin\Relation; use PhpMyAdmin\Template; -use PhpMyAdmin\Util; /** * Class used to output the console diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index 8c73e4efd9..314ae29f5f 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Database; use PhpMyAdmin\Database\MultiTableQuery; -use PhpMyAdmin\Template; /** * Handles database multi-table querying diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 672f82c0a9..6d72cb1a0b 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Response; use PhpMyAdmin\Server\Status\Data; use PhpMyAdmin\Template; -use Symfony\Component\ExpressionLanguage\ExpressionLanguage; /** * Displays the advisor feature diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index f20ca286e2..f2e56ac79e 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Controllers\Server\Status; use PhpMyAdmin\Html\Generator; -use PhpMyAdmin\Util; /** * Class VariablesController diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 8afb823765..2181e184f0 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PhpMyAdmin\Response; use PhpMyAdmin\Template; -use PhpMyAdmin\Util; /** * Class IndexesController diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index 96576d679f..7c21a3810f 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; - use function imagecopyresampled; use function imagecreatefromstring; use function imagecreatetruecolor; diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index 906bda11fb..c4825e2315 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Database; +use PhpMyAdmin\Database\Designer\DesignerTable; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; @@ -15,7 +16,6 @@ use PhpMyAdmin\Plugins\SchemaPlugin; use PhpMyAdmin\Relation; use PhpMyAdmin\Template; use PhpMyAdmin\Util; -use PhpMyAdmin\Database\Designer\DesignerTable; use stdClass; /** diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index 40ef00a9af..85b03c9112 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -8,13 +8,13 @@ declare(strict_types=1); namespace PhpMyAdmin\Database\Designer; +use PhpMyAdmin\Database\Designer\DesignerTable; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Index; use PhpMyAdmin\Relation; use PhpMyAdmin\Table; use PhpMyAdmin\Util; use function rawurlencode; -use PhpMyAdmin\Database\Designer\DesignerTable; /** * Common functions for Designer diff --git a/libraries/classes/Database/Designer/DesignerTable.php b/libraries/classes/Database/Designer/DesignerTable.php index e4835e48d8..bf8e24bde0 100644 --- a/libraries/classes/Database/Designer/DesignerTable.php +++ b/libraries/classes/Database/Designer/DesignerTable.php @@ -4,6 +4,7 @@ * * @package PhpMyAdmin-Designer */ + namespace PhpMyAdmin\Database\Designer; use PhpMyAdmin\Util; diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php index c517d190bd..cebc492e14 100644 --- a/libraries/classes/Database/Search.php +++ b/libraries/classes/Database/Search.php @@ -9,8 +9,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Database; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Template; use PhpMyAdmin\Util; diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index 1318a0b5b7..3196598fe8 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -2,8 +2,7 @@ /** * Interface to the MySQL Improved extension (MySQLi) * - * @package PhpMyAdmin-DBI - * @subpackage MySQLi + * @package PhpMyAdmin-DBI */ declare(strict_types=1); @@ -19,8 +18,7 @@ use function mysqli_init; /** * Interface to the MySQL Improved extension (MySQLi) * - * @package PhpMyAdmin-DBI - * @subpackage MySQLi + * @package PhpMyAdmin-DBI */ class DbiMysqli implements DbiExtension { diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php index 5975e5c1ca..0445bc349f 100644 --- a/libraries/classes/Encoding.php +++ b/libraries/classes/Encoding.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin; -use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\Core; use PhpMyAdmin\Template; diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index 94370b50ef..77f86feb7d 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -12,8 +12,6 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Language; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Language selection manager diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index 3a1d0ba289..9c45e694c4 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -8,8 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin; -use PhpMyAdmin\Html\Generator; - /** * Class for generating the top menu * diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php index 125e79c77a..6448abe930 100644 --- a/libraries/classes/Message.php +++ b/libraries/classes/Message.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin; use PhpMyAdmin\Sanitize; -use PhpMyAdmin\Util; /** * a single message diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index 1b5d473f08..f639369e4d 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -20,7 +20,6 @@ use PhpMyAdmin\RecentFavoriteTable; use PhpMyAdmin\Response; use PhpMyAdmin\Template; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Displays a collapsible of database objects in the navigation frame diff --git a/libraries/classes/Navigation/Nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php index 4ee90cbe98..3699181dc2 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a columns node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php index fd260af3a4..2b98869c42 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for column nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php index 6faf19d9f2..1a4378baf7 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; -use PhpMyAdmin\Relation; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index baee76215e..b2a01a07cc 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -9,9 +9,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; -use PhpMyAdmin\Relation; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a node that is a child of a database node diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php index 351131ecea..c4ab815e7d 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -12,7 +12,6 @@ use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for database nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php index 20317e97f1..83fd61a95e 100644 --- a/libraries/classes/Navigation/Nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a event node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php index 5762734d72..e3b71a17e3 100644 --- a/libraries/classes/Navigation/Nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for events nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php index 04467668e5..5567873742 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a function node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index 2e954c0d74..b1dada9695 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for functions nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php index cf619094e9..bbee6eb0f5 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a index node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 84ad3ed9e1..98465230e1 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for index nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php index 09b2dc2eca..c98829f760 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a procedure node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index f5f477efec..31be169e2f 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for procedure nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php index 3b0da72391..42bb990260 100644 --- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for table nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php index 561403cbbe..41fd126c1d 100644 --- a/libraries/classes/Navigation/Nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a trigger node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index 7d190a0a67..4674769c6b 100644 --- a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for trigger nodes in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php index af64386d41..abb43affc2 100644 --- a/libraries/classes/Navigation/Nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a view node in the navigation tree diff --git a/libraries/classes/Navigation/Nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php index e5fd0c2ae2..59eb07a61e 100644 --- a/libraries/classes/Navigation/Nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Navigation\Nodes; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Represents a container for view nodes in the navigation tree diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php index 833b445170..8f4618fe77 100644 --- a/libraries/classes/Plugins.php +++ b/libraries/classes/Plugins.php @@ -22,7 +22,6 @@ use PhpMyAdmin\Properties\Options\OptionsPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; use PhpMyAdmin\Properties\Plugins\PluginPropertyItem; use PhpMyAdmin\Properties\Plugins\SchemaPluginProperties; -use PhpMyAdmin\Util; /** * PhpMyAdmin\Plugins class diff --git a/libraries/classes/Plugins/Auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php index 2c5e022675..20515fa888 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Plugins\AuthenticationPlugin; use PhpMyAdmin\Response; use PhpMyAdmin\Server\Select; -use PhpMyAdmin\Url; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index 6f0bae2592..6130be7540 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -14,7 +14,6 @@ use PhpMyAdmin\IpAllowDeny; use PhpMyAdmin\Logging; use PhpMyAdmin\Message; use PhpMyAdmin\Response; -use PhpMyAdmin\Sanitize; use PhpMyAdmin\Session; use PhpMyAdmin\Template; use PhpMyAdmin\TwoFactor; diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php index 82ee8d915f..6da9afd6fc 100644 --- a/libraries/classes/Plugins/Export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\Export\Helpers\TableProperty; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php index d4bfa38980..4112c2ef1c 100644 --- a/libraries/classes/Plugins/Export/ExportCsv.php +++ b/libraries/classes/Plugins/Export/ExportCsv.php @@ -10,13 +10,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\HiddenPropertyItem; -use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php index 6d1cedd566..d3e77f8cb7 100644 --- a/libraries/classes/Plugins/Export/ExportHtmlword.php +++ b/libraries/classes/Plugins/Export/ExportHtmlword.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; @@ -18,8 +17,6 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; -use PhpMyAdmin\Relation; -use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index f4311dc391..bc9e622ac8 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php index 691b687af2..a5e7cac589 100644 --- a/libraries/classes/Plugins/Export/ExportLatex.php +++ b/libraries/classes/Plugins/Export/ExportLatex.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; @@ -18,8 +17,6 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; -use PhpMyAdmin\Relation; -use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php index 957645f709..43c6301164 100644 --- a/libraries/classes/Plugins/Export/ExportMediawiki.php +++ b/libraries/classes/Plugins/Export/ExportMediawiki.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php index 9f37ba6025..9c359527ff 100644 --- a/libraries/classes/Plugins/Export/ExportOds.php +++ b/libraries/classes/Plugins/Export/ExportOds.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\OpenDocument; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index 712e1c387f..4d9c40c146 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\OpenDocument; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; @@ -19,7 +18,6 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; -use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index 8552b6a656..f91413cc97 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -2,14 +2,12 @@ /** * Produce a PDF report (export) from a query * - * @package PhpMyAdmin-Export - * @subpackage PDF + * @package PhpMyAdmin-Export */ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\Export\Helpers\Pdf; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; @@ -29,8 +27,7 @@ if (! class_exists('TCPDF')) { /** * Handles the export for the PDF class * - * @package PhpMyAdmin-Export - * @subpackage PDF + * @package PhpMyAdmin-Export */ class ExportPdf extends ExportPlugin { diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php index 113e0a3ecb..33380d86af 100644 --- a/libraries/classes/Plugins/Export/ExportPhparray.php +++ b/libraries/classes/Plugins/Export/ExportPhparray.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index 979ad7ac44..a18f6b5102 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\Charsets; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php index e8e6de6c9e..d0a3f08ff0 100644 --- a/libraries/classes/Plugins/Export/ExportTexytext.php +++ b/libraries/classes/Plugins/Export/ExportTexytext.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; @@ -18,8 +17,6 @@ use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem; use PhpMyAdmin\Properties\Options\Items\TextPropertyItem; use PhpMyAdmin\Properties\Plugins\ExportPluginProperties; -use PhpMyAdmin\Relation; -use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; /** diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index 6206ef6353..ac99051714 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php index c008efb812..f37cbb6b2b 100644 --- a/libraries/classes/Plugins/Export/ExportYaml.php +++ b/libraries/classes/Plugins/Export/ExportYaml.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Export; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Export; use PhpMyAdmin\Plugins\ExportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php index 13beb88b42..0ac4ee9dad 100644 --- a/libraries/classes/Plugins/Import/ImportCsv.php +++ b/libraries/classes/Plugins/Import/ImportCsv.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\Html\Generator; -use PhpMyAdmin\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; use PhpMyAdmin\Properties\Options\Items\NumberPropertyItem; diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php index ff7a5b10a9..6efb304817 100644 --- a/libraries/classes/Plugins/Import/ImportLdi.php +++ b/libraries/classes/Plugins/Import/ImportLdi.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; -use PhpMyAdmin\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\Import\AbstractImportCsv; use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem; diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php index 8b07a077cd..66336d532a 100644 --- a/libraries/classes/Plugins/Import/ImportMediawiki.php +++ b/libraries/classes/Plugins/Import/ImportMediawiki.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; -use PhpMyAdmin\Import; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Properties\Plugins\ImportPluginProperties; diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php index a6663e2b2b..81f4b15245 100644 --- a/libraries/classes/Plugins/Import/ImportSql.php +++ b/libraries/classes/Plugins/Import/ImportSql.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Import; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Import; use PhpMyAdmin\Plugins\ImportPlugin; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup; use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup; diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php index dd8807c505..e7c4b7f649 100644 --- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf; use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; -use PhpMyAdmin\Relation; /** * Dia Relation Schema Class diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index 9addce5cd2..f94ef1947c 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -8,12 +8,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; -use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia; use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf; use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; -use PhpMyAdmin\Relation; /** * EPS Relation Schema Class diff --git a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php index 9341330506..1ab685a9ed 100644 --- a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php +++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Eps; -use PhpMyAdmin\Font; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\TableStats; diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index fcb98fd5a3..3401aa11c2 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Plugins\Schema\Pdf; use PhpMyAdmin\Pdf as PdfLib; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; -use PhpMyAdmin\Relation; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index f7056eebda..2b27e62130 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -8,14 +8,12 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; -use PhpMyAdmin\Plugins\Schema\Dia\RelationStatsDia; use PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia; use PhpMyAdmin\Plugins\Schema\Eps\TableStatsEps; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\Pdf\TableStatsPdf; use PhpMyAdmin\Plugins\Schema\Svg\Svg; use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; -use PhpMyAdmin\Relation; /** * RelationStatsSvg Relation Schema Class diff --git a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php index cffd40a547..743c909655 100644 --- a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\Schema\Svg; -use PhpMyAdmin\Font; use PhpMyAdmin\Plugins\Schema\ExportRelationSchema; use PhpMyAdmin\Plugins\Schema\TableStats; diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php index 84c0dbdd67..d74510051b 100644 --- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Plugins\Transformations\Abs; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Plugins\TransformationsPlugin; -use PhpMyAdmin\Util; use stdClass; /** diff --git a/libraries/classes/Plugins/TwoFactor/Invalid.php b/libraries/classes/Plugins/TwoFactor/Invalid.php index 1658c0a05b..208da88b00 100644 --- a/libraries/classes/Plugins/TwoFactor/Invalid.php +++ b/libraries/classes/Plugins/TwoFactor/Invalid.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Plugins\TwoFactorPlugin; -use PhpMyAdmin\Template; /** * Invalid two-factor authentication showing that configured choice is not available. diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php index f656cd929a..24adc5043b 100644 --- a/libraries/classes/Plugins/TwoFactor/Key.php +++ b/libraries/classes/Plugins/TwoFactor/Key.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Plugins\TwoFactorPlugin; use PhpMyAdmin\Response; -use PhpMyAdmin\Template; use PhpMyAdmin\TwoFactor; use Samyoul\U2F\U2FServer\U2FException; use Samyoul\U2F\U2FServer\U2FServer; diff --git a/libraries/classes/Plugins/TwoFactor/Simple.php b/libraries/classes/Plugins/TwoFactor/Simple.php index de1791472c..18919bf5b7 100644 --- a/libraries/classes/Plugins/TwoFactor/Simple.php +++ b/libraries/classes/Plugins/TwoFactor/Simple.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Plugins\TwoFactor; use PhpMyAdmin\Plugins\TwoFactorPlugin; -use PhpMyAdmin\Template; /** * Simple two-factor authentication auth asking just for confirmation. diff --git a/libraries/classes/Rte/Footer.php b/libraries/classes/Rte/Footer.php index 9fb7bdf6ef..2051ebc3c6 100644 --- a/libraries/classes/Rte/Footer.php +++ b/libraries/classes/Rte/Footer.php @@ -9,8 +9,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Rte; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Url; use PhpMyAdmin\Util; diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php index 1627d0002b..3312517886 100644 --- a/libraries/classes/Rte/Routines.php +++ b/libraries/classes/Rte/Routines.php @@ -12,8 +12,8 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Charsets\Charset; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Message; use PhpMyAdmin\Response; use PhpMyAdmin\SqlParser\Parser; diff --git a/libraries/classes/Rte/RteList.php b/libraries/classes/Rte/RteList.php index 6d6c6f5b54..853ddc6945 100644 --- a/libraries/classes/Rte/RteList.php +++ b/libraries/classes/Rte/RteList.php @@ -9,8 +9,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Rte; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Response; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\CreateStatement; diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php index 7adf0fb02c..b153d966d2 100644 --- a/libraries/classes/Scripts.php +++ b/libraries/classes/Scripts.php @@ -8,10 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin; -use PhpMyAdmin\Header; -use PhpMyAdmin\Sanitize; -use PhpMyAdmin\Url; - /** * Collects information about which JavaScript * files and objects are necessary to render diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index c404e1e721..7d10957dcc 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -11,10 +11,9 @@ namespace PhpMyAdmin\Server; use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Display\ChangePassword; -use PhpMyAdmin\Html\Forms; use PhpMyAdmin\Html\Forms\Fields\DropDown; -use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Message; use PhpMyAdmin\Relation; use PhpMyAdmin\RelationCleanup; diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 1b14676e1d..97a65de191 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -865,8 +865,6 @@ class Table * from the old entry * (array('FIELDNAME' => 'NEW FIELDVALUE')) * - * @global relation variable - * * @return int|boolean */ public static function duplicateInfo( diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php index dc811acbab..a3eccb9260 100644 --- a/libraries/classes/Theme.php +++ b/libraries/classes/Theme.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin; use PhpMyAdmin\Template; use PhpMyAdmin\ThemeManager; -use PhpMyAdmin\Url; /** * handles theme diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php index 2fffda7285..281f2bd4fd 100644 --- a/libraries/classes/VersionInformation.php +++ b/libraries/classes/VersionInformation.php @@ -9,7 +9,7 @@ declare(strict_types=1); namespace PhpMyAdmin; use PhpMyAdmin\Utils\HttpRequest; -use \stdClass; +use stdClass; /** * Responsible for retrieving version information and notifiying about latest version diff --git a/libraries/entry_points/import.php b/libraries/entry_points/import.php index d394fe0c1a..86a9891818 100644 --- a/libraries/entry_points/import.php +++ b/libraries/entry_points/import.php @@ -43,7 +43,7 @@ $response = $containerBuilder->get(Response::class); /** @var DatabaseInterface $dbi */ $dbi = $containerBuilder->get(DatabaseInterface::class); -/** @var import $import */ +/** @var Import $import */ $import = $containerBuilder->get('import'); if (isset($_POST['show_as_php'])) { diff --git a/libraries/entry_points/sql.php b/libraries/entry_points/sql.php index c6d581af0d..56b69a6279 100644 --- a/libraries/entry_points/sql.php +++ b/libraries/entry_points/sql.php @@ -10,6 +10,7 @@ declare(strict_types=1); use PhpMyAdmin\CheckUserPrivileges; use PhpMyAdmin\Config\PageSettings; +use PhpMyAdmin\Core; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\ParseAnalyze; @@ -17,7 +18,6 @@ use PhpMyAdmin\Response; use PhpMyAdmin\Sql; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PhpMyAdmin\Core; if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/entry_points/table/gis_visualization.php b/libraries/entry_points/table/gis_visualization.php index 8f1cd40d28..2647aba025 100644 --- a/libraries/entry_points/table/gis_visualization.php +++ b/libraries/entry_points/table/gis_visualization.php @@ -7,9 +7,9 @@ declare(strict_types=1); use PhpMyAdmin\Controllers\Table\GisVisualizationController; +use PhpMyAdmin\Core; use PhpMyAdmin\Url; use PhpMyAdmin\Util; -use PhpMyAdmin\Core; use Symfony\Component\DependencyInjection\Definition; if (! defined('PHPMYADMIN')) { diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 68653ca031..394341e759 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -8,9 +8,9 @@ declare(strict_types=1); use PhpMyAdmin\Config; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\MoTranslator\Loader; +use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Theme; if (! defined('ROOT_PATH')) { diff --git a/test/bootstrap-phpstan.php b/test/bootstrap-phpstan.php index 006e409c36..ba1136f350 100644 --- a/test/bootstrap-phpstan.php +++ b/test/bootstrap-phpstan.php @@ -8,8 +8,8 @@ declare(strict_types=1); use PhpMyAdmin\Config; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\MoTranslator\Loader; +use PhpMyAdmin\Tests\Stubs\DbiDummy; if (! defined('ROOT_PATH')) { define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR); diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index 616537853a..3fc6b66c4b 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Advisor; use PhpMyAdmin\Config; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; /** diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php index c503628692..516b805fbb 100644 --- a/test/classes/Config/Forms/FormListTest.php +++ b/test/classes/Config/Forms/FormListTest.php @@ -10,9 +10,6 @@ namespace PhpMyAdmin\Tests\Config\Forms; use PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; -use PhpMyAdmin\Config\Forms\Page\PageFormList; -use PhpMyAdmin\Config\Forms\Setup\SetupFormList; -use PhpMyAdmin\Config\Forms\User\UserFormList; use PhpMyAdmin\Tests\PmaTestCase; /** diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 8b709b9881..6d27ca412b 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\Tests\PmaTestCase; -use PHPUnit\Framework\Assert; use PHPUnit\Framework\Exception; /** diff --git a/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php index 59a50083ac..36c21b4312 100644 --- a/test/classes/Controllers/Server/CollationsControllerTest.php +++ b/test/classes/Controllers/Server/CollationsControllerTest.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Server; -use PhpMyAdmin\Charsets; use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Server\CollationsController; use PhpMyAdmin\Response; diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php index dafef28964..bef58acf81 100644 --- a/test/classes/Controllers/Server/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/VariablesControllerTest.php @@ -14,8 +14,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Response; use PhpMyAdmin\Template; -use PhpMyAdmin\Url; -use PhpMyAdmin\Util; use PHPUnit\Framework\TestCase; use ReflectionClass; use Williamdes\MariaDBMySQLKBS\Search as KBSearch; diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php index d299877144..759f11dcd8 100644 --- a/test/classes/Controllers/Table/IndexesControllerTest.php +++ b/test/classes/Controllers/Table/IndexesControllerTest.php @@ -8,8 +8,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers\Table; use PhpMyAdmin\Controllers\Table\IndexesController; -use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Html\Generator; +use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PhpMyAdmin\Response; @@ -17,7 +17,6 @@ use PhpMyAdmin\Template; use PhpMyAdmin\Tests\PmaTestCase; use PhpMyAdmin\Tests\Stubs\Response as ResponseStub; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; /** * Tests for PhpMyAdmin\Controllers\Table\IndexesController diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index fed45f33d2..be8a3db957 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Tests\Database; use PhpMyAdmin\Database\Search; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; use ReflectionClass; /** diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index 870fd0624a..a9d8b066c6 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -9,8 +9,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\PmaTestCase; +use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Util; use stdClass; diff --git a/test/classes/Display/ChangePasswordTest.php b/test/classes/Display/ChangePasswordTest.php index b9f966be49..473cd53ec2 100644 --- a/test/classes/Display/ChangePasswordTest.php +++ b/test/classes/Display/ChangePasswordTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Display; use PhpMyAdmin\Config; use PhpMyAdmin\Display\ChangePassword; -use PhpMyAdmin\Theme; use PhpMyAdmin\Url; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Display/CreateTableTest.php b/test/classes/Display/CreateTableTest.php index f962a376d8..8b53b47b25 100644 --- a/test/classes/Display/CreateTableTest.php +++ b/test/classes/Display/CreateTableTest.php @@ -10,9 +10,7 @@ namespace PhpMyAdmin\Tests\Display; use PhpMyAdmin\Display\CreateTable; use PhpMyAdmin\Html\Generator; -use PhpMyAdmin\Theme; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; use PHPUnit\Framework\TestCase; /** diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index d86934748f..e927076507 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Error; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Error class testing. diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index 8638e896df..8745f3ddf4 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\ErrorHandler; use PhpMyAdmin\Footer; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; use ReflectionClass; /** diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index 458ccd5dd8..63eaf838bf 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Core; use PhpMyAdmin\Header; use PhpMyAdmin\Tests\PmaTestCase; -use ReflectionMethod; use ReflectionProperty; /** diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php index 3176cf3532..dbc83f2c15 100644 --- a/test/classes/Html/GeneratorTest.php +++ b/test/classes/Html/GeneratorTest.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Html; -use PhpMyAdmin\Html\Forms; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Tests\PmaTestCase; use PhpMyAdmin\Util; diff --git a/test/classes/Html/MySQLDocumentationTest.php b/test/classes/Html/MySQLDocumentationTest.php index 486e93d4bf..a290e4d34c 100644 --- a/test/classes/Html/MySQLDocumentationTest.php +++ b/test/classes/Html/MySQLDocumentationTest.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Html; -use PhpMyAdmin\Html\Forms; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Tests\PmaTestCase; diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index 2e0b49abaf..f5640ff250 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Import; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\Url; -use PhpMyAdmin\Util; use PHPUnit\Framework\TestCase; /** diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php index 0ae8dc67b9..f69220d6c7 100644 --- a/test/classes/MessageTest.php +++ b/test/classes/MessageTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Message; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Test for Message class diff --git a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php index 71f03e7983..2657add994 100644 --- a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumnContainer class diff --git a/test/classes/Navigation/Nodes/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php index 1bb42a8232..555652e6ae 100644 --- a/test/classes/Navigation/Nodes/NodeColumnTest.php +++ b/test/classes/Navigation/Nodes/NodeColumnTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumn class diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php index c61381d6d1..2ea56bde13 100644 --- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php +++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabase class diff --git a/test/classes/Navigation/Nodes/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php index c3a5e65002..783b8e2e07 100644 --- a/test/classes/Navigation/Nodes/NodeEventContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; use PhpMyAdmin\Url; /** diff --git a/test/classes/Navigation/Nodes/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php index 93b9fb6deb..613a1f8041 100644 --- a/test/classes/Navigation/Nodes/NodeEventTest.php +++ b/test/classes/Navigation/Nodes/NodeEventTest.php @@ -10,8 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; -use PhpMyAdmin\Url; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeEvent class diff --git a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php index 289d8d44fe..fc94652e7f 100644 --- a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunctionContainer class diff --git a/test/classes/Navigation/Nodes/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php index 2927b5915a..b73297858e 100644 --- a/test/classes/Navigation/Nodes/NodeFunctionTest.php +++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunction class diff --git a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php index f828cf1cc5..b266adac14 100644 --- a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndexContainer class diff --git a/test/classes/Navigation/Nodes/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php index b1a604e002..3ab393967a 100644 --- a/test/classes/Navigation/Nodes/NodeIndexTest.php +++ b/test/classes/Navigation/Nodes/NodeIndexTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndex class diff --git a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php index 3d5209cc9e..4c5c34906a 100644 --- a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedureContainer class diff --git a/test/classes/Navigation/Nodes/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php index 0d1ee3992c..b627847f4f 100644 --- a/test/classes/Navigation/Nodes/NodeProcedureTest.php +++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedure class diff --git a/test/classes/Navigation/Nodes/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php index 874aeb6cee..f010e7c2b4 100644 --- a/test/classes/Navigation/Nodes/NodeTableContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeTableContainer class diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php index 40b454143f..db2d349509 100644 --- a/test/classes/Navigation/Nodes/NodeTableTest.php +++ b/test/classes/Navigation/Nodes/NodeTableTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeTable class diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php index 3893b43854..edc3d0120a 100644 --- a/test/classes/Navigation/Nodes/NodeTest.php +++ b/test/classes/Navigation/Nodes/NodeTest.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Navigation\Nodes\Node; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; use ReflectionMethod; /** diff --git a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php index c11bf4204e..87192ea4f2 100644 --- a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class diff --git a/test/classes/Navigation/Nodes/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php index 3c4ac4f0f2..dee770a798 100644 --- a/test/classes/Navigation/Nodes/NodeTriggerTest.php +++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class diff --git a/test/classes/Navigation/Nodes/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php index cda2d1fa00..81add6d43e 100644 --- a/test/classes/Navigation/Nodes/NodeViewContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeViewContainer class diff --git a/test/classes/Navigation/Nodes/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php index cf42bf7190..fd426e5f29 100644 --- a/test/classes/Navigation/Nodes/NodeViewTest.php +++ b/test/classes/Navigation/Nodes/NodeViewTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests\Navigation\Nodes; use PhpMyAdmin\Navigation\NodeFactory; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Navigation\Nodes\NodeView class diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php index 948c595aaf..5c9edbe203 100644 --- a/test/classes/OperationsTest.php +++ b/test/classes/OperationsTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Operations; use PhpMyAdmin\Relation; -use PhpMyAdmin\Theme; use PHPUnit\Framework\TestCase; use ReflectionMethod; diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php index 7b39186284..789b0b247d 100644 --- a/test/classes/Plugins/Import/ImportCsvTest.php +++ b/test/classes/Plugins/Import/ImportCsvTest.php @@ -11,7 +11,6 @@ namespace PhpMyAdmin\Tests\Plugins\Import; use PhpMyAdmin\File; use PhpMyAdmin\Plugins\Import\ImportCsv; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\Theme; /** * Tests for PhpMyAdmin\Plugins\Import\ImportCsv class diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index c68618a2b3..b6eff5c5a7 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\Relation; -use PhpMyAdmin\Theme; use PHPUnit\Framework\TestCase; /** diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php index 689b49d49a..483b012162 100644 --- a/test/classes/ReplicationGuiTest.php +++ b/test/classes/ReplicationGuiTest.php @@ -11,9 +11,7 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Replication; use PhpMyAdmin\ReplicationGui; -use PhpMyAdmin\SqlParser\Statements\ReplaceStatement; use PhpMyAdmin\Template; -use PhpMyAdmin\Theme; use PHPUnit\Framework\TestCase; /* diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php index 7fdbc05179..ac6e737cc6 100644 --- a/test/classes/ScriptsTest.php +++ b/test/classes/ScriptsTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Scripts; use PhpMyAdmin\Tests\PmaTestCase; -use ReflectionClass; use ReflectionProperty; /** diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php index 2f0fff106f..c27858c0c9 100644 --- a/test/classes/Server/SelectTest.php +++ b/test/classes/Server/SelectTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\Select; -use PhpMyAdmin\Theme; use PhpMyAdmin\Util; use PHPUnit\Framework\TestCase; diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php index 311c8d3ef1..8c240a4899 100644 --- a/test/classes/Server/UserGroupsTest.php +++ b/test/classes/Server/UserGroupsTest.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Server; use PhpMyAdmin\Server\UserGroups; -use PhpMyAdmin\Theme; use PhpMyAdmin\Url; use PHPUnit\Framework\TestCase; diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 0f1046f398..f0672770a9 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -9,11 +9,11 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; -use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Index; use PhpMyAdmin\Relation; use PhpMyAdmin\Table; use PhpMyAdmin\Tests\PmaTestCase; +use PhpMyAdmin\Tests\Stubs\DbiDummy; use ReflectionClass; use stdClass; diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 8b97618934..ae91670185 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\Theme; use PhpMyAdmin\Transformations; use PHPUnit\Framework\TestCase; diff --git a/test/classes/UserPreferencesHeaderTest.php b/test/classes/UserPreferencesHeaderTest.php index a054cf8545..9c3c22f3e7 100644 --- a/test/classes/UserPreferencesHeaderTest.php +++ b/test/classes/UserPreferencesHeaderTest.php @@ -8,12 +8,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests; -use PhpMyAdmin\Config\ConfigFile; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Relation; use PhpMyAdmin\Template; use PhpMyAdmin\Tests\PmaTestCase; -use PhpMyAdmin\UserPreferences; use PhpMyAdmin\UserPreferencesHeader; use Throwable; use Twig_Error_Loader; diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index 6535f2e3a1..119004c32f 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\Config; use PhpMyAdmin\Core; -use PhpMyAdmin\Html\Forms; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\MoTranslator\Loader; use PhpMyAdmin\SqlParser\Context; @@ -7,9 +7,9 @@ declare(strict_types=1); use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Response; use PhpMyAdmin\Sanitize; -use PhpMyAdmin\DatabaseInterface; if (! defined('ROOT_PATH')) { define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR); |