From b4e3ba8409bb2c98514d1b381401d757df9b7055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 7 Jan 2026 12:41:01 -0300 Subject: [PATCH] Remove '@' char from service arguments in services file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As only other services are used as arguments, there's no need for it. Signed-off-by: Maurício Meneghini Fauth --- app/services.php | 252 ++-- app/services_controllers.php | 1190 ++++++++--------- app/services_loader.php | 26 +- phpstan-baseline.neon | 20 +- psalm-baseline.xml | 4 +- tests/unit/Container/ContainerBuilderTest.php | 9 +- 6 files changed, 744 insertions(+), 757 deletions(-) diff --git a/app/services.php b/app/services.php index e74f7658fe..d7091419ba 100644 --- a/app/services.php +++ b/app/services.php @@ -70,74 +70,74 @@ return [ 'services' => [ Advisor::class => [ 'class' => Advisor::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . ExpressionLanguage::class], + 'arguments' => [DatabaseInterface::class, ExpressionLanguage::class], ], - Application::class => ['class' => Application::class, 'arguments' => ['@' . ResponseFactory::class]], + Application::class => ['class' => Application::class, 'arguments' => [ResponseFactory::class]], BrowseForeigners::class => [ 'class' => BrowseForeigners::class, - 'arguments' => ['@' . Template::class, '@' . Config::class, '@' . ThemeManager::class], + 'arguments' => [Template::class, Config::class, ThemeManager::class], ], Config::class => ['class' => Config::class, 'factory' => [Config::class, 'getInstance']], Config\PageSettings::class => [ 'class' => Config\PageSettings::class, - 'arguments' => ['@' . UserPreferences::class], + 'arguments' => [UserPreferences::class], ], - CentralColumns::class => ['class' => CentralColumns::class, 'arguments' => ['@' . DatabaseInterface::class]], - CreateAddField::class => ['class' => CreateAddField::class, 'arguments' => ['@' . DatabaseInterface::class]], + CentralColumns::class => ['class' => CentralColumns::class, 'arguments' => [DatabaseInterface::class]], + CreateAddField::class => ['class' => CreateAddField::class, 'arguments' => [DatabaseInterface::class]], DatabaseInterface::class => [ 'class' => DatabaseInterface::class, 'factory' => [DatabaseInterface::class, 'getInstance'], - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], - DbTableExists::class => ['class' => DbTableExists::class, 'arguments' => ['@' . DatabaseInterface::class]], + DbTableExists::class => ['class' => DbTableExists::class, 'arguments' => [DatabaseInterface::class]], Designer::class => [ 'class' => Designer::class, 'arguments' => [ - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . Template::class, - '@' . Config::class, + DatabaseInterface::class, + Relation::class, + Template::class, + Config::class, ], ], Common::class => [ 'class' => Common::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class, '@' . Config::class], + 'arguments' => [DatabaseInterface::class, Relation::class, Config::class], ], ErrorHandler::class => ['class' => ErrorHandler::class, 'factory' => [ErrorHandler::class, 'getInstance']], ErrorReport::class => [ 'class' => ErrorReport::class, 'arguments' => [ - '@' . HttpRequest::class, - '@' . Relation::class, - '@' . Template::class, - '@' . Config::class, + HttpRequest::class, + Relation::class, + Template::class, + Config::class, ], ], Events::class => [ 'class' => Events::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [DatabaseInterface::class, Config::class], ], Export::class => [ 'class' => Export::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . OutputHandler::class], + 'arguments' => [DatabaseInterface::class, OutputHandler::class], ], Options::class => [ 'class' => Options::class, - 'arguments' => ['@' . Relation::class, '@' . TemplateModel::class], + 'arguments' => [Relation::class, TemplateModel::class], ], - TemplateModel::class => ['class' => TemplateModel::class, 'arguments' => ['@' . DatabaseInterface::class]], + TemplateModel::class => ['class' => TemplateModel::class, 'arguments' => [DatabaseInterface::class]], ExpressionLanguage::class => ['class' => ExpressionLanguage::class], FileListing::class => ['class' => FileListing::class], FlashMessenger::class => ['class' => FlashMessenger::class], Header::class => [ 'class' => Header::class, 'arguments' => [ - '@' . Template::class, - '@' . Console::class, - '@' . Config::class, - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . UserPreferences::class, + Template::class, + Console::class, + Config::class, + DatabaseInterface::class, + Relation::class, + UserPreferences::class, ], ], HttpRequest::class => ['class' => HttpRequest::class], @@ -146,54 +146,54 @@ return [ 'factory' => [ResponseFactory::class, 'create'], ], Import::class => ['class' => Import::class], - SimulateDml::class => ['class' => SimulateDml::class, 'arguments' => ['@' . DatabaseInterface::class]], + SimulateDml::class => ['class' => SimulateDml::class, 'arguments' => [DatabaseInterface::class]], InsertEdit::class => [ 'class' => InsertEdit::class, 'arguments' => [ - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . Transformations::class, - '@' . FileListing::class, - '@' . Template::class, - '@' . Config::class, + DatabaseInterface::class, + Relation::class, + Transformations::class, + FileListing::class, + Template::class, + Config::class, ], ], Middleware\ErrorHandling::class => [ 'class' => Middleware\ErrorHandling::class, - 'arguments' => ['@' . ErrorHandler::class], + 'arguments' => [ErrorHandler::class], ], Middleware\OutputBuffering::class => ['class' => Middleware\OutputBuffering::class], Middleware\PhpExtensionsChecking::class => [ 'class' => Middleware\PhpExtensionsChecking::class, - 'arguments' => ['@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Template::class, ResponseFactory::class], ], Middleware\ServerConfigurationChecking::class => [ 'class' => Middleware\ServerConfigurationChecking::class, - 'arguments' => ['@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Template::class, ResponseFactory::class], ], Middleware\PhpSettingsConfiguration::class => ['class' => Middleware\PhpSettingsConfiguration::class], Middleware\RouteParsing::class => ['class' => Middleware\RouteParsing::class], Middleware\ConfigLoading::class => [ 'class' => Middleware\ConfigLoading::class, - 'arguments' => ['@' . Config::class, '@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Config::class, Template::class, ResponseFactory::class], ], Middleware\UriSchemeUpdating::class => [ 'class' => Middleware\UriSchemeUpdating::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\SessionHandling::class => [ 'class' => Middleware\SessionHandling::class, 'arguments' => [ - '@' . Config::class, - '@' . ErrorHandler::class, - '@' . Template::class, - '@' . ResponseFactory::class, + Config::class, + ErrorHandler::class, + Template::class, + ResponseFactory::class, ], ], Middleware\EncryptedQueryParamsHandling::class => ['class' => Middleware\EncryptedQueryParamsHandling::class], Middleware\UrlParamsSetting::class => [ 'class' => Middleware\UrlParamsSetting::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\TokenRequestParamChecking::class => ['class' => Middleware\TokenRequestParamChecking::class], Middleware\DatabaseAndTableSetting::class => ['class' => Middleware\DatabaseAndTableSetting::class], @@ -201,114 +201,114 @@ return [ Middleware\LanguageLoading::class => ['class' => Middleware\LanguageLoading::class], Middleware\ConfigErrorAndPermissionChecking::class => [ 'class' => Middleware\ConfigErrorAndPermissionChecking::class, - 'arguments' => ['@' . Config::class, '@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Config::class, Template::class, ResponseFactory::class], ], Middleware\RequestProblemChecking::class => [ 'class' => Middleware\RequestProblemChecking::class, - 'arguments' => ['@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Template::class, ResponseFactory::class], ], Middleware\CurrentServerGlobalSetting::class => [ 'class' => Middleware\CurrentServerGlobalSetting::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\ThemeInitialization::class => ['class' => Middleware\ThemeInitialization::class], Middleware\UrlRedirection::class => [ 'class' => Middleware\UrlRedirection::class, - 'arguments' => ['@' . Config::class, '@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Config::class, Template::class, ResponseFactory::class], ], Middleware\SetupPageRedirection::class => [ 'class' => Middleware\SetupPageRedirection::class, - 'arguments' => ['@' . Config::class, '@' . ResponseFactory::class], + 'arguments' => [Config::class, ResponseFactory::class], ], Middleware\MinimumCommonRedirection::class => [ 'class' => Middleware\MinimumCommonRedirection::class, - 'arguments' => ['@' . Config::class, '@' . ResponseFactory::class], + 'arguments' => [Config::class, ResponseFactory::class], ], Middleware\LanguageAndThemeCookieSaving::class => [ 'class' => Middleware\LanguageAndThemeCookieSaving::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\LoginCookieValiditySetting::class => [ 'class' => Middleware\LoginCookieValiditySetting::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\Authentication::class => [ 'class' => Middleware\Authentication::class, 'arguments' => [ - '@' . Config::class, - '@' . Template::class, - '@' . ResponseFactory::class, - '@' . AuthenticationPluginFactory::class, - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . ResponseRenderer::class, + Config::class, + Template::class, + ResponseFactory::class, + AuthenticationPluginFactory::class, + DatabaseInterface::class, + Relation::class, + ResponseRenderer::class, ], ], Middleware\DatabaseServerVersionChecking::class => [ 'class' => Middleware\DatabaseServerVersionChecking::class, - 'arguments' => ['@' . Config::class, '@' . Template::class, '@' . ResponseFactory::class], + 'arguments' => [Config::class, Template::class, ResponseFactory::class], ], Middleware\SqlDelimiterSetting::class => [ 'class' => Middleware\SqlDelimiterSetting::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\ResponseRendererLoading::class => [ 'class' => Middleware\ResponseRendererLoading::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\ProfilingChecking::class => ['class' => Middleware\ProfilingChecking::class], Middleware\UserPreferencesLoading::class => [ 'class' => Middleware\UserPreferencesLoading::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\RecentTableHandling::class => [ 'class' => Middleware\RecentTableHandling::class, - 'arguments' => ['@' . Config::class], + 'arguments' => [Config::class], ], Middleware\StatementHistory::class => [ 'class' => Middleware\StatementHistory::class, - 'arguments' => ['@' . Config::class, '@' . History::class], + 'arguments' => [Config::class, History::class], ], Navigation::class => [ 'class' => Navigation::class, 'arguments' => [ - '@' . Template::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . Config::class, + Template::class, + Relation::class, + DatabaseInterface::class, + Config::class, ], ], Normalization::class => [ 'class' => Normalization::class, 'arguments' => [ - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . Transformations::class, - '@' . Template::class, + DatabaseInterface::class, + Relation::class, + Transformations::class, + Template::class, ], ], Operations::class => [ 'class' => Operations::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class, '@' . TableMover::class], + 'arguments' => [DatabaseInterface::class, Relation::class, TableMover::class], ], OutputHandler::class => ['class' => OutputHandler::class], Maintenance::class => [ 'class' => Maintenance::class, - 'arguments' => ['@' . DatabaseInterface::class], + 'arguments' => [DatabaseInterface::class], ], AuthenticationPluginFactory::class => ['class' => AuthenticationPluginFactory::class], Relation::class => [ 'class' => Relation::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [DatabaseInterface::class, Config::class], ], RelationCleanup::class => [ 'class' => RelationCleanup::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class], + 'arguments' => [DatabaseInterface::class, Relation::class], ], - Replication::class => ['class' => Replication::class, 'arguments' => ['@' . DatabaseInterface::class]], + Replication::class => ['class' => Replication::class, 'arguments' => [DatabaseInterface::class]], ReplicationGui::class => [ 'class' => ReplicationGui::class, - 'arguments' => ['@' . Replication::class, '@' . Template::class], + 'arguments' => [Replication::class, Template::class], ], ResponseRenderer::class => [ 'class' => ResponseRenderer::class, @@ -316,118 +316,118 @@ return [ ], Routines::class => [ 'class' => Routines::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [DatabaseInterface::class, Config::class], ], - Plugins::class => ['class' => Plugins::class, 'arguments' => ['@' . DatabaseInterface::class]], + Plugins::class => ['class' => Plugins::class, 'arguments' => [DatabaseInterface::class]], Privileges::class => [ 'class' => Privileges::class, 'arguments' => [ - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . RelationCleanup::class, - '@' . Plugins::class, - '@' . Config::class, + Template::class, + DatabaseInterface::class, + Relation::class, + RelationCleanup::class, + Plugins::class, + Config::class, ], ], AccountLocking::class => [ 'class' => AccountLocking::class, - 'arguments' => ['@' . DatabaseInterface::class], + 'arguments' => [DatabaseInterface::class], ], Sql::class => [ 'class' => Sql::class, 'arguments' => [ - '@' . DatabaseInterface::class, - '@' . Relation::class, - '@' . RelationCleanup::class, - '@' . Transformations::class, - '@' . Template::class, - '@' . BookmarkRepository::class, - '@' . Config::class, + DatabaseInterface::class, + Relation::class, + RelationCleanup::class, + Transformations::class, + Template::class, + BookmarkRepository::class, + Config::class, ], ], SqlQueryForm::class => [ 'class' => SqlQueryForm::class, 'arguments' => [ - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . BookmarkRepository::class, + Template::class, + DatabaseInterface::class, + BookmarkRepository::class, ], ], - Data::class => ['class' => Data::class, 'arguments' => ['@' . DatabaseInterface::class, '@' . Config::class]], - Monitor::class => ['class' => Monitor::class, 'arguments' => ['@' . DatabaseInterface::class]], - Processes::class => ['class' => Processes::class, 'arguments' => ['@' . DatabaseInterface::class]], + Data::class => ['class' => Data::class, 'arguments' => [DatabaseInterface::class, Config::class]], + Monitor::class => ['class' => Monitor::class, 'arguments' => [DatabaseInterface::class]], + Processes::class => ['class' => Processes::class, 'arguments' => [DatabaseInterface::class]], ColumnsDefinition::class => [ 'class' => ColumnsDefinition::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class, '@' . Transformations::class], + 'arguments' => [DatabaseInterface::class, Relation::class, Transformations::class], ], Indexes::class => [ 'class' => Indexes::class, - 'arguments' => ['@' . DatabaseInterface::class], + 'arguments' => [DatabaseInterface::class], ], \PhpMyAdmin\Table\Maintenance::class => [ 'class' => \PhpMyAdmin\Table\Maintenance::class, - 'arguments' => ['@' . DatabaseInterface::class], + 'arguments' => [DatabaseInterface::class], ], - Search::class => ['class' => Search::class, 'arguments' => ['@' . DatabaseInterface::class]], - Template::class => ['class' => Template::class, 'arguments' => ['@' . Config::class]], + Search::class => ['class' => Search::class, 'arguments' => [DatabaseInterface::class]], + Template::class => ['class' => Template::class, 'arguments' => [Config::class]], ThemeManager::class => ['class' => ThemeManager::class], Tracking::class => [ 'class' => Tracking::class, 'arguments' => [ - '@' . SqlQueryForm::class, - '@' . Template::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . TrackingChecker::class, + SqlQueryForm::class, + Template::class, + Relation::class, + DatabaseInterface::class, + TrackingChecker::class, ], ], TrackingChecker::class => [ 'class' => TrackingChecker::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class], + 'arguments' => [DatabaseInterface::class, Relation::class], ], Transformations::class => [ 'class' => Transformations::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class], + 'arguments' => [DatabaseInterface::class, Relation::class], ], - Triggers::class => ['class' => Triggers::class, 'arguments' => ['@' . DatabaseInterface::class]], + Triggers::class => ['class' => Triggers::class, 'arguments' => [DatabaseInterface::class]], UserPassword::class => [ 'class' => UserPassword::class, 'arguments' => [ - '@' . Privileges::class, - '@' . AuthenticationPluginFactory::class, - '@' . DatabaseInterface::class, + Privileges::class, + AuthenticationPluginFactory::class, + DatabaseInterface::class, ], ], UserPreferences::class => [ 'class' => UserPreferences::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class, '@' . Template::class], + 'arguments' => [DatabaseInterface::class, Relation::class, Template::class], ], UserPrivilegesFactory::class => [ 'class' => UserPrivilegesFactory::class, - 'arguments' => ['@' . DatabaseInterface::class], + 'arguments' => [DatabaseInterface::class], ], VersionInformation::class => ['class' => VersionInformation::class], BookmarkRepository::class => [ 'class' => BookmarkRepository::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class], + 'arguments' => [DatabaseInterface::class, Relation::class], ], Console::class => [ 'class' => Console::class, 'arguments' => [ - '@' . Relation::class, - '@' . Template::class, - '@' . BookmarkRepository::class, - '@' . History::class, + Relation::class, + Template::class, + BookmarkRepository::class, + History::class, ], ], TableMover::class => [ 'class' => TableMover::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class], + 'arguments' => [DatabaseInterface::class, Relation::class], ], History::class => [ 'class' => History::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Relation::class, '@' . Config::class], + 'arguments' => [DatabaseInterface::class, Relation::class, Config::class], ], ], ]; diff --git a/app/services_controllers.php b/app/services_controllers.php index d8b1544bb4..fe652dd5f8 100644 --- a/app/services_controllers.php +++ b/app/services_controllers.php @@ -95,1418 +95,1418 @@ return [ BrowseForeignersController::class => [ 'class' => BrowseForeignersController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . BrowseForeigners::class, - '@' . Relation::class, + ResponseRenderer::class, + BrowseForeigners::class, + Relation::class, ], ], ChangeLogController::class => [ 'class' => ChangeLogController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Config::class, - '@' . ResponseFactory::class, - '@' . Template::class, + ResponseRenderer::class, + Config::class, + ResponseFactory::class, + Template::class, ], ], CheckRelationsController::class => [ 'class' => CheckRelationsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Relation::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Relation::class, Config::class], ], CollationConnectionController::class => [ 'class' => CollationConnectionController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Config::class], ], ColumnController::class => [ 'class' => ColumnController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], UpdateNavWidthConfigController::class => [ 'class' => UpdateNavWidthConfigController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Config::class], ], Console\Bookmark\AddController::class => [ 'class' => Console\Bookmark\AddController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . BookmarkRepository::class, - '@' . Config::class, + ResponseRenderer::class, + BookmarkRepository::class, + Config::class, ], ], Console\Bookmark\RefreshController::class => [ 'class' => Console\Bookmark\RefreshController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Console\Console::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Console\Console::class], ], Console\UpdateConfigController::class => [ 'class' => Console\UpdateConfigController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Config::class], ], Database\CentralColumns\PopulateColumnsController::class => [ 'class' => Database\CentralColumns\PopulateColumnsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . CentralColumns::class], + 'arguments' => [ResponseRenderer::class, CentralColumns::class], ], Database\CentralColumnsController::class => [ 'class' => Database\CentralColumnsController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . CentralColumns::class, - '@' . Config::class, + ResponseRenderer::class, + CentralColumns::class, + Config::class, ], ], Database\DataDictionaryController::class => [ 'class' => Database\DataDictionaryController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Relation::class, - '@' . Transformations::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Relation::class, + Transformations::class, + DatabaseInterface::class, ], ], Database\DesignerController::class => [ 'class' => Database\DesignerController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Designer::class, - '@' . Common::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + Template::class, + Designer::class, + Common::class, + DbTableExists::class, ], ], Database\EventsController::class => [ 'class' => Database\EventsController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Events::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + Template::class, + Events::class, + DatabaseInterface::class, + DbTableExists::class, ], ], Database\ExportController::class => [ 'class' => Database\ExportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Export\Export::class, - '@' . Options::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + \PhpMyAdmin\Export\Export::class, + Options::class, + PageSettings::class, + DbTableExists::class, ], ], Database\ImportController::class => [ 'class' => Database\ImportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + DatabaseInterface::class, + PageSettings::class, + DbTableExists::class, + Config::class, ], ], Database\MultiTableQuery\QueryController::class => [ 'class' => Database\MultiTableQuery\QueryController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Sql::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Sql::class], ], Database\MultiTableQuery\TablesController::class => [ 'class' => Database\MultiTableQuery\TablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], Database\MultiTableQueryController::class => [ 'class' => Database\MultiTableQueryController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, Template::class, DatabaseInterface::class], ], Operations\Database\CollationController::class => [ 'class' => Operations\Database\CollationController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Operations::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + \PhpMyAdmin\Operations::class, + DatabaseInterface::class, + DbTableExists::class, ], ], Operations\DatabaseController::class => [ 'class' => Operations\DatabaseController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Operations::class, - '@' . UserPrivilegesFactory::class, - '@' . Relation::class, - '@' . RelationCleanup::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Operations::class, + UserPrivilegesFactory::class, + Relation::class, + RelationCleanup::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], Database\PrivilegesController::class => [ 'class' => Database\PrivilegesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Privileges::class, - '@' . DatabaseInterface::class, - '@' . Config::class, + ResponseRenderer::class, + Privileges::class, + DatabaseInterface::class, + Config::class, ], ], Database\RoutinesController::class => [ 'class' => Database\RoutinesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . UserPrivilegesFactory::class, - '@' . DatabaseInterface::class, - '@' . Routines::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + UserPrivilegesFactory::class, + DatabaseInterface::class, + Routines::class, + DbTableExists::class, + Config::class, ], ], Database\SearchController::class => [ 'class' => Database\SearchController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], Database\SqlAutoCompleteController::class => [ 'class' => Database\SqlAutoCompleteController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class, Config::class], ], Database\SqlController::class => [ 'class' => Database\SqlController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . SqlQueryForm::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + SqlQueryForm::class, + PageSettings::class, + DbTableExists::class, ], ], Database\SqlFormatController::class => [ 'class' => Database\SqlFormatController::class, - 'arguments' => ['@' . ResponseRenderer::class], + 'arguments' => [ResponseRenderer::class], ], Database\Structure\AddPrefixController::class => [ 'class' => Database\Structure\AddPrefixController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . ResponseFactory::class, '@' . Template::class], + 'arguments' => [ResponseRenderer::class, ResponseFactory::class, Template::class], ], Database\Structure\AddPrefixTableController::class => [ 'class' => Database\Structure\AddPrefixTableController::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . Database\StructureController::class], + 'arguments' => [DatabaseInterface::class, Database\StructureController::class], ], Database\Structure\CentralColumns\AddController::class => [ 'class' => Database\Structure\CentralColumns\AddController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . Database\StructureController::class, + ResponseRenderer::class, + DatabaseInterface::class, + Database\StructureController::class, ], ], Database\Structure\CentralColumns\MakeConsistentController::class => [ 'class' => Database\Structure\CentralColumns\MakeConsistentController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . Database\StructureController::class, + ResponseRenderer::class, + DatabaseInterface::class, + Database\StructureController::class, ], ], Database\Structure\CentralColumns\RemoveController::class => [ 'class' => Database\Structure\CentralColumns\RemoveController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . Database\StructureController::class, + ResponseRenderer::class, + DatabaseInterface::class, + Database\StructureController::class, ], ], Database\Structure\ChangePrefixFormController::class => [ 'class' => Database\Structure\ChangePrefixFormController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . ResponseFactory::class, '@' . Template::class], + 'arguments' => [ResponseRenderer::class, ResponseFactory::class, Template::class], ], Database\Structure\CopyFormController::class => [ 'class' => Database\Structure\CopyFormController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . ResponseFactory::class, '@' . Template::class], + 'arguments' => [ResponseRenderer::class, ResponseFactory::class, Template::class], ], Database\Structure\CopyTableController::class => [ 'class' => Database\Structure\CopyTableController::class, 'arguments' => [ - '@' . \PhpMyAdmin\Operations::class, - '@' . Database\StructureController::class, - '@' . UserPrivilegesFactory::class, - '@' . TableMover::class, + \PhpMyAdmin\Operations::class, + Database\StructureController::class, + UserPrivilegesFactory::class, + TableMover::class, ], ], Database\Structure\CopyTableWithPrefixController::class => [ 'class' => Database\Structure\CopyTableWithPrefixController::class, 'arguments' => [ - '@' . Database\StructureController::class, - '@' . TableMover::class, + Database\StructureController::class, + TableMover::class, ], ], Database\Structure\DropFormController::class => [ 'class' => Database\Structure\DropFormController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], Database\Structure\DropTableController::class => [ 'class' => Database\Structure\DropTableController::class, 'arguments' => [ - '@' . DatabaseInterface::class, - '@' . RelationCleanup::class, - '@' . Database\StructureController::class, + DatabaseInterface::class, + RelationCleanup::class, + Database\StructureController::class, ], ], Database\Structure\EmptyFormController::class => [ 'class' => Database\Structure\EmptyFormController::class, - 'arguments' => ['@' . ResponseRenderer::class], + 'arguments' => [ResponseRenderer::class], ], Database\Structure\EmptyTableController::class => [ 'class' => Database\Structure\EmptyTableController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . FlashMessenger::class, - '@' . Database\StructureController::class, - '@' . \PhpMyAdmin\Sql::class, + ResponseRenderer::class, + DatabaseInterface::class, + FlashMessenger::class, + Database\StructureController::class, + \PhpMyAdmin\Sql::class, ], ], Database\Structure\FavoriteTableController::class => [ 'class' => Database\Structure\FavoriteTableController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + DbTableExists::class, + Config::class, ], ], Database\Structure\RealRowCountController::class => [ 'class' => Database\Structure\RealRowCountController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + DatabaseInterface::class, + DbTableExists::class, ], ], Database\Structure\ReplacePrefixController::class => [ 'class' => Database\Structure\ReplacePrefixController::class, - 'arguments' => ['@' . DatabaseInterface::class, '@' . ResponseFactory::class, '@' . FlashMessenger::class], + 'arguments' => [DatabaseInterface::class, ResponseFactory::class, FlashMessenger::class], ], Database\Structure\ShowCreateController::class => [ 'class' => Database\Structure\ShowCreateController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, Template::class, DatabaseInterface::class], ], Database\StructureController::class => [ 'class' => Database\StructureController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Relation::class, - '@' . Replication::class, - '@' . DatabaseInterface::class, - '@' . TrackingChecker::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + Relation::class, + Replication::class, + DatabaseInterface::class, + TrackingChecker::class, + PageSettings::class, + DbTableExists::class, + Config::class, ], ], Database\TrackingController::class => [ 'class' => Database\TrackingController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Tracking::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Tracking::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], DatabaseController::class => [ 'class' => DatabaseController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], ErrorReportController::class => [ 'class' => ErrorReportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . ErrorReport::class, - '@' . ErrorHandler::class, - '@' . DatabaseInterface::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + ErrorReport::class, + ErrorHandler::class, + DatabaseInterface::class, + Config::class, ], ], Export\CheckTimeOutController::class => [ 'class' => Export\CheckTimeOutController::class, - 'arguments' => ['@' . ResponseRenderer::class], + 'arguments' => [ResponseRenderer::class], ], Export\ExportController::class => [ 'class' => Export\ExportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Export\Export::class, - '@' . ResponseFactory::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Export\Export::class, + ResponseFactory::class, + Config::class, ], ], Export\TablesController::class => [ 'class' => Export\TablesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Database\ExportController::class, + ResponseRenderer::class, + Database\ExportController::class, ], ], Export\Template\CreateController::class => [ 'class' => Export\Template\CreateController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . TemplateModel::class, - '@' . Relation::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + TemplateModel::class, + Relation::class, + Config::class, ], ], Export\Template\DeleteController::class => [ 'class' => Export\Template\DeleteController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . TemplateModel::class, - '@' . Relation::class, - '@' . Config::class, + ResponseRenderer::class, + TemplateModel::class, + Relation::class, + Config::class, ], ], Export\Template\LoadController::class => [ 'class' => Export\Template\LoadController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . TemplateModel::class, - '@' . Relation::class, - '@' . Config::class, + ResponseRenderer::class, + TemplateModel::class, + Relation::class, + Config::class, ], ], Export\Template\UpdateController::class => [ 'class' => Export\Template\UpdateController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . TemplateModel::class, - '@' . Relation::class, - '@' . Config::class, + ResponseRenderer::class, + TemplateModel::class, + Relation::class, + Config::class, ], ], GisDataEditorController::class => [ 'class' => GisDataEditorController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class], + 'arguments' => [ResponseRenderer::class, Template::class], ], GitInfoController::class => [ 'class' => GitInfoController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Config::class], ], HomeController::class => [ 'class' => HomeController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Config::class, - '@' . ThemeManager::class, - '@' . DatabaseInterface::class, - '@' . ResponseFactory::class, + ResponseRenderer::class, + Config::class, + ThemeManager::class, + DatabaseInterface::class, + ResponseFactory::class, ], ], Import\ImportController::class => [ 'class' => Import\ImportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Import\Import::class, - '@' . \PhpMyAdmin\Sql::class, - '@' . DatabaseInterface::class, - '@' . BookmarkRepository::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Import\Import::class, + \PhpMyAdmin\Sql::class, + DatabaseInterface::class, + BookmarkRepository::class, + Config::class, ], ], Import\SimulateDmlController::class => [ 'class' => Import\SimulateDmlController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . SimulateDml::class], + 'arguments' => [ResponseRenderer::class, SimulateDml::class], ], Import\StatusController::class => [ 'class' => Import\StatusController::class, - 'arguments' => ['@' . Template::class], + 'arguments' => [Template::class], ], JavaScriptMessagesController::class => [ 'class' => JavaScriptMessagesController::class, - 'arguments' => ['@' . ResponseFactory::class], + 'arguments' => [ResponseFactory::class], ], LicenseController::class => [ 'class' => LicenseController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . ResponseFactory::class], + 'arguments' => [ResponseRenderer::class, ResponseFactory::class], ], - LintController::class => ['class' => LintController::class, 'arguments' => ['@' . ResponseFactory::class]], + LintController::class => ['class' => LintController::class, 'arguments' => [ResponseFactory::class]], LogoutController::class => [ 'class' => LogoutController::class, - 'arguments' => ['@' . AuthenticationPluginFactory::class], + 'arguments' => [AuthenticationPluginFactory::class], ], NavigationController::class => [ 'class' => NavigationController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Navigation::class, - '@' . Relation::class, - '@' . PageSettings::class, + ResponseRenderer::class, + Navigation::class, + Relation::class, + PageSettings::class, ], ], Normalization\FirstNormalForm\FirstStepController::class => [ 'class' => Normalization\FirstNormalForm\FirstStepController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\FirstNormalForm\FourthStepController::class => [ 'class' => Normalization\FirstNormalForm\FourthStepController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\FirstNormalForm\SecondStepController::class => [ 'class' => Normalization\FirstNormalForm\SecondStepController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\FirstNormalForm\ThirdStepController::class => [ 'class' => Normalization\FirstNormalForm\ThirdStepController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\SecondNormalForm\CreateNewTablesController::class => [ 'class' => Normalization\SecondNormalForm\CreateNewTablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\SecondNormalForm\FirstStepController::class => [ 'class' => Normalization\SecondNormalForm\FirstStepController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\SecondNormalForm\NewTablesController::class => [ 'class' => Normalization\SecondNormalForm\NewTablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\ThirdNormalForm\CreateNewTablesController::class => [ 'class' => Normalization\ThirdNormalForm\CreateNewTablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\ThirdNormalForm\FirstStepController::class => [ 'class' => Normalization\ThirdNormalForm\FirstStepController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\ThirdNormalForm\NewTablesController::class => [ 'class' => Normalization\ThirdNormalForm\NewTablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\AddNewPrimaryController::class => [ 'class' => Normalization\AddNewPrimaryController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Normalization::class, - '@' . UserPrivilegesFactory::class, + ResponseRenderer::class, + \PhpMyAdmin\Normalization::class, + UserPrivilegesFactory::class, ], ], Normalization\CreateNewColumnController::class => [ 'class' => Normalization\CreateNewColumnController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Normalization::class, - '@' . UserPrivilegesFactory::class, + ResponseRenderer::class, + \PhpMyAdmin\Normalization::class, + UserPrivilegesFactory::class, ], ], Normalization\GetColumnsController::class => [ 'class' => Normalization\GetColumnsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\MainController::class => [ 'class' => Normalization\MainController::class, - 'arguments' => ['@' . ResponseRenderer::class], + 'arguments' => [ResponseRenderer::class], ], Normalization\MoveRepeatingGroup::class => [ 'class' => Normalization\MoveRepeatingGroup::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], Normalization\PartialDependenciesController::class => [ 'class' => Normalization\PartialDependenciesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Normalization::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Normalization::class], ], PhpInfoController::class => [ 'class' => PhpInfoController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . ResponseFactory::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, ResponseFactory::class, Config::class], ], Preferences\ExportController::class => [ 'class' => Preferences\ExportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, ], ], Preferences\FeaturesController::class => [ 'class' => Preferences\FeaturesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, ], ], Preferences\ImportController::class => [ 'class' => Preferences\ImportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, ], ], Preferences\MainPanelController::class => [ 'class' => Preferences\MainPanelController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, ], ], Preferences\ManageController::class => [ 'class' => Preferences\ManageController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, - '@' . ResponseFactory::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, + ResponseFactory::class, ], ], Preferences\NavigationController::class => [ 'class' => Preferences\NavigationController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, ], ], Preferences\SqlController::class => [ 'class' => Preferences\SqlController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPreferences::class, - '@' . Relation::class, - '@' . Config::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + UserPreferences::class, + Relation::class, + Config::class, + ThemeManager::class, ], ], Preferences\TwoFactorController::class => [ 'class' => Preferences\TwoFactorController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Relation::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Relation::class, Config::class], ], SchemaExportController::class => [ 'class' => SchemaExportController::class, 'arguments' => [ - '@' . \PhpMyAdmin\Export\Export::class, - '@' . ResponseRenderer::class, - '@' . ResponseFactory::class, + \PhpMyAdmin\Export\Export::class, + ResponseRenderer::class, + ResponseFactory::class, ], ], Server\BinlogController::class => [ 'class' => Server\BinlogController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class, Config::class], ], Server\CollationsController::class => [ 'class' => Server\CollationsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class, Config::class], ], Server\Databases\CreateController::class => [ 'class' => Server\Databases\CreateController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class, Config::class], ], Server\Databases\DestroyController::class => [ 'class' => Server\Databases\DestroyController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . Transformations::class, - '@' . RelationCleanup::class, - '@' . UserPrivilegesFactory::class, - '@' . Config::class, + ResponseRenderer::class, + DatabaseInterface::class, + Transformations::class, + RelationCleanup::class, + UserPrivilegesFactory::class, + Config::class, ], ], Server\DatabasesController::class => [ 'class' => Server\DatabasesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . UserPrivilegesFactory::class, - '@' . Config::class, + ResponseRenderer::class, + DatabaseInterface::class, + UserPrivilegesFactory::class, + Config::class, ], ], Server\EnginesController::class => [ 'class' => Server\EnginesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], Server\ExportController::class => [ 'class' => Server\ExportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Options::class, - '@' . DatabaseInterface::class, - '@' . PageSettings::class, + ResponseRenderer::class, + Options::class, + DatabaseInterface::class, + PageSettings::class, ], ], Server\ImportController::class => [ 'class' => Server\ImportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . PageSettings::class, - '@' . Config::class, + ResponseRenderer::class, + DatabaseInterface::class, + PageSettings::class, + Config::class, ], ], Server\PluginsController::class => [ 'class' => Server\PluginsController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Plugins::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Plugins::class, + DatabaseInterface::class, ], ], Server\Privileges\AccountLockController::class => [ 'class' => Server\Privileges\AccountLockController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . AccountLocking::class], + 'arguments' => [ResponseRenderer::class, AccountLocking::class], ], Server\Privileges\AccountUnlockController::class => [ 'class' => Server\Privileges\AccountUnlockController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . AccountLocking::class], + 'arguments' => [ResponseRenderer::class, AccountLocking::class], ], Server\PrivilegesController::class => [ 'class' => Server\PrivilegesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . UserPrivilegesFactory::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + Relation::class, + DatabaseInterface::class, + UserPrivilegesFactory::class, + Config::class, ], ], Server\ReplicationController::class => [ 'class' => Server\ReplicationController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . ReplicationGui::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, ReplicationGui::class, DatabaseInterface::class], ], Server\ShowEngineController::class => [ 'class' => Server\ShowEngineController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], Server\SqlController::class => [ 'class' => Server\SqlController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . SqlQueryForm::class, - '@' . DatabaseInterface::class, - '@' . PageSettings::class, + ResponseRenderer::class, + SqlQueryForm::class, + DatabaseInterface::class, + PageSettings::class, ], ], Server\UserGroupsController::class => [ 'class' => Server\UserGroupsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Relation::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, Relation::class, DatabaseInterface::class], ], Server\UserGroupsFormController::class => [ 'class' => Server\UserGroupsFormController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Relation::class, + DatabaseInterface::class, ], ], Server\Status\AdvisorController::class => [ 'class' => Server\Status\AdvisorController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Advisor::class, + ResponseRenderer::class, + Template::class, + Data::class, + Advisor::class, ], ], Server\Status\Monitor\ChartingDataController::class => [ 'class' => Server\Status\Monitor\ChartingDataController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Monitor::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + Monitor::class, + DatabaseInterface::class, ], ], Server\Status\Monitor\GeneralLogController::class => [ 'class' => Server\Status\Monitor\GeneralLogController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Monitor::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + Monitor::class, + DatabaseInterface::class, ], ], Server\Status\Monitor\LogVarsController::class => [ 'class' => Server\Status\Monitor\LogVarsController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Monitor::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + Monitor::class, + DatabaseInterface::class, ], ], Server\Status\Monitor\QueryAnalyzerController::class => [ 'class' => Server\Status\Monitor\QueryAnalyzerController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Monitor::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + Monitor::class, + DatabaseInterface::class, ], ], Server\Status\Monitor\SlowLogController::class => [ 'class' => Server\Status\Monitor\SlowLogController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Monitor::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + Monitor::class, + DatabaseInterface::class, ], ], Server\Status\MonitorController::class => [ 'class' => Server\Status\MonitorController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + DatabaseInterface::class, ], ], Server\Status\Processes\KillController::class => [ 'class' => Server\Status\Processes\KillController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + DatabaseInterface::class, ], ], Server\Status\Processes\RefreshController::class => [ 'class' => Server\Status\Processes\RefreshController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . Processes::class, + ResponseRenderer::class, + Template::class, + Data::class, + Processes::class, ], ], Server\Status\ProcessesController::class => [ 'class' => Server\Status\ProcessesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . DatabaseInterface::class, - '@' . Processes::class, + ResponseRenderer::class, + Template::class, + Data::class, + DatabaseInterface::class, + Processes::class, ], ], Server\Status\QueriesController::class => [ 'class' => Server\Status\QueriesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + DatabaseInterface::class, ], ], Server\Status\StatusController::class => [ 'class' => Server\Status\StatusController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . ReplicationGui::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + ReplicationGui::class, + DatabaseInterface::class, ], ], Server\Status\VariablesController::class => [ 'class' => Server\Status\VariablesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Data::class, - '@' . DatabaseInterface::class, + ResponseRenderer::class, + Template::class, + Data::class, + DatabaseInterface::class, ], ], Server\Variables\GetVariableController::class => [ 'class' => Server\Variables\GetVariableController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], Server\Variables\SetVariableController::class => [ 'class' => Server\Variables\SetVariableController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, Template::class, DatabaseInterface::class], ], Server\VariablesController::class => [ 'class' => Server\VariablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, Template::class, DatabaseInterface::class], ], Setup\MainController::class => [ 'class' => Setup\MainController::class, 'arguments' => [ - '@' . ResponseFactory::class, - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Config::class, + ResponseFactory::class, + ResponseRenderer::class, + Template::class, + Config::class, ], ], Setup\ShowConfigController::class => [ 'class' => Setup\ShowConfigController::class, - 'arguments' => ['@' . ResponseFactory::class, '@' . Template::class, '@' . Config::class], + 'arguments' => [ResponseFactory::class, Template::class, Config::class], ], Setup\ValidateController::class => [ 'class' => Setup\ValidateController::class, - 'arguments' => ['@' . ResponseFactory::class, '@' . Template::class, '@' . Config::class], + 'arguments' => [ResponseFactory::class, Template::class, Config::class], ], Sql\ColumnPreferencesController::class => [ 'class' => Sql\ColumnPreferencesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], Sql\DefaultForeignKeyCheckValueController::class => [ 'class' => Sql\DefaultForeignKeyCheckValueController::class, - 'arguments' => ['@' . ResponseRenderer::class], + 'arguments' => [ResponseRenderer::class], ], Sql\EnumValuesController::class => [ 'class' => Sql\EnumValuesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . \PhpMyAdmin\Sql::class], + 'arguments' => [ResponseRenderer::class, Template::class, \PhpMyAdmin\Sql::class], ], Sql\RelationalValuesController::class => [ 'class' => Sql\RelationalValuesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Sql::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Sql::class], ], Sql\SetValuesController::class => [ 'class' => Sql\SetValuesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . \PhpMyAdmin\Sql::class], + 'arguments' => [ResponseRenderer::class, Template::class, \PhpMyAdmin\Sql::class], ], Sql\SqlController::class => [ 'class' => Sql\SqlController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Sql::class, - '@' . PageSettings::class, - '@' . BookmarkRepository::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Sql::class, + PageSettings::class, + BookmarkRepository::class, + Config::class, ], ], Table\AddFieldController::class => [ 'class' => Table\AddFieldController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Transformations::class, - '@' . Config::class, - '@' . DatabaseInterface::class, - '@' . ColumnsDefinition::class, - '@' . DbTableExists::class, - '@' . UserPrivilegesFactory::class, + ResponseRenderer::class, + Transformations::class, + Config::class, + DatabaseInterface::class, + ColumnsDefinition::class, + DbTableExists::class, + UserPrivilegesFactory::class, ], ], Table\ChangeController::class => [ 'class' => Table\ChangeController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . InsertEdit::class, - '@' . Relation::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + InsertEdit::class, + Relation::class, + PageSettings::class, + DbTableExists::class, + Config::class, ], ], Table\ChangeRowsController::class => [ 'class' => Table\ChangeRowsController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Table\ChangeController::class, + ResponseRenderer::class, + Table\ChangeController::class, ], ], Table\ChartController::class => [ 'class' => Table\ChartController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], Table\CreateController::class => [ 'class' => Table\CreateController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Transformations::class, - '@' . Config::class, - '@' . DatabaseInterface::class, - '@' . ColumnsDefinition::class, - '@' . UserPrivilegesFactory::class, + ResponseRenderer::class, + Transformations::class, + Config::class, + DatabaseInterface::class, + ColumnsDefinition::class, + UserPrivilegesFactory::class, ], ], Table\DeleteConfirmController::class => [ 'class' => Table\DeleteConfirmController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DbTableExists::class], + 'arguments' => [ResponseRenderer::class, DbTableExists::class], ], Table\DeleteRowsController::class => [ 'class' => Table\DeleteRowsController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . \PhpMyAdmin\Sql::class, + ResponseRenderer::class, + DatabaseInterface::class, + \PhpMyAdmin\Sql::class, ], ], Table\DropColumnConfirmationController::class => [ 'class' => Table\DropColumnConfirmationController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DbTableExists::class], + 'arguments' => [ResponseRenderer::class, DbTableExists::class], ], Table\DropColumnController::class => [ 'class' => Table\DropColumnController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . FlashMessenger::class, - '@' . RelationCleanup::class, + ResponseRenderer::class, + DatabaseInterface::class, + FlashMessenger::class, + RelationCleanup::class, ], ], Table\ExportController::class => [ 'class' => Table\ExportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Options::class, - '@' . PageSettings::class, + ResponseRenderer::class, + Options::class, + PageSettings::class, ], ], Table\ExportRowsController::class => [ 'class' => Table\ExportRowsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Table\ExportController::class], + 'arguments' => [ResponseRenderer::class, Table\ExportController::class], ], Table\FindReplaceController::class => [ 'class' => Table\FindReplaceController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], Table\GetFieldController::class => [ 'class' => Table\GetFieldController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . ResponseFactory::class, + ResponseRenderer::class, + DatabaseInterface::class, + ResponseFactory::class, ], ], Table\GisVisualizationController::class => [ 'class' => Table\GisVisualizationController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . ResponseFactory::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + DatabaseInterface::class, + DbTableExists::class, + ResponseFactory::class, + Config::class, ], ], Table\ImportController::class => [ 'class' => Table\ImportController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + DatabaseInterface::class, + PageSettings::class, + DbTableExists::class, + Config::class, ], ], Table\IndexesController::class => [ 'class' => Table\IndexesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . Indexes::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + DatabaseInterface::class, + Indexes::class, + DbTableExists::class, + Config::class, ], ], Table\IndexRenameController::class => [ 'class' => Table\IndexRenameController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . Indexes::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + Template::class, + DatabaseInterface::class, + Indexes::class, + DbTableExists::class, ], ], Table\Maintenance\AnalyzeController::class => [ 'class' => Table\Maintenance\AnalyzeController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Table\Maintenance::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Table\Maintenance::class, + Config::class, ], ], Table\Maintenance\CheckController::class => [ 'class' => Table\Maintenance\CheckController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Table\Maintenance::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Table\Maintenance::class, + Config::class, ], ], Table\Maintenance\ChecksumController::class => [ 'class' => Table\Maintenance\ChecksumController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Table\Maintenance::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Table\Maintenance::class, + Config::class, ], ], Table\Maintenance\OptimizeController::class => [ 'class' => Table\Maintenance\OptimizeController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Table\Maintenance::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Table\Maintenance::class, + Config::class, ], ], Table\Maintenance\RepairController::class => [ 'class' => Table\Maintenance\RepairController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Table\Maintenance::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Table\Maintenance::class, + Config::class, ], ], Table\Partition\AnalyzeController::class => [ 'class' => Table\Partition\AnalyzeController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Table\Partition\CheckController::class => [ 'class' => Table\Partition\CheckController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Table\Partition\DropController::class => [ 'class' => Table\Partition\DropController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Table\Partition\OptimizeController::class => [ 'class' => Table\Partition\OptimizeController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Table\Partition\RebuildController::class => [ 'class' => Table\Partition\RebuildController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Table\Partition\RepairController::class => [ 'class' => Table\Partition\RepairController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Table\Partition\TruncateController::class => [ 'class' => Table\Partition\TruncateController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Maintenance::class], + 'arguments' => [ResponseRenderer::class, Maintenance::class], ], Operations\TableController::class => [ 'class' => Operations\TableController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . \PhpMyAdmin\Operations::class, - '@' . UserPrivilegesFactory::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + \PhpMyAdmin\Operations::class, + UserPrivilegesFactory::class, + Relation::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], Table\PrivilegesController::class => [ 'class' => Table\PrivilegesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Privileges::class, - '@' . DatabaseInterface::class, - '@' . Config::class, + ResponseRenderer::class, + Privileges::class, + DatabaseInterface::class, + Config::class, ], ], Table\RecentFavoriteController::class => [ 'class' => Table\RecentFavoriteController::class, - 'arguments' => ['@' . ResponseRenderer::class], + 'arguments' => [ResponseRenderer::class], ], Table\RelationController::class => [ 'class' => Table\RelationController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + Relation::class, + DatabaseInterface::class, + Config::class, ], ], Table\ReplaceController::class => [ 'class' => Table\ReplaceController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . InsertEdit::class, - '@' . Transformations::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . Sql\SqlController::class, - '@' . Database\SqlController::class, - '@' . Table\ChangeController::class, - '@' . Table\SqlController::class, + ResponseRenderer::class, + InsertEdit::class, + Transformations::class, + Relation::class, + DatabaseInterface::class, + Sql\SqlController::class, + Database\SqlController::class, + Table\ChangeController::class, + Table\SqlController::class, ], ], Table\SearchController::class => [ 'class' => Table\SearchController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Search::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, - '@' . \PhpMyAdmin\Sql::class, + ResponseRenderer::class, + Template::class, + Search::class, + Relation::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, + \PhpMyAdmin\Sql::class, ], ], Table\SqlController::class => [ 'class' => Table\SqlController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . SqlQueryForm::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + SqlQueryForm::class, + PageSettings::class, + DbTableExists::class, ], ], Table\Structure\AddIndexController::class => [ 'class' => Table\Structure\AddIndexController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Table\StructureController::class, - '@' . Indexes::class, + ResponseRenderer::class, + Table\StructureController::class, + Indexes::class, ], ], Table\Structure\AddKeyController::class => [ 'class' => Table\Structure\AddKeyController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Table\StructureController::class, - '@' . Indexes::class, + ResponseRenderer::class, + Table\StructureController::class, + Indexes::class, ], ], Table\Structure\BrowseController::class => [ 'class' => Table\Structure\BrowseController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . \PhpMyAdmin\Sql::class], + 'arguments' => [ResponseRenderer::class, \PhpMyAdmin\Sql::class], ], Table\Structure\CentralColumnsAddController::class => [ 'class' => Table\Structure\CentralColumnsAddController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . CentralColumns::class, - '@' . Table\StructureController::class, + ResponseRenderer::class, + CentralColumns::class, + Table\StructureController::class, ], ], Table\Structure\CentralColumnsRemoveController::class => [ 'class' => Table\Structure\CentralColumnsRemoveController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . CentralColumns::class, - '@' . Table\StructureController::class, + ResponseRenderer::class, + CentralColumns::class, + Table\StructureController::class, ], ], Table\Structure\ChangeController::class => [ 'class' => Table\Structure\ChangeController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . ColumnsDefinition::class, - '@' . UserPrivilegesFactory::class, + ResponseRenderer::class, + DatabaseInterface::class, + ColumnsDefinition::class, + UserPrivilegesFactory::class, ], ], Table\Structure\FulltextController::class => [ 'class' => Table\Structure\FulltextController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Table\StructureController::class, - '@' . Indexes::class, + ResponseRenderer::class, + Table\StructureController::class, + Indexes::class, ], ], Table\Structure\MoveColumnsController::class => [ 'class' => Table\Structure\MoveColumnsController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Template::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, Template::class, DatabaseInterface::class], ], Table\Structure\PartitioningController::class => [ 'class' => Table\Structure\PartitioningController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . CreateAddField::class, - '@' . Table\StructureController::class, - '@' . PageSettings::class, + ResponseRenderer::class, + DatabaseInterface::class, + CreateAddField::class, + Table\StructureController::class, + PageSettings::class, ], ], Table\Structure\PrimaryController::class => [ 'class' => Table\Structure\PrimaryController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . Table\StructureController::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + DatabaseInterface::class, + Table\StructureController::class, + DbTableExists::class, ], ], Table\Structure\ReservedWordCheckController::class => [ 'class' => Table\Structure\ReservedWordCheckController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Config::class], ], Table\Structure\SaveController::class => [ 'class' => Table\Structure\SaveController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Relation::class, - '@' . Transformations::class, - '@' . DatabaseInterface::class, - '@' . Table\StructureController::class, - '@' . UserPrivilegesFactory::class, - '@' . Config::class, + ResponseRenderer::class, + Relation::class, + Transformations::class, + DatabaseInterface::class, + Table\StructureController::class, + UserPrivilegesFactory::class, + Config::class, ], ], Table\Structure\SpatialController::class => [ 'class' => Table\Structure\SpatialController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Table\StructureController::class, - '@' . Indexes::class, + ResponseRenderer::class, + Table\StructureController::class, + Indexes::class, ], ], Table\Structure\UniqueController::class => [ 'class' => Table\Structure\UniqueController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Table\StructureController::class, - '@' . Indexes::class, + ResponseRenderer::class, + Table\StructureController::class, + Indexes::class, ], ], Table\StructureController::class => [ 'class' => Table\StructureController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Relation::class, - '@' . Transformations::class, - '@' . DatabaseInterface::class, - '@' . PageSettings::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + Relation::class, + Transformations::class, + DatabaseInterface::class, + PageSettings::class, + DbTableExists::class, + Config::class, ], ], Table\TrackingController::class => [ 'class' => Table\TrackingController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Tracking::class, - '@' . TrackingChecker::class, - '@' . DbTableExists::class, - '@' . ResponseFactory::class, + ResponseRenderer::class, + Tracking::class, + TrackingChecker::class, + DbTableExists::class, + ResponseFactory::class, ], ], Triggers\IndexController::class => [ 'class' => Triggers\IndexController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . DatabaseInterface::class, - '@' . \PhpMyAdmin\Triggers\Triggers::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + Template::class, + DatabaseInterface::class, + \PhpMyAdmin\Triggers\Triggers::class, + DbTableExists::class, ], ], Table\ZoomSearchController::class => [ 'class' => Table\ZoomSearchController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . Search::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . Config::class, + ResponseRenderer::class, + Template::class, + Search::class, + Relation::class, + DatabaseInterface::class, + DbTableExists::class, + Config::class, ], ], TableController::class => [ 'class' => TableController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . DatabaseInterface::class], + 'arguments' => [ResponseRenderer::class, DatabaseInterface::class], ], ThemesController::class => [ 'class' => ThemesController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Template::class, - '@' . ThemeManager::class, + ResponseRenderer::class, + Template::class, + ThemeManager::class, ], ], ThemeSetController::class => [ 'class' => ThemeSetController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . ThemeManager::class, - '@' . UserPreferences::class, - '@' . Config::class, + ResponseRenderer::class, + ThemeManager::class, + UserPreferences::class, + Config::class, ], ], Transformation\OverviewController::class => [ 'class' => Transformation\OverviewController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Transformations::class], + 'arguments' => [ResponseRenderer::class, Transformations::class], ], Transformation\WrapperController::class => [ 'class' => Transformation\WrapperController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . Transformations::class, - '@' . Relation::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, - '@' . ResponseFactory::class, + ResponseRenderer::class, + Transformations::class, + Relation::class, + DatabaseInterface::class, + DbTableExists::class, + ResponseFactory::class, ], ], UserPasswordController::class => [ 'class' => UserPasswordController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . UserPassword::class, - '@' . DatabaseInterface::class, - '@' . Config::class, + ResponseRenderer::class, + UserPassword::class, + DatabaseInterface::class, + Config::class, ], ], VersionCheckController::class => [ 'class' => VersionCheckController::class, - 'arguments' => ['@' . VersionInformation::class, '@' . ResponseFactory::class], + 'arguments' => [VersionInformation::class, ResponseFactory::class], ], View\CreateController::class => [ 'class' => View\CreateController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + DatabaseInterface::class, + DbTableExists::class, ], ], Operations\ViewController::class => [ 'class' => Operations\ViewController::class, 'arguments' => [ - '@' . ResponseRenderer::class, - '@' . DatabaseInterface::class, - '@' . DbTableExists::class, + ResponseRenderer::class, + DatabaseInterface::class, + DbTableExists::class, ], ], SyncFavoriteTablesController::class => [ 'class' => SyncFavoriteTablesController::class, - 'arguments' => ['@' . ResponseRenderer::class, '@' . Relation::class, '@' . Config::class], + 'arguments' => [ResponseRenderer::class, Relation::class, Config::class], ], ], ]; diff --git a/app/services_loader.php b/app/services_loader.php index cf0da241bc..1f94c7373b 100644 --- a/app/services_loader.php +++ b/app/services_loader.php @@ -7,10 +7,10 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator; use Symfony\Component\DependencyInjection\Reference; use function is_string; -use function substr; return static function (ContainerConfigurator $configurator): void { $services = $configurator->services(); + /** @param array<'services', array, factory?: callable}>> $servicesFile */ $loadServices = static function (array $servicesFile, ServicesConfigurator $services): void { foreach ($servicesFile['services'] as $serviceName => $service) { if (is_string($service)) { @@ -18,26 +18,20 @@ return static function (ContainerConfigurator $configurator): void { continue; } - $theService = $services->set($serviceName, $service['class'] ?? null); - if (isset($service['arguments'])) {// !== null check - foreach ($service['arguments'] as &$argumentName) { - if ($argumentName[0] !== '@') { - continue; - } - - $services->alias($serviceName, substr($argumentName, 1)); - $argumentName = new Reference(substr($argumentName, 1)); - } - - $theService->args($service['arguments']); + $theService = $services->set($serviceName, $service['class']); + if (isset($service['factory'])) { + $theService->factory($service['factory']); } - if (! isset($service['factory'])) { + if (! isset($service['arguments'])) { continue; } - // !== null check - $theService->factory($service['factory']); + foreach ($service['arguments'] as &$argumentName) { + $argumentName = new Reference($argumentName); + } + + $theService->args($service['arguments']); } }; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 082b795406..1f259f549c 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -30,12 +30,6 @@ parameters: count: 1 path: app/services_loader.php - - - message: '#^Cannot access offset 0 on mixed\.$#' - identifier: offsetAccess.nonOffsetAccessible - count: 1 - path: app/services_loader.php - - message: '#^Parameter \#1 \$arguments of method Symfony\\Component\\DependencyInjection\\Loader\\Configurator\\ServiceConfigurator\:\:args\(\) expects array, mixed given\.$#' identifier: argument.type @@ -48,10 +42,16 @@ parameters: count: 1 path: app/services_loader.php + - + message: '#^Parameter \#1 \$id of class Symfony\\Component\\DependencyInjection\\Reference constructor expects string, mixed given\.$#' + identifier: argument.type + count: 1 + path: app/services_loader.php + - message: '#^Parameter \#1 \$id of method Symfony\\Component\\DependencyInjection\\Loader\\Configurator\\ServicesConfigurator\:\:alias\(\) expects string, mixed given\.$#' identifier: argument.type - count: 2 + count: 1 path: app/services_loader.php - @@ -66,12 +66,6 @@ parameters: count: 2 path: app/services_loader.php - - - message: '#^Parameter \#1 \$string of function substr expects string, mixed given\.$#' - identifier: argument.type - count: 2 - path: app/services_loader.php - - message: '#^Parameter \#2 \$class of method Symfony\\Component\\DependencyInjection\\Loader\\Configurator\\ServicesConfigurator\:\:set\(\) expects string\|null, mixed given\.$#' identifier: argument.type diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 5d33ba10bf..cf98e306a1 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -2,16 +2,14 @@ - - + - diff --git a/tests/unit/Container/ContainerBuilderTest.php b/tests/unit/Container/ContainerBuilderTest.php index 13acb09217..bf304d71bf 100644 --- a/tests/unit/Container/ContainerBuilderTest.php +++ b/tests/unit/Container/ContainerBuilderTest.php @@ -28,22 +28,23 @@ final class ContainerBuilderTest extends AbstractTestCase ContainerBuilder::$container = null; } + /** @param class-string $service */ #[DataProvider('servicesProvider')] public function testContainerEntries(string $service): void { Current::$lang = 'en'; DatabaseInterface::$instance = $this->createDatabaseInterface(); $container = ContainerBuilder::getContainer(); - self::assertNotNull($container->get($service)); + self::assertInstanceOf($service, $container->get($service)); ContainerBuilder::$container = null; } - /** @return array> */ + /** @return array> */ public static function servicesProvider(): array { - /** @psalm-var array{services: array} $services */ + /** @psalm-var array{services: array} $services */ $services = include ROOT_PATH . 'app/services.php'; - /** @psalm-var array{services: array} $controllerServices */ + /** @psalm-var array{services: array} $controllerServices */ $controllerServices = include ROOT_PATH . 'app/services_controllers.php'; return array_map(