Fix coding standard issues related to namespaces

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-05-15 22:26:38 -03:00
parent 962c98220c
commit 367806a660
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
2 changed files with 102 additions and 51 deletions

View File

@ -2,60 +2,110 @@
declare(strict_types=1);
use PhpMyAdmin\Advisory\Advisor;
use PhpMyAdmin\BrowseForeigners;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\CreateAddField;
use PhpMyAdmin\Database\CentralColumns;
use PhpMyAdmin\Database\Designer;
use PhpMyAdmin\Database\Designer\Common;
use PhpMyAdmin\Database\Events;
use PhpMyAdmin\Database\Routines;
use PhpMyAdmin\Database\Triggers;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\ErrorHandler;
use PhpMyAdmin\ErrorReport;
use PhpMyAdmin\Export;
use PhpMyAdmin\Export\Options;
use PhpMyAdmin\Export\TemplateModel;
use PhpMyAdmin\FileListing;
use PhpMyAdmin\FlashMessages;
use PhpMyAdmin\Import;
use PhpMyAdmin\Import\SimulateDml;
use PhpMyAdmin\InsertEdit;
use PhpMyAdmin\Navigation\Navigation;
use PhpMyAdmin\Normalization;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Partitioning\Maintenance;
use PhpMyAdmin\Plugins\AuthenticationPluginFactory;
use PhpMyAdmin\Replication\Replication;
use PhpMyAdmin\Replication\ReplicationGui;
use PhpMyAdmin\ResponseRenderer;
use PhpMyAdmin\Server\Plugins;
use PhpMyAdmin\Server\Privileges;
use PhpMyAdmin\Server\Privileges\AccountLocking;
use PhpMyAdmin\Server\Status\Data;
use PhpMyAdmin\Server\Status\Monitor;
use PhpMyAdmin\Server\Status\Processes;
use PhpMyAdmin\Sql;
use PhpMyAdmin\SqlQueryForm;
use PhpMyAdmin\Table\ColumnsDefinition;
use PhpMyAdmin\Table\Indexes;
use PhpMyAdmin\Table\Search;
use PhpMyAdmin\Template;
use PhpMyAdmin\Theme\ThemeManager;
use PhpMyAdmin\Tracking\Tracking;
use PhpMyAdmin\Tracking\TrackingChecker;
use PhpMyAdmin\Transformations;
use PhpMyAdmin\UserPassword;
use PhpMyAdmin\UserPreferences;
use PhpMyAdmin\Utils\HttpRequest;
use PhpMyAdmin\VersionInformation;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
return [
'services' => [
'advisor' => [
'class' => PhpMyAdmin\Advisory\Advisor::class,
'class' => Advisor::class,
'arguments' => ['$dbi' => '@dbi', '$expression' => '@expression_language'],
],
'browse_foreigners' => [
'class' => PhpMyAdmin\BrowseForeigners::class,
'class' => BrowseForeigners::class,
'arguments' => ['@template', '@config'],
],
'config' => ['class' => PhpMyAdmin\Config::class],
'central_columns' => ['class' => PhpMyAdmin\Database\CentralColumns::class, 'arguments' => ['@dbi']],
'check_user_privileges' => ['class' => PhpMyAdmin\CheckUserPrivileges::class, 'arguments' => ['@dbi']],
'create_add_field' => ['class' => PhpMyAdmin\CreateAddField::class, 'arguments' => ['@dbi']],
'config' => ['class' => Config::class],
'central_columns' => ['class' => CentralColumns::class, 'arguments' => ['@dbi']],
'check_user_privileges' => ['class' => CheckUserPrivileges::class, 'arguments' => ['@dbi']],
'create_add_field' => ['class' => CreateAddField::class, 'arguments' => ['@dbi']],
'designer' => [
'class' => PhpMyAdmin\Database\Designer::class,
'class' => Designer::class,
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation', '$template' => '@template'],
],
'designer_common' => [
'class' => PhpMyAdmin\Database\Designer\Common::class,
'class' => Common::class,
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
],
'error_handler' => ['class' => PhpMyAdmin\ErrorHandler::class],
'error_handler' => ['class' => ErrorHandler::class],
'error_report' => [
'class' => PhpMyAdmin\ErrorReport::class,
'class' => ErrorReport::class,
'arguments' => ['@http_request', '@relation', '@template', '@config'],
],
'events' => ['class' => PhpMyAdmin\Database\Events::class, 'arguments' => ['@dbi','@template','@response']],
'export' => ['class' => PhpMyAdmin\Export::class, 'arguments' => ['@dbi']],
'events' => ['class' => Events::class, 'arguments' => ['@dbi','@template','@response']],
'export' => ['class' => Export::class, 'arguments' => ['@dbi']],
'export_options' => [
'class' => PhpMyAdmin\Export\Options::class,
'class' => Options::class,
'arguments' => ['@relation', '@export_template_model'],
],
'export_template_model' => ['class' => PhpMyAdmin\Export\TemplateModel::class, 'arguments' => ['@dbi']],
'expression_language' => ['class' => Symfony\Component\ExpressionLanguage\ExpressionLanguage::class],
'file_listing' => ['class' => PhpMyAdmin\FileListing::class],
'flash' => ['class' => PhpMyAdmin\FlashMessages::class],
'http_request' => ['class' => PhpMyAdmin\Utils\HttpRequest::class],
'import' => ['class' => PhpMyAdmin\Import::class],
'import_simulate_dml' => ['class' => PhpMyAdmin\Import\SimulateDml::class, 'arguments' => ['@dbi']],
'export_template_model' => ['class' => TemplateModel::class, 'arguments' => ['@dbi']],
'expression_language' => ['class' => ExpressionLanguage::class],
'file_listing' => ['class' => FileListing::class],
'flash' => ['class' => FlashMessages::class],
'http_request' => ['class' => HttpRequest::class],
'import' => ['class' => Import::class],
'import_simulate_dml' => ['class' => SimulateDml::class, 'arguments' => ['@dbi']],
'insert_edit' => [
'class' => PhpMyAdmin\InsertEdit::class,
'class' => InsertEdit::class,
'arguments' => ['@dbi', '@relation', '@transformations', '@file_listing', '@template'],
],
'navigation' => [
'class' => PhpMyAdmin\Navigation\Navigation::class,
'class' => Navigation::class,
'arguments' => ['@template', '@relation', '@dbi'],
],
'normalization' => [
'class' => PhpMyAdmin\Normalization::class,
'class' => Normalization::class,
'arguments' => [
'$dbi' => '@dbi',
'$relation' => '@relation',
@ -64,63 +114,63 @@ return [
],
],
'operations' => [
'class' => PhpMyAdmin\Operations::class,
'class' => Operations::class,
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
],
'partitioning_maintenance' => [
'class' => PhpMyAdmin\Partitioning\Maintenance::class,
'class' => Maintenance::class,
'arguments' => ['$dbi' => '@dbi'],
],
AuthenticationPluginFactory::class => ['class' => AuthenticationPluginFactory::class],
'relation' => ['class' => Relation::class, 'arguments' => ['$dbi' => '@dbi']],
'relation_cleanup' => ['class' => RelationCleanup::class, 'arguments' => ['@dbi', '@relation']],
'replication' => ['class' => PhpMyAdmin\Replication\Replication::class, 'arguments' => ['$dbi' => '@dbi']],
'replication' => ['class' => Replication::class, 'arguments' => ['$dbi' => '@dbi']],
'replication_gui' => [
'class' => PhpMyAdmin\Replication\ReplicationGui::class,
'class' => ReplicationGui::class,
'arguments' => ['$replication' => '@replication', '$template' => '@template'],
],
'response' => [
'class' => PhpMyAdmin\ResponseRenderer::class,
'class' => ResponseRenderer::class,
'factory' => [PhpMyAdmin\ResponseRenderer::class, 'getInstance'],
],
'routines' => [
'class' => PhpMyAdmin\Database\Routines::class,
'class' => Routines::class,
'arguments' => ['@dbi', '@template', '@response'],
],
'server_plugins' => ['class' => PhpMyAdmin\Server\Plugins::class, 'arguments' => ['@dbi']],
'server_plugins' => ['class' => Plugins::class, 'arguments' => ['@dbi']],
'server_privileges' => [
'class' => PhpMyAdmin\Server\Privileges::class,
'class' => Privileges::class,
'arguments' => ['@template', '@dbi', '@relation', '@relation_cleanup', '@server_plugins'],
],
'server_privileges_account_locking' => [
'class' => PhpMyAdmin\Server\Privileges\AccountLocking::class,
'class' => AccountLocking::class,
'arguments' => ['@dbi'],
],
'sql' => [
'class' => PhpMyAdmin\Sql::class,
'class' => Sql::class,
'arguments' => ['@dbi', '@relation', '@relation_cleanup', '@operations', '@transformations', '@template'],
],
'sql_query_form' => [
'class' => PhpMyAdmin\SqlQueryForm::class,
'class' => SqlQueryForm::class,
'arguments' => ['$template' => '@template', '$dbi' => '@dbi'],
],
'status_data' => ['class' => PhpMyAdmin\Server\Status\Data::class, 'arguments' => ['@dbi','@config']],
'status_monitor' => ['class' => PhpMyAdmin\Server\Status\Monitor::class, 'arguments' => ['@dbi']],
'status_processes' => ['class' => PhpMyAdmin\Server\Status\Processes::class, 'arguments' => ['@dbi']],
'status_data' => ['class' => Data::class, 'arguments' => ['@dbi','@config']],
'status_monitor' => ['class' => Monitor::class, 'arguments' => ['@dbi']],
'status_processes' => ['class' => Processes::class, 'arguments' => ['@dbi']],
'table_columns_definition' => [
'class' => PhpMyAdmin\Table\ColumnsDefinition::class,
'class' => ColumnsDefinition::class,
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation', '$transformations' => '@transformations'],
],
'table_indexes' => [
'class' => PhpMyAdmin\Table\Indexes::class,
'class' => Indexes::class,
'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
],
'table_maintenance' => ['class' => PhpMyAdmin\Table\Maintenance::class, 'arguments' => ['$dbi' => '@dbi']],
'table_search' => ['class' => PhpMyAdmin\Table\Search::class, 'arguments' => ['$dbi' => '@dbi']],
'template' => ['class' => PhpMyAdmin\Template::class, 'arguments' => ['$config' => '@config']],
PhpMyAdmin\Theme\ThemeManager::class => ['class' => PhpMyAdmin\Theme\ThemeManager::class],
'table_search' => ['class' => Search::class, 'arguments' => ['$dbi' => '@dbi']],
'template' => ['class' => Template::class, 'arguments' => ['$config' => '@config']],
ThemeManager::class => ['class' => PhpMyAdmin\Theme\ThemeManager::class],
'tracking' => [
'class' => PhpMyAdmin\Tracking\Tracking::class,
'class' => Tracking::class,
'arguments' => [
'$sqlQueryForm' => '@sql_query_form',
'$template' => '@template',
@ -130,21 +180,21 @@ return [
],
],
'tracking_checker' => [
'class' => PhpMyAdmin\Tracking\TrackingChecker::class,
'class' => TrackingChecker::class,
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
],
'transformations' => ['class' => PhpMyAdmin\Transformations::class],
'transformations' => ['class' => Transformations::class],
'triggers' => [
'class' => PhpMyAdmin\Database\Triggers::class,
'class' => Triggers::class,
'arguments' => ['@dbi', '@template', '@response'],
],
'user_password' => [
'class' => PhpMyAdmin\UserPassword::class,
'class' => UserPassword::class,
'arguments' => ['@server_privileges', '@' . AuthenticationPluginFactory::class, '@dbi'],
],
'user_preferences' => ['class' => PhpMyAdmin\UserPreferences::class, 'arguments' => ['@dbi']],
'version_information' => ['class' => PhpMyAdmin\VersionInformation::class],
PhpMyAdmin\DatabaseInterface::class => 'dbi',
'user_preferences' => ['class' => UserPreferences::class, 'arguments' => ['@dbi']],
'version_information' => ['class' => VersionInformation::class],
DatabaseInterface::class => 'dbi',
PhpMyAdmin\FlashMessages::class => 'flash',
PhpMyAdmin\ResponseRenderer::class => 'response',
],

View File

@ -38,6 +38,7 @@ use PhpMyAdmin\Controllers\UserPasswordController;
use PhpMyAdmin\Controllers\VersionCheckController;
use PhpMyAdmin\Controllers\View;
use PhpMyAdmin\Plugins\AuthenticationPluginFactory;
use PhpMyAdmin\Theme\ThemeManager;
return [
'services' => [
@ -446,7 +447,7 @@ return [
'$response' => '@response',
'$template' => '@template',
'$config' => '@config',
'$themeManager' => '@' . PhpMyAdmin\Theme\ThemeManager::class,
'$themeManager' => '@' . ThemeManager::class,
'$dbi' => '@dbi',
],
],