diff --git a/app/services_controllers.php b/app/services_controllers.php index b5a6f44e87..be43d90aee 100644 --- a/app/services_controllers.php +++ b/app/services_controllers.php @@ -52,68 +52,54 @@ return [ 'class' => BrowseForeignersController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$browseForeigners' => '@browse_foreigners', '$relation' => '@relation', ], ], ChangeLogController::class => [ 'class' => ChangeLogController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'], + 'arguments' => ['$response' => '@response', '$config' => '@config'], ], CheckRelationsController::class => [ 'class' => CheckRelationsController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$relation' => '@relation'], + 'arguments' => ['$response' => '@response', '$relation' => '@relation'], ], CollationConnectionController::class => [ 'class' => CollationConnectionController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'], + 'arguments' => ['$response' => '@response', '$config' => '@config'], ], ColumnController::class => [ 'class' => ColumnController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], UpdateNavWidthConfigController::class => [ 'class' => UpdateNavWidthConfigController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'], + 'arguments' => ['$response' => '@response', '$config' => '@config'], ], Console\Bookmark\AddController::class => [ 'class' => Console\Bookmark\AddController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$bookmarkRepository' => '@bookmarkRepository', - ], + 'arguments' => ['$response' => '@response', '$bookmarkRepository' => '@bookmarkRepository'], ], Console\Bookmark\RefreshController::class => [ 'class' => Console\Bookmark\RefreshController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$console' => '@console'], + 'arguments' => ['$response' => '@response', '$console' => '@console'], ], Console\UpdateConfigController::class => [ 'class' => Console\UpdateConfigController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'], + 'arguments' => ['$response' => '@response', '$config' => '@config'], ], Database\CentralColumns\PopulateColumnsController::class => [ 'class' => Database\CentralColumns\PopulateColumnsController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$centralColumns' => '@central_columns', - ], + 'arguments' => ['$response' => '@response', '$centralColumns' => '@central_columns'], ], Database\CentralColumnsController::class => [ 'class' => Database\CentralColumnsController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$centralColumns' => '@central_columns', - ], + 'arguments' => ['$response' => '@response', '$centralColumns' => '@central_columns'], ], Database\DataDictionaryController::class => [ 'class' => Database\DataDictionaryController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$relation' => '@relation', '$transformations' => '@transformations', '$dbi' => '@dbi', @@ -143,7 +129,6 @@ return [ 'class' => Database\ExportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$export' => '@export', '$exportOptions' => '@export_options', '$pageSettings' => '@' . PageSettings::class, @@ -154,7 +139,6 @@ return [ 'class' => Database\ImportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$pageSettings' => '@' . PageSettings::class, '$dbTableExists' => '@' . DbTableExists::class, @@ -162,11 +146,11 @@ return [ ], Database\MultiTableQuery\QueryController::class => [ 'class' => Database\MultiTableQuery\QueryController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Database\MultiTableQuery\TablesController::class => [ 'class' => Database\MultiTableQuery\TablesController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Database\MultiTableQueryController::class => [ 'class' => Database\MultiTableQueryController::class, @@ -176,7 +160,6 @@ return [ 'class' => Operations\Database\CollationController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$operations' => '@operations', '$dbi' => '@dbi', '$dbTableExists' => '@' . DbTableExists::class, @@ -186,7 +169,6 @@ return [ 'class' => Operations\DatabaseController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$operations' => '@operations', '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, '$relation' => '@relation', @@ -197,12 +179,7 @@ return [ ], Database\PrivilegesController::class => [ 'class' => Database\PrivilegesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$privileges' => '@server_privileges', - '$dbi' => '@dbi', - ], + 'arguments' => ['$response' => '@response', '$privileges' => '@server_privileges', '$dbi' => '@dbi'], ], Database\RoutinesController::class => [ 'class' => Database\RoutinesController::class, @@ -226,18 +203,12 @@ return [ ], Database\SqlAutoCompleteController::class => [ 'class' => Database\SqlAutoCompleteController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$dbi' => '@dbi', - '$config' => '@config', - ], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi', '$config' => '@config'], ], Database\SqlController::class => [ 'class' => Database\SqlController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$sqlQueryForm' => '@sql_query_form', '$pageSettings' => '@' . PageSettings::class, '$dbTableExists' => '@' . DbTableExists::class, @@ -245,26 +216,20 @@ return [ ], Database\SqlFormatController::class => [ 'class' => Database\SqlFormatController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Database\Structure\AddPrefixController::class => [ 'class' => Database\Structure\AddPrefixController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Database\Structure\AddPrefixTableController::class => [ 'class' => Database\Structure\AddPrefixTableController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$dbi' => '@dbi', - '$structureController' => '@' . Database\StructureController::class, - ], + 'arguments' => ['$dbi' => '@dbi', '$structureController' => '@' . Database\StructureController::class], ], Database\Structure\CentralColumns\AddController::class => [ 'class' => Database\Structure\CentralColumns\AddController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$structureController' => '@' . Database\StructureController::class, ], @@ -273,7 +238,6 @@ return [ 'class' => Database\Structure\CentralColumns\MakeConsistentController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$structureController' => '@' . Database\StructureController::class, ], @@ -282,24 +246,21 @@ return [ 'class' => Database\Structure\CentralColumns\RemoveController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$structureController' => '@' . Database\StructureController::class, ], ], Database\Structure\ChangePrefixFormController::class => [ 'class' => Database\Structure\ChangePrefixFormController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Database\Structure\CopyFormController::class => [ 'class' => Database\Structure\CopyFormController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Database\Structure\CopyTableController::class => [ 'class' => Database\Structure\CopyTableController::class, 'arguments' => [ - '$response' => '@response', - '$template' => '@template', '$operations' => '@operations', '$structureController' => '@' . Database\StructureController::class, '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, @@ -307,21 +268,15 @@ return [ ], Database\Structure\CopyTableWithPrefixController::class => [ 'class' => Database\Structure\CopyTableWithPrefixController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$structureController' => '@' . Database\StructureController::class, - ], + 'arguments' => ['$structureController' => '@' . Database\StructureController::class], ], Database\Structure\DropFormController::class => [ 'class' => Database\Structure\DropFormController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Database\Structure\DropTableController::class => [ 'class' => Database\Structure\DropTableController::class, 'arguments' => [ - '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$relationCleanup' => '@relation_cleanup', '$structureController' => '@' . Database\StructureController::class, @@ -329,7 +284,7 @@ return [ ], Database\Structure\EmptyFormController::class => [ 'class' => Database\Structure\EmptyFormController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Database\Structure\EmptyTableController::class => [ 'class' => Database\Structure\EmptyTableController::class, @@ -356,19 +311,13 @@ return [ 'class' => Database\Structure\RealRowCountController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$dbTableExists' => '@' . DbTableExists::class, ], ], Database\Structure\ReplacePrefixController::class => [ 'class' => Database\Structure\ReplacePrefixController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$dbi' => '@dbi', - '$structureController' => '@' . Database\StructureController::class, - ], + 'arguments' => ['$dbi' => '@dbi', '$structureController' => '@' . Database\StructureController::class], ], Database\Structure\ShowCreateController::class => [ 'class' => Database\Structure\ShowCreateController::class, @@ -391,7 +340,6 @@ return [ 'class' => Database\TrackingController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$tracking' => '@tracking', '$dbi' => '@dbi', '$dbTableExists' => '@' . DbTableExists::class, @@ -399,7 +347,7 @@ return [ ], DatabaseController::class => [ 'class' => DatabaseController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], ErrorReportController::class => [ 'class' => ErrorReportController::class, @@ -413,17 +361,16 @@ return [ ], Export\CheckTimeOutController::class => [ 'class' => Export\CheckTimeOutController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Export\ExportController::class => [ 'class' => Export\ExportController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$export' => '@export'], + 'arguments' => ['$response' => '@response', '$export' => '@export'], ], Export\TablesController::class => [ 'class' => Export\TablesController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$exportController' => '@' . Database\ExportController::class, ], ], @@ -440,7 +387,6 @@ return [ 'class' => Export\Template\DeleteController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$model' => '@export_template_model', '$relation' => '@relation', ], @@ -449,7 +395,6 @@ return [ 'class' => Export\Template\LoadController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$model' => '@export_template_model', '$relation' => '@relation', ], @@ -458,7 +403,6 @@ return [ 'class' => Export\Template\UpdateController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$model' => '@export_template_model', '$relation' => '@relation', ], @@ -469,13 +413,12 @@ return [ ], GitInfoController::class => [ 'class' => GitInfoController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'], + 'arguments' => ['$response' => '@response', '$config' => '@config'], ], HomeController::class => [ 'class' => HomeController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$config' => '@config', '$themeManager' => '@' . ThemeManager::class, '$dbi' => '@dbi', @@ -486,7 +429,6 @@ return [ 'class' => Import\ImportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$import' => '@import', '$sql' => '@sql', '$dbi' => '@dbi', @@ -495,11 +437,7 @@ return [ ], Import\SimulateDmlController::class => [ 'class' => Import\SimulateDmlController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$simulateDml' => '@import_simulate_dml', - ], + 'arguments' => ['$response' => '@response', '$simulateDml' => '@import_simulate_dml'], ], Import\StatusController::class => [ 'class' => Import\StatusController::class, @@ -511,11 +449,11 @@ return [ ], LicenseController::class => [ 'class' => LicenseController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], LintController::class => [ 'class' => LintController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], LogoutController::class => [ 'class' => LogoutController::class, @@ -525,7 +463,6 @@ return [ 'class' => NavigationController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$navigation' => '@navigation', '$relation' => '@relation', '$pageSettings' => '@' . PageSettings::class, @@ -533,89 +470,48 @@ return [ ], Normalization\FirstNormalForm\FirstStepController::class => [ 'class' => Normalization\FirstNormalForm\FirstStepController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\FirstNormalForm\FourthStepController::class => [ 'class' => Normalization\FirstNormalForm\FourthStepController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\FirstNormalForm\SecondStepController::class => [ 'class' => Normalization\FirstNormalForm\SecondStepController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\FirstNormalForm\ThirdStepController::class => [ 'class' => Normalization\FirstNormalForm\ThirdStepController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\SecondNormalForm\CreateNewTablesController::class => [ 'class' => Normalization\SecondNormalForm\CreateNewTablesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\SecondNormalForm\FirstStepController::class => [ 'class' => Normalization\SecondNormalForm\FirstStepController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\SecondNormalForm\NewTablesController::class => [ 'class' => Normalization\SecondNormalForm\NewTablesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\ThirdNormalForm\CreateNewTablesController::class => [ 'class' => Normalization\ThirdNormalForm\CreateNewTablesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\ThirdNormalForm\FirstStepController::class => [ 'class' => Normalization\ThirdNormalForm\FirstStepController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\ThirdNormalForm\NewTablesController::class => [ 'class' => Normalization\ThirdNormalForm\NewTablesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\AddNewPrimaryController::class => [ 'class' => Normalization\AddNewPrimaryController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$normalization' => '@normalization', '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, ], @@ -624,52 +520,38 @@ return [ 'class' => Normalization\CreateNewColumnController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$normalization' => '@normalization', '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, ], ], Normalization\GetColumnsController::class => [ 'class' => Normalization\GetColumnsController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\MainController::class => [ 'class' => Normalization\MainController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Normalization\MoveRepeatingGroup::class => [ 'class' => Normalization\MoveRepeatingGroup::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], Normalization\PartialDependenciesController::class => [ 'class' => Normalization\PartialDependenciesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$normalization' => '@normalization', - ], + 'arguments' => ['$response' => '@response', '$normalization' => '@normalization'], ], PhpInfoController::class => [ 'class' => PhpInfoController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], RecentTablesListController::class => [ 'class' => RecentTablesListController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Preferences\ExportController::class => [ 'class' => Preferences\ExportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -680,7 +562,6 @@ return [ 'class' => Preferences\FeaturesController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -691,7 +572,6 @@ return [ 'class' => Preferences\ImportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -702,7 +582,6 @@ return [ 'class' => Preferences\MainPanelController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -713,7 +592,6 @@ return [ 'class' => Preferences\ManageController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -724,7 +602,6 @@ return [ 'class' => Preferences\NavigationController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -735,7 +612,6 @@ return [ 'class' => Preferences\SqlController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$userPreferences' => '@user_preferences', '$relation' => '@relation', '$config' => '@config', @@ -744,7 +620,7 @@ return [ ], Preferences\TwoFactorController::class => [ 'class' => Preferences\TwoFactorController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$relation' => '@relation'], + 'arguments' => ['$response' => '@response', '$relation' => '@relation'], ], SchemaExportController::class => [ 'class' => SchemaExportController::class, @@ -752,21 +628,20 @@ return [ ], Server\BinlogController::class => [ 'class' => Server\BinlogController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Server\CollationsController::class => [ 'class' => Server\CollationsController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Server\Databases\CreateController::class => [ 'class' => Server\Databases\CreateController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Server\Databases\DestroyController::class => [ 'class' => Server\Databases\DestroyController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$transformations' => '@transformations', '$relationCleanup' => '@relation_cleanup', @@ -777,20 +652,18 @@ return [ 'class' => Server\DatabasesController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, ], ], Server\EnginesController::class => [ 'class' => Server\EnginesController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Server\ExportController::class => [ 'class' => Server\ExportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$export' => '@export_options', '$dbi' => '@dbi', '$pageSettings' => '@' . PageSettings::class, @@ -800,7 +673,6 @@ return [ 'class' => Server\ImportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$pageSettings' => '@' . PageSettings::class, ], @@ -809,26 +681,17 @@ return [ 'class' => Server\PluginsController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$plugins' => '@server_plugins', '$dbi' => '@dbi', ], ], Server\Privileges\AccountLockController::class => [ 'class' => Server\Privileges\AccountLockController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$accountLocking' => '@server_privileges_account_locking', - ], + 'arguments' => ['$response' => '@response', '$accountLocking' => '@server_privileges_account_locking'], ], Server\Privileges\AccountUnlockController::class => [ 'class' => Server\Privileges\AccountUnlockController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$accountLocking' => '@server_privileges_account_locking', - ], + 'arguments' => ['$response' => '@response', '$accountLocking' => '@server_privileges_account_locking'], ], Server\PrivilegesController::class => [ 'class' => Server\PrivilegesController::class, @@ -842,22 +705,16 @@ return [ ], Server\ReplicationController::class => [ 'class' => Server\ReplicationController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$replicationGui' => '@replication_gui', - '$dbi' => '@dbi', - ], + 'arguments' => ['$response' => '@response', '$replicationGui' => '@replication_gui', '$dbi' => '@dbi'], ], Server\ShowEngineController::class => [ 'class' => Server\ShowEngineController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Server\SqlController::class => [ 'class' => Server\SqlController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$sqlQueryForm' => '@sql_query_form', '$dbi' => '@dbi', '$pageSettings' => '@' . PageSettings::class, @@ -865,12 +722,7 @@ return [ ], Server\UserGroupsController::class => [ 'class' => Server\UserGroupsController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$relation' => '@relation', - '$dbi' => '@dbi', - ], + 'arguments' => ['$response' => '@response', '$relation' => '@relation', '$dbi' => '@dbi'], ], Server\UserGroupsFormController::class => [ 'class' => Server\UserGroupsFormController::class, @@ -1007,7 +859,7 @@ return [ ], Server\Variables\GetVariableController::class => [ 'class' => Server\Variables\GetVariableController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Server\Variables\SetVariableController::class => [ 'class' => Server\Variables\SetVariableController::class, @@ -1019,11 +871,11 @@ return [ ], Sql\ColumnPreferencesController::class => [ 'class' => Sql\ColumnPreferencesController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Sql\DefaultForeignKeyCheckValueController::class => [ 'class' => Sql\DefaultForeignKeyCheckValueController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Sql\EnumValuesController::class => [ 'class' => Sql\EnumValuesController::class, @@ -1031,7 +883,7 @@ return [ ], Sql\RelationalValuesController::class => [ 'class' => Sql\RelationalValuesController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$sql' => '@sql'], + 'arguments' => ['$response' => '@response', '$sql' => '@sql'], ], Sql\SetValuesController::class => [ 'class' => Sql\SetValuesController::class, @@ -1041,7 +893,6 @@ return [ 'class' => Sql\SqlController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$sql' => '@sql', '$dbi' => '@dbi', '$pageSettings' => '@' . PageSettings::class, @@ -1052,7 +903,6 @@ return [ 'class' => Table\AddFieldController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$transformations' => '@transformations', '$config' => '@config', '$dbi' => '@dbi', @@ -1077,7 +927,6 @@ return [ 'class' => Table\ChangeRowsController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$changeController' => '@' . Table\ChangeController::class, ], ], @@ -1085,7 +934,6 @@ return [ 'class' => Table\ChartController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$dbTableExists' => '@' . DbTableExists::class, ], @@ -1094,7 +942,6 @@ return [ 'class' => Table\CreateController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$transformations' => '@transformations', '$config' => '@config', '$dbi' => '@dbi', @@ -1104,11 +951,7 @@ return [ ], Table\DeleteConfirmController::class => [ 'class' => Table\DeleteConfirmController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$dbTableExists' => '@' . DbTableExists::class, - ], + 'arguments' => ['$response' => '@response', '$dbTableExists' => '@' . DbTableExists::class], ], Table\DeleteRowsController::class => [ 'class' => Table\DeleteRowsController::class, @@ -1116,17 +959,12 @@ return [ ], Table\DropColumnConfirmationController::class => [ 'class' => Table\DropColumnConfirmationController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$dbTableExists' => '@' . DbTableExists::class, - ], + 'arguments' => ['$response' => '@response', '$dbTableExists' => '@' . DbTableExists::class], ], Table\DropColumnController::class => [ 'class' => Table\DropColumnController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$flash' => '@flash', '$relationCleanup' => '@relation_cleanup', @@ -1136,18 +974,13 @@ return [ 'class' => Table\ExportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$export' => '@export_options', '$pageSettings' => '@' . PageSettings::class, ], ], Table\ExportRowsController::class => [ 'class' => Table\ExportRowsController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$exportController' => '@' . Table\ExportController::class, - ], + 'arguments' => ['$response' => '@response', '$exportController' => '@' . Table\ExportController::class], ], Table\FindReplaceController::class => [ 'class' => Table\FindReplaceController::class, @@ -1160,7 +993,7 @@ return [ ], Table\GetFieldController::class => [ 'class' => Table\GetFieldController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], Table\GisVisualizationController::class => [ 'class' => Table\GisVisualizationController::class, @@ -1175,7 +1008,6 @@ return [ 'class' => Table\ImportController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$pageSettings' => '@' . PageSettings::class, '$dbTableExists' => '@' . DbTableExists::class, @@ -1203,110 +1035,56 @@ return [ ], Table\Maintenance\AnalyzeController::class => [ 'class' => Table\Maintenance\AnalyzeController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@table_maintenance', - '$config' => '@config', - ], + 'arguments' => ['$response' => '@response', '$model' => '@table_maintenance', '$config' => '@config'], ], Table\Maintenance\CheckController::class => [ 'class' => Table\Maintenance\CheckController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@table_maintenance', - '$config' => '@config', - ], + 'arguments' => ['$response' => '@response', '$model' => '@table_maintenance', '$config' => '@config'], ], Table\Maintenance\ChecksumController::class => [ 'class' => Table\Maintenance\ChecksumController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@table_maintenance', - '$config' => '@config', - ], + 'arguments' => ['$response' => '@response', '$model' => '@table_maintenance', '$config' => '@config'], ], Table\Maintenance\OptimizeController::class => [ 'class' => Table\Maintenance\OptimizeController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@table_maintenance', - '$config' => '@config', - ], + 'arguments' => ['$response' => '@response', '$model' => '@table_maintenance', '$config' => '@config'], ], Table\Maintenance\RepairController::class => [ 'class' => Table\Maintenance\RepairController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@table_maintenance', - '$config' => '@config', - ], + 'arguments' => ['$response' => '@response', '$model' => '@table_maintenance', '$config' => '@config'], ], Table\Partition\AnalyzeController::class => [ 'class' => Table\Partition\AnalyzeController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Table\Partition\CheckController::class => [ 'class' => Table\Partition\CheckController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Table\Partition\DropController::class => [ 'class' => Table\Partition\DropController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Table\Partition\OptimizeController::class => [ 'class' => Table\Partition\OptimizeController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Table\Partition\RebuildController::class => [ 'class' => Table\Partition\RebuildController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Table\Partition\RepairController::class => [ 'class' => Table\Partition\RepairController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Table\Partition\TruncateController::class => [ 'class' => Table\Partition\TruncateController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$model' => '@partitioning_maintenance', - ], + 'arguments' => ['$response' => '@response', '$model' => '@partitioning_maintenance'], ], Operations\TableController::class => [ 'class' => Operations\TableController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$operations' => '@operations', '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, '$relation' => '@relation', @@ -1316,16 +1094,11 @@ return [ ], Table\PrivilegesController::class => [ 'class' => Table\PrivilegesController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$privileges' => '@server_privileges', - '$dbi' => '@dbi', - ], + 'arguments' => ['$response' => '@response', '$privileges' => '@server_privileges', '$dbi' => '@dbi'], ], Table\RecentFavoriteController::class => [ 'class' => Table\RecentFavoriteController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Table\RelationController::class => [ 'class' => Table\RelationController::class, @@ -1340,7 +1113,6 @@ return [ 'class' => Table\ReplaceController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$insertEdit' => '@insert_edit', '$transformations' => '@transformations', '$relation' => '@relation', @@ -1366,7 +1138,6 @@ return [ 'class' => Table\SqlController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$sqlQueryForm' => '@sql_query_form', '$pageSettings' => '@' . PageSettings::class, '$dbTableExists' => '@' . DbTableExists::class, @@ -1376,7 +1147,6 @@ return [ 'class' => Table\Structure\AddIndexController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$structureController' => '@' . Table\StructureController::class, '$indexes' => '@table_indexes', ], @@ -1384,21 +1154,18 @@ return [ Table\Structure\AddKeyController::class => [ 'class' => Table\Structure\AddKeyController::class, 'arguments' => [ - '$response' => '@response', - '$template' => '@template', '$sqlController' => '@' . Sql\SqlController::class, '$structureController' => '@' . Table\StructureController::class, ], ], Table\Structure\BrowseController::class => [ 'class' => Table\Structure\BrowseController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$sql' => '@sql'], + 'arguments' => ['$response' => '@response', '$sql' => '@sql'], ], Table\Structure\CentralColumnsAddController::class => [ 'class' => Table\Structure\CentralColumnsAddController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$centralColumns' => '@central_columns', '$structureController' => '@' . Table\StructureController::class, ], @@ -1407,7 +1174,6 @@ return [ 'class' => Table\Structure\CentralColumnsRemoveController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$centralColumns' => '@central_columns', '$structureController' => '@' . Table\StructureController::class, ], @@ -1416,7 +1182,6 @@ return [ 'class' => Table\Structure\ChangeController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$columnsDefinition' => '@table_columns_definition', '$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class, @@ -1426,7 +1191,6 @@ return [ 'class' => Table\Structure\FulltextController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$structureController' => '@' . Table\StructureController::class, '$indexes' => '@table_indexes', ], @@ -1439,7 +1203,6 @@ return [ 'class' => Table\Structure\PartitioningController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$createAddField' => '@create_add_field', '$structureController' => '@' . Table\StructureController::class, @@ -1450,7 +1213,6 @@ return [ 'class' => Table\Structure\PrimaryController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$structureController' => '@' . Table\StructureController::class, '$dbTableExists' => '@' . DbTableExists::class, @@ -1458,13 +1220,12 @@ return [ ], Table\Structure\ReservedWordCheckController::class => [ 'class' => Table\Structure\ReservedWordCheckController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template'], + 'arguments' => ['$response' => '@response'], ], Table\Structure\SaveController::class => [ 'class' => Table\Structure\SaveController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$relation' => '@relation', '$transformations' => '@transformations', '$dbi' => '@dbi', @@ -1476,7 +1237,6 @@ return [ 'class' => Table\Structure\SpatialController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$structureController' => '@' . Table\StructureController::class, '$indexes' => '@table_indexes', ], @@ -1485,7 +1245,6 @@ return [ 'class' => Table\Structure\UniqueController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$structureController' => '@' . Table\StructureController::class, '$indexes' => '@table_indexes', ], @@ -1506,7 +1265,6 @@ return [ 'class' => Table\TrackingController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$tracking' => '@tracking', '$trackingChecker' => '@tracking_checker', '$dbTableExists' => '@' . DbTableExists::class, @@ -1535,7 +1293,7 @@ return [ ], TableController::class => [ 'class' => TableController::class, - 'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'], + 'arguments' => ['$response' => '@response', '$dbi' => '@dbi'], ], ThemesController::class => [ 'class' => ThemesController::class, @@ -1549,24 +1307,18 @@ return [ 'class' => ThemeSetController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$themeManager' => '@' . PhpMyAdmin\Theme\ThemeManager::class, '$userPreferences' => '@user_preferences', ], ], Transformation\OverviewController::class => [ 'class' => Transformation\OverviewController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$transformations' => '@transformations', - ], + 'arguments' => ['$response' => '@response', '$transformations' => '@transformations'], ], Transformation\WrapperController::class => [ 'class' => Transformation\WrapperController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$transformations' => '@transformations', '$relation' => '@relation', '$dbi' => '@dbi', @@ -1575,26 +1327,16 @@ return [ ], UserPasswordController::class => [ 'class' => UserPasswordController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$userPassword' => '@user_password', - '$dbi' => '@dbi', - ], + 'arguments' => ['$response' => '@response', '$userPassword' => '@user_password', '$dbi' => '@dbi'], ], VersionCheckController::class => [ 'class' => VersionCheckController::class, - 'arguments' => [ - '$response' => '@response', - '$template' => '@template', - '$versionInformation' => '@version_information', - ], + 'arguments' => ['$response' => '@response', '$versionInformation' => '@version_information'], ], View\CreateController::class => [ 'class' => View\CreateController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$dbTableExists' => '@' . DbTableExists::class, ], @@ -1603,7 +1345,6 @@ return [ 'class' => Operations\ViewController::class, 'arguments' => [ '$response' => '@response', - '$template' => '@template', '$dbi' => '@dbi', '$dbTableExists' => '@' . DbTableExists::class, ], diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 761c905380..bc9108fd4d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1135,6 +1135,9 @@ getParam('db')]]> getParsedBodyParam('sql_query')]]> + + + @@ -1330,6 +1333,16 @@ + + + + + + + + + + getParsedBodyParam('add_prefix', '')]]> @@ -1359,10 +1372,18 @@ + + + + + + + + @@ -1404,6 +1425,11 @@ + + + + + @@ -1640,6 +1666,11 @@ + + + + + @@ -2042,6 +2073,11 @@ + + + + + @@ -2312,6 +2348,9 @@ + + + @@ -2515,6 +2554,11 @@ + + + + + @@ -3056,6 +3100,11 @@ + + + + + @@ -4051,6 +4100,9 @@ + + + diff --git a/src/Controllers/BrowseForeignersController.php b/src/Controllers/BrowseForeignersController.php index 3dd19ccb11..19b978797c 100644 --- a/src/Controllers/BrowseForeignersController.php +++ b/src/Controllers/BrowseForeignersController.php @@ -9,7 +9,6 @@ use PhpMyAdmin\ConfigStorage\Relation; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; /** * Display selection for relational field values @@ -18,7 +17,6 @@ final class BrowseForeignersController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly BrowseForeigners $browseForeigners, private readonly Relation $relation, ) { diff --git a/src/Controllers/ChangeLogController.php b/src/Controllers/ChangeLogController.php index f2d97b9889..a90c8afa9c 100644 --- a/src/Controllers/ChangeLogController.php +++ b/src/Controllers/ChangeLogController.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use function __; @@ -27,11 +26,8 @@ use function str_ends_with; final class ChangeLogController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Config $config, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Config $config) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/CheckRelationsController.php b/src/Controllers/CheckRelationsController.php index 8e863e6ccf..030d5f9c15 100644 --- a/src/Controllers/CheckRelationsController.php +++ b/src/Controllers/CheckRelationsController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use const SQL_DIR; @@ -20,11 +19,8 @@ use const SQL_DIR; */ final class CheckRelationsController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Relation $relation, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Relation $relation) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/CollationConnectionController.php b/src/Controllers/CollationConnectionController.php index 81a4db6476..ab6dcdcc22 100644 --- a/src/Controllers/CollationConnectionController.php +++ b/src/Controllers/CollationConnectionController.php @@ -8,16 +8,12 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; final class CollationConnectionController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Config $config, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Config $config) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/ColumnController.php b/src/Controllers/ColumnController.php index 2c1f5467a1..0482cfc384 100644 --- a/src/Controllers/ColumnController.php +++ b/src/Controllers/ColumnController.php @@ -9,15 +9,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class ColumnController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Console/Bookmark/AddController.php b/src/Controllers/Console/Bookmark/AddController.php index 935301231e..94ca587f8a 100644 --- a/src/Controllers/Console/Bookmark/AddController.php +++ b/src/Controllers/Console/Bookmark/AddController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function is_string; @@ -19,7 +18,6 @@ final class AddController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly BookmarkRepository $bookmarkRepository, ) { } diff --git a/src/Controllers/Console/Bookmark/RefreshController.php b/src/Controllers/Console/Bookmark/RefreshController.php index 81583c1c6e..cb6125f010 100644 --- a/src/Controllers/Console/Bookmark/RefreshController.php +++ b/src/Controllers/Console/Bookmark/RefreshController.php @@ -9,15 +9,11 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class RefreshController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Console $console, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Console $console) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Console/UpdateConfigController.php b/src/Controllers/Console/UpdateConfigController.php index 401e6b665a..846346be05 100644 --- a/src/Controllers/Console/UpdateConfigController.php +++ b/src/Controllers/Console/UpdateConfigController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function in_array; @@ -21,7 +20,6 @@ final class UpdateConfigController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Config $config, ) { } diff --git a/src/Controllers/Database/CentralColumns/PopulateColumnsController.php b/src/Controllers/Database/CentralColumns/PopulateColumnsController.php index c764bcdc3f..f78420fb0a 100644 --- a/src/Controllers/Database/CentralColumns/PopulateColumnsController.php +++ b/src/Controllers/Database/CentralColumns/PopulateColumnsController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Database\CentralColumns; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class PopulateColumnsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly CentralColumns $centralColumns, ) { } diff --git a/src/Controllers/Database/CentralColumnsController.php b/src/Controllers/Database/CentralColumnsController.php index 8cd7466ba7..1cebe88fbe 100644 --- a/src/Controllers/Database/CentralColumnsController.php +++ b/src/Controllers/Database/CentralColumnsController.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use function __; @@ -29,7 +28,6 @@ final class CentralColumnsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly CentralColumns $centralColumns, ) { } diff --git a/src/Controllers/Database/DataDictionaryController.php b/src/Controllers/Database/DataDictionaryController.php index e6df1787e2..f862132544 100644 --- a/src/Controllers/Database/DataDictionaryController.php +++ b/src/Controllers/Database/DataDictionaryController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Index; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; @@ -23,7 +22,6 @@ final class DataDictionaryController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Relation $relation, private readonly Transformations $transformations, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/Database/ExportController.php b/src/Controllers/Database/ExportController.php index f9c659a9e6..1335e0fc3e 100644 --- a/src/Controllers/Database/ExportController.php +++ b/src/Controllers/Database/ExportController.php @@ -17,7 +17,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -30,7 +29,6 @@ final class ExportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Export $export, private readonly Options $exportOptions, private readonly PageSettings $pageSettings, diff --git a/src/Controllers/Database/ImportController.php b/src/Controllers/Database/ImportController.php index 467cf4ce5a..3402e43720 100644 --- a/src/Controllers/Database/ImportController.php +++ b/src/Controllers/Database/ImportController.php @@ -21,7 +21,6 @@ use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -33,7 +32,6 @@ final class ImportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly PageSettings $pageSettings, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/Database/MultiTableQuery/QueryController.php b/src/Controllers/Database/MultiTableQuery/QueryController.php index 8a50d964eb..3e6f8dc3c1 100644 --- a/src/Controllers/Database/MultiTableQuery/QueryController.php +++ b/src/Controllers/Database/MultiTableQuery/QueryController.php @@ -9,11 +9,10 @@ use PhpMyAdmin\Database\MultiTableQuery; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class QueryController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Database/MultiTableQuery/TablesController.php b/src/Controllers/Database/MultiTableQuery/TablesController.php index b3709d71d0..d9ebe22988 100644 --- a/src/Controllers/Database/MultiTableQuery/TablesController.php +++ b/src/Controllers/Database/MultiTableQuery/TablesController.php @@ -10,18 +10,14 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function array_map; use function implode; final class TablesController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Database/PrivilegesController.php b/src/Controllers/Database/PrivilegesController.php index 379ab8d94a..9c71371a78 100644 --- a/src/Controllers/Database/PrivilegesController.php +++ b/src/Controllers/Database/PrivilegesController.php @@ -18,7 +18,6 @@ use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function __; @@ -31,7 +30,6 @@ final class PrivilegesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Privileges $privileges, private readonly DatabaseInterface $dbi, ) { diff --git a/src/Controllers/Database/SqlAutoCompleteController.php b/src/Controllers/Database/SqlAutoCompleteController.php index 759635e42c..f828a07b84 100644 --- a/src/Controllers/Database/SqlAutoCompleteController.php +++ b/src/Controllers/Database/SqlAutoCompleteController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function sprintf; @@ -22,7 +21,6 @@ final class SqlAutoCompleteController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly Config $config, ) { diff --git a/src/Controllers/Database/SqlController.php b/src/Controllers/Database/SqlController.php index 23619706a2..80c417d84a 100644 --- a/src/Controllers/Database/SqlController.php +++ b/src/Controllers/Database/SqlController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -29,7 +28,6 @@ class SqlController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly SqlQueryForm $sqlQueryForm, private readonly PageSettings $pageSettings, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/Database/SqlFormatController.php b/src/Controllers/Database/SqlFormatController.php index afbceaaa89..482171eca3 100644 --- a/src/Controllers/Database/SqlFormatController.php +++ b/src/Controllers/Database/SqlFormatController.php @@ -9,14 +9,13 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlParser\Utils\Formatter; -use PhpMyAdmin\Template; /** * Format SQL for SQL editors. */ final class SqlFormatController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Database/Structure/AddPrefixController.php b/src/Controllers/Database/Structure/AddPrefixController.php index 10f966ad50..d4a232c38e 100644 --- a/src/Controllers/Database/Structure/AddPrefixController.php +++ b/src/Controllers/Database/Structure/AddPrefixController.php @@ -9,13 +9,12 @@ use PhpMyAdmin\Current; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; final class AddPrefixController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Database/Structure/AddPrefixTableController.php b/src/Controllers/Database/Structure/AddPrefixTableController.php index c26ddb96cf..7bd114f7c7 100644 --- a/src/Controllers/Database/Structure/AddPrefixTableController.php +++ b/src/Controllers/Database/Structure/AddPrefixTableController.php @@ -11,15 +11,11 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; -use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; final class AddPrefixTableController implements InvocableController { public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Database/Structure/CentralColumns/AddController.php b/src/Controllers/Database/Structure/CentralColumns/AddController.php index 1d00d7dd6e..efc58fa207 100644 --- a/src/Controllers/Database/Structure/CentralColumns/AddController.php +++ b/src/Controllers/Database/Structure/CentralColumns/AddController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use function __; @@ -23,7 +22,6 @@ final class AddController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php b/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php index 0d5f97f3b2..b838aaef94 100644 --- a/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php +++ b/src/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use function __; @@ -23,7 +22,6 @@ final class MakeConsistentController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Database/Structure/CentralColumns/RemoveController.php b/src/Controllers/Database/Structure/CentralColumns/RemoveController.php index d636347f2a..7e485cbd28 100644 --- a/src/Controllers/Database/Structure/CentralColumns/RemoveController.php +++ b/src/Controllers/Database/Structure/CentralColumns/RemoveController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use function __; @@ -22,7 +21,6 @@ final class RemoveController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Database/Structure/ChangePrefixFormController.php b/src/Controllers/Database/Structure/ChangePrefixFormController.php index 25560f8505..c034db49fd 100644 --- a/src/Controllers/Database/Structure/ChangePrefixFormController.php +++ b/src/Controllers/Database/Structure/ChangePrefixFormController.php @@ -9,13 +9,12 @@ use PhpMyAdmin\Current; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; final class ChangePrefixFormController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Database/Structure/CopyFormController.php b/src/Controllers/Database/Structure/CopyFormController.php index a674e257c2..00b4b5ae20 100644 --- a/src/Controllers/Database/Structure/CopyFormController.php +++ b/src/Controllers/Database/Structure/CopyFormController.php @@ -10,13 +10,12 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; final class CopyFormController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Database/Structure/CopyTableController.php b/src/Controllers/Database/Structure/CopyTableController.php index 16b7182338..1f26e26f16 100644 --- a/src/Controllers/Database/Structure/CopyTableController.php +++ b/src/Controllers/Database/Structure/CopyTableController.php @@ -11,16 +11,12 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; -use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Table; -use PhpMyAdmin\Template; use PhpMyAdmin\UserPrivilegesFactory; final class CopyTableController implements InvocableController { public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Operations $operations, private readonly StructureController $structureController, private readonly UserPrivilegesFactory $userPrivilegesFactory, diff --git a/src/Controllers/Database/Structure/CopyTableWithPrefixController.php b/src/Controllers/Database/Structure/CopyTableWithPrefixController.php index da71a7ca7d..7a6f85150a 100644 --- a/src/Controllers/Database/Structure/CopyTableWithPrefixController.php +++ b/src/Controllers/Database/Structure/CopyTableWithPrefixController.php @@ -10,20 +10,15 @@ use PhpMyAdmin\Current; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; -use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Table; -use PhpMyAdmin\Template; use function mb_strlen; use function mb_substr; final class CopyTableWithPrefixController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly StructureController $structureController, - ) { + public function __construct(private readonly StructureController $structureController) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Database/Structure/DropFormController.php b/src/Controllers/Database/Structure/DropFormController.php index c31297b65b..256afcf84b 100644 --- a/src/Controllers/Database/Structure/DropFormController.php +++ b/src/Controllers/Database/Structure/DropFormController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -19,11 +18,8 @@ use function htmlspecialchars; final class DropFormController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Database/Structure/DropTableController.php b/src/Controllers/Database/Structure/DropTableController.php index 6c4bf6bdf6..da04e3a839 100644 --- a/src/Controllers/Database/Structure/DropTableController.php +++ b/src/Controllers/Database/Structure/DropTableController.php @@ -12,8 +12,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; -use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -22,8 +20,6 @@ use function __; final class DropTableController implements InvocableController { public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly RelationCleanup $relationCleanup, private readonly StructureController $structureController, diff --git a/src/Controllers/Database/Structure/EmptyFormController.php b/src/Controllers/Database/Structure/EmptyFormController.php index 69b91f2f47..e9af3a2c93 100644 --- a/src/Controllers/Database/Structure/EmptyFormController.php +++ b/src/Controllers/Database/Structure/EmptyFormController.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Current; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -18,7 +17,7 @@ use function htmlspecialchars; final class EmptyFormController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Database/Structure/RealRowCountController.php b/src/Controllers/Database/Structure/RealRowCountController.php index 8d3eaaf03d..56002eeef3 100644 --- a/src/Controllers/Database/Structure/RealRowCountController.php +++ b/src/Controllers/Database/Structure/RealRowCountController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -27,7 +26,6 @@ final class RealRowCountController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly DbTableExists $dbTableExists, ) { diff --git a/src/Controllers/Database/Structure/ReplacePrefixController.php b/src/Controllers/Database/Structure/ReplacePrefixController.php index d6a3a40b38..e9e92868da 100644 --- a/src/Controllers/Database/Structure/ReplacePrefixController.php +++ b/src/Controllers/Database/Structure/ReplacePrefixController.php @@ -11,8 +11,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; -use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function mb_strlen; @@ -21,8 +19,6 @@ use function mb_substr; final class ReplacePrefixController implements InvocableController { public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Database/TrackingController.php b/src/Controllers/Database/TrackingController.php index bb7e660d65..a926516123 100644 --- a/src/Controllers/Database/TrackingController.php +++ b/src/Controllers/Database/TrackingController.php @@ -17,7 +17,6 @@ use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Tracking\Tracking; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -33,7 +32,6 @@ final class TrackingController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Tracking $tracking, private readonly DatabaseInterface $dbi, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/DatabaseController.php b/src/Controllers/DatabaseController.php index 0c762dcad3..b8d6489983 100644 --- a/src/Controllers/DatabaseController.php +++ b/src/Controllers/DatabaseController.php @@ -8,15 +8,11 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class DatabaseController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Export/CheckTimeOutController.php b/src/Controllers/Export/CheckTimeOutController.php index d70cc20a0c..b79625a93e 100644 --- a/src/Controllers/Export/CheckTimeOutController.php +++ b/src/Controllers/Export/CheckTimeOutController.php @@ -8,11 +8,10 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class CheckTimeOutController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php index 135c268c07..5aeaca34aa 100644 --- a/src/Controllers/Export/ExportController.php +++ b/src/Controllers/Export/ExportController.php @@ -24,7 +24,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sanitize; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use Webmozart\Assert\Assert; @@ -40,11 +39,8 @@ use function time; final class ExportController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Export $export, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Export $export) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Export/TablesController.php b/src/Controllers/Export/TablesController.php index 48b8dba055..5af846ff2c 100644 --- a/src/Controllers/Export/TablesController.php +++ b/src/Controllers/Export/TablesController.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; @@ -17,7 +16,6 @@ final class TablesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly ExportController $exportController, ) { } diff --git a/src/Controllers/Export/Template/DeleteController.php b/src/Controllers/Export/Template/DeleteController.php index e4103b1f34..7426102fc8 100644 --- a/src/Controllers/Export/Template/DeleteController.php +++ b/src/Controllers/Export/Template/DeleteController.php @@ -11,13 +11,11 @@ use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class DeleteController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly TemplateModel $model, private readonly Relation $relation, ) { diff --git a/src/Controllers/Export/Template/LoadController.php b/src/Controllers/Export/Template/LoadController.php index 10886da406..7d494df24f 100644 --- a/src/Controllers/Export/Template/LoadController.php +++ b/src/Controllers/Export/Template/LoadController.php @@ -12,13 +12,11 @@ use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class LoadController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly TemplateModel $model, private readonly Relation $relation, ) { diff --git a/src/Controllers/Export/Template/UpdateController.php b/src/Controllers/Export/Template/UpdateController.php index 28f8251dda..1296ac94b6 100644 --- a/src/Controllers/Export/Template/UpdateController.php +++ b/src/Controllers/Export/Template/UpdateController.php @@ -12,13 +12,11 @@ use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class UpdateController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly TemplateModel $model, private readonly Relation $relation, ) { diff --git a/src/Controllers/GitInfoController.php b/src/Controllers/GitInfoController.php index cb428e92da..eb3ff83807 100644 --- a/src/Controllers/GitInfoController.php +++ b/src/Controllers/GitInfoController.php @@ -9,18 +9,14 @@ use PhpMyAdmin\Git; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function strtotime; final class GitInfoController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Config $config, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Config $config) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/HomeController.php b/src/Controllers/HomeController.php index 57c33c7977..20e6f1d2ae 100644 --- a/src/Controllers/HomeController.php +++ b/src/Controllers/HomeController.php @@ -24,7 +24,6 @@ use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Select; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -52,7 +51,6 @@ final class HomeController implements InvocableController public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Config $config, private readonly ThemeManager $themeManager, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php index 538d86127e..c68169b181 100644 --- a/src/Controllers/Import/ImportController.php +++ b/src/Controllers/Import/ImportController.php @@ -24,7 +24,6 @@ use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\Plugins\Import\ImportFormat; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -52,7 +51,6 @@ final class ImportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Import $import, private readonly Sql $sql, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/Import/SimulateDmlController.php b/src/Controllers/Import/SimulateDmlController.php index 2accf717e7..0d26308e34 100644 --- a/src/Controllers/Import/SimulateDmlController.php +++ b/src/Controllers/Import/SimulateDmlController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\DeleteStatement; use PhpMyAdmin\SqlParser\Statements\UpdateStatement; use PhpMyAdmin\SqlParser\Utils\Query; -use PhpMyAdmin\Template; use function __; use function count; @@ -22,11 +21,8 @@ use function explode; final class SimulateDmlController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly SimulateDml $simulateDml, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly SimulateDml $simulateDml) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/LicenseController.php b/src/Controllers/LicenseController.php index b1b1ce305c..962a8929bb 100644 --- a/src/Controllers/LicenseController.php +++ b/src/Controllers/LicenseController.php @@ -10,7 +10,6 @@ namespace PhpMyAdmin\Controllers; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function is_readable; @@ -22,7 +21,7 @@ use function readfile; */ final class LicenseController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/LintController.php b/src/Controllers/LintController.php index d9aeea968f..96b76a138c 100644 --- a/src/Controllers/LintController.php +++ b/src/Controllers/LintController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Linter; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function header; use function is_array; @@ -24,7 +23,7 @@ use function sprintf; */ final class LintController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Navigation/UpdateNavWidthConfigController.php b/src/Controllers/Navigation/UpdateNavWidthConfigController.php index fbdf19c6c4..63fd7b3787 100644 --- a/src/Controllers/Navigation/UpdateNavWidthConfigController.php +++ b/src/Controllers/Navigation/UpdateNavWidthConfigController.php @@ -10,18 +10,14 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function is_numeric; final class UpdateNavWidthConfigController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Config $config, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Config $config) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/NavigationController.php b/src/Controllers/NavigationController.php index f34ae8663e..07c4ff7a87 100644 --- a/src/Controllers/NavigationController.php +++ b/src/Controllers/NavigationController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Navigation\Navigation; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Utils\SessionCache; use function __; @@ -25,7 +24,6 @@ final class NavigationController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Navigation $navigation, private readonly Relation $relation, private readonly PageSettings $pageSettings, diff --git a/src/Controllers/Normalization/AddNewPrimaryController.php b/src/Controllers/Normalization/AddNewPrimaryController.php index 31d11d47b3..bd7c184f71 100644 --- a/src/Controllers/Normalization/AddNewPrimaryController.php +++ b/src/Controllers/Normalization/AddNewPrimaryController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; @@ -20,7 +19,6 @@ final class AddNewPrimaryController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, private readonly UserPrivilegesFactory $userPrivilegesFactory, ) { diff --git a/src/Controllers/Normalization/CreateNewColumnController.php b/src/Controllers/Normalization/CreateNewColumnController.php index f2a4ee56e3..521a5e1354 100644 --- a/src/Controllers/Normalization/CreateNewColumnController.php +++ b/src/Controllers/Normalization/CreateNewColumnController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; @@ -20,7 +19,6 @@ final class CreateNewColumnController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, private readonly UserPrivilegesFactory $userPrivilegesFactory, ) { diff --git a/src/Controllers/Normalization/FirstNormalForm/FirstStepController.php b/src/Controllers/Normalization/FirstNormalForm/FirstStepController.php index b9c6fc28ea..70b36c3af8 100644 --- a/src/Controllers/Normalization/FirstNormalForm/FirstStepController.php +++ b/src/Controllers/Normalization/FirstNormalForm/FirstStepController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function in_array; @@ -18,7 +17,6 @@ final class FirstStepController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/FirstNormalForm/FourthStepController.php b/src/Controllers/Normalization/FirstNormalForm/FourthStepController.php index f42ad49177..327f05e27b 100644 --- a/src/Controllers/Normalization/FirstNormalForm/FourthStepController.php +++ b/src/Controllers/Normalization/FirstNormalForm/FourthStepController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class FourthStepController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/FirstNormalForm/SecondStepController.php b/src/Controllers/Normalization/FirstNormalForm/SecondStepController.php index 8f23202e6b..5122e3f66a 100644 --- a/src/Controllers/Normalization/FirstNormalForm/SecondStepController.php +++ b/src/Controllers/Normalization/FirstNormalForm/SecondStepController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class SecondStepController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php b/src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php index 1805094710..b9be0dfaf9 100644 --- a/src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php +++ b/src/Controllers/Normalization/FirstNormalForm/ThirdStepController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class ThirdStepController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/GetColumnsController.php b/src/Controllers/Normalization/GetColumnsController.php index e3e34eeec7..f1e63709e5 100644 --- a/src/Controllers/Normalization/GetColumnsController.php +++ b/src/Controllers/Normalization/GetColumnsController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function _pgettext; @@ -19,7 +18,6 @@ final class GetColumnsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/MainController.php b/src/Controllers/Normalization/MainController.php index 69f5a136c0..8b48de5813 100644 --- a/src/Controllers/Normalization/MainController.php +++ b/src/Controllers/Normalization/MainController.php @@ -9,14 +9,13 @@ use PhpMyAdmin\Current; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; /** * Normalization process (temporarily specific to 1NF). */ final class MainController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Normalization/MoveRepeatingGroup.php b/src/Controllers/Normalization/MoveRepeatingGroup.php index f334f11c43..fc2064e8ae 100644 --- a/src/Controllers/Normalization/MoveRepeatingGroup.php +++ b/src/Controllers/Normalization/MoveRepeatingGroup.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class MoveRepeatingGroup implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/PartialDependenciesController.php b/src/Controllers/Normalization/PartialDependenciesController.php index 40684138a4..45e4003230 100644 --- a/src/Controllers/Normalization/PartialDependenciesController.php +++ b/src/Controllers/Normalization/PartialDependenciesController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class PartialDependenciesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php b/src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php index f29070f0a8..e67241925f 100644 --- a/src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php +++ b/src/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function json_decode; @@ -18,7 +17,6 @@ final class CreateNewTablesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/SecondNormalForm/FirstStepController.php b/src/Controllers/Normalization/SecondNormalForm/FirstStepController.php index c176f85e71..a761c98eea 100644 --- a/src/Controllers/Normalization/SecondNormalForm/FirstStepController.php +++ b/src/Controllers/Normalization/SecondNormalForm/FirstStepController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class FirstStepController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/SecondNormalForm/NewTablesController.php b/src/Controllers/Normalization/SecondNormalForm/NewTablesController.php index 808db8f0cb..de8c306a03 100644 --- a/src/Controllers/Normalization/SecondNormalForm/NewTablesController.php +++ b/src/Controllers/Normalization/SecondNormalForm/NewTablesController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function json_decode; @@ -18,7 +17,6 @@ final class NewTablesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php b/src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php index cb504a9d51..5f5fd6ecbe 100644 --- a/src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php +++ b/src/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function json_decode; @@ -18,7 +17,6 @@ final class CreateNewTablesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/ThirdNormalForm/FirstStepController.php b/src/Controllers/Normalization/ThirdNormalForm/FirstStepController.php index 95bdaefaa5..5168d900b7 100644 --- a/src/Controllers/Normalization/ThirdNormalForm/FirstStepController.php +++ b/src/Controllers/Normalization/ThirdNormalForm/FirstStepController.php @@ -10,13 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class FirstStepController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php b/src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php index 9f2e1dd9d7..d6eaad6c0a 100644 --- a/src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php +++ b/src/Controllers/Normalization/ThirdNormalForm/NewTablesController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Normalization; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function json_decode; @@ -18,7 +17,6 @@ final class NewTablesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Normalization $normalization, ) { } diff --git a/src/Controllers/Operations/Database/CollationController.php b/src/Controllers/Operations/Database/CollationController.php index df9dc85280..6212288fac 100644 --- a/src/Controllers/Operations/Database/CollationController.php +++ b/src/Controllers/Operations/Database/CollationController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\Operations; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -25,7 +24,6 @@ final class CollationController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Operations $operations, private readonly DatabaseInterface $dbi, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/Operations/DatabaseController.php b/src/Controllers/Operations/DatabaseController.php index f3c1aabce1..761464d160 100644 --- a/src/Controllers/Operations/DatabaseController.php +++ b/src/Controllers/Operations/DatabaseController.php @@ -22,7 +22,6 @@ use PhpMyAdmin\Operations; use PhpMyAdmin\Plugins; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Util; @@ -37,7 +36,6 @@ final class DatabaseController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Operations $operations, private readonly UserPrivilegesFactory $userPrivilegesFactory, private readonly Relation $relation, diff --git a/src/Controllers/Operations/TableController.php b/src/Controllers/Operations/TableController.php index e30600efeb..6bcec0df3e 100644 --- a/src/Controllers/Operations/TableController.php +++ b/src/Controllers/Operations/TableController.php @@ -24,7 +24,6 @@ use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\StorageEngine; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Util; @@ -44,7 +43,6 @@ final class TableController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Operations $operations, private readonly UserPrivilegesFactory $userPrivilegesFactory, private readonly Relation $relation, diff --git a/src/Controllers/Operations/ViewController.php b/src/Controllers/Operations/ViewController.php index e8000d61ef..3afcf62558 100644 --- a/src/Controllers/Operations/ViewController.php +++ b/src/Controllers/Operations/ViewController.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -32,7 +31,6 @@ final class ViewController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly DbTableExists $dbTableExists, ) { diff --git a/src/Controllers/PhpInfoController.php b/src/Controllers/PhpInfoController.php index c34ea473c5..289e03b686 100644 --- a/src/Controllers/PhpInfoController.php +++ b/src/Controllers/PhpInfoController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function phpinfo; @@ -24,7 +23,7 @@ use const INFO_MODULES; */ final class PhpInfoController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Preferences/ExportController.php b/src/Controllers/Preferences/ExportController.php index c9b931ffc2..8069ef17ab 100644 --- a/src/Controllers/Preferences/ExportController.php +++ b/src/Controllers/Preferences/ExportController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; @@ -27,7 +26,6 @@ final class ExportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/FeaturesController.php b/src/Controllers/Preferences/FeaturesController.php index 22872843fc..f7b7f6b39d 100644 --- a/src/Controllers/Preferences/FeaturesController.php +++ b/src/Controllers/Preferences/FeaturesController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; @@ -27,7 +26,6 @@ final class FeaturesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/ImportController.php b/src/Controllers/Preferences/ImportController.php index a3773ec95e..08d9ca992c 100644 --- a/src/Controllers/Preferences/ImportController.php +++ b/src/Controllers/Preferences/ImportController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; @@ -27,7 +26,6 @@ final class ImportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/MainPanelController.php b/src/Controllers/Preferences/MainPanelController.php index e633f3d862..fdc96b7002 100644 --- a/src/Controllers/Preferences/MainPanelController.php +++ b/src/Controllers/Preferences/MainPanelController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; @@ -27,7 +26,6 @@ final class MainPanelController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/ManageController.php b/src/Controllers/Preferences/ManageController.php index 4cf403e828..355359f253 100644 --- a/src/Controllers/Preferences/ManageController.php +++ b/src/Controllers/Preferences/ManageController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\UserPreferences; use PhpMyAdmin\Util; @@ -48,7 +47,6 @@ final class ManageController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/NavigationController.php b/src/Controllers/Preferences/NavigationController.php index 64ff1f2ee3..e11b055278 100644 --- a/src/Controllers/Preferences/NavigationController.php +++ b/src/Controllers/Preferences/NavigationController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; @@ -27,7 +26,6 @@ final class NavigationController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/SqlController.php b/src/Controllers/Preferences/SqlController.php index eb247f4af6..f443b730e7 100644 --- a/src/Controllers/Preferences/SqlController.php +++ b/src/Controllers/Preferences/SqlController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\TwoFactor; use PhpMyAdmin\Url; @@ -27,7 +26,6 @@ final class SqlController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPreferences $userPreferences, private readonly Relation $relation, private readonly Config $config, diff --git a/src/Controllers/Preferences/TwoFactorController.php b/src/Controllers/Preferences/TwoFactorController.php index 34e065c795..57868c2a53 100644 --- a/src/Controllers/Preferences/TwoFactorController.php +++ b/src/Controllers/Preferences/TwoFactorController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\TwoFactor; use function __; @@ -20,11 +19,8 @@ use function define; final class TwoFactorController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Relation $relation, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Relation $relation) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/RecentTablesListController.php b/src/Controllers/RecentTablesListController.php index ee664691d6..b0538284c0 100644 --- a/src/Controllers/RecentTablesListController.php +++ b/src/Controllers/RecentTablesListController.php @@ -9,11 +9,10 @@ use PhpMyAdmin\Favorites\TableType; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class RecentTablesListController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Server/BinlogController.php b/src/Controllers/Server/BinlogController.php index cf678c03ab..bca545975f 100644 --- a/src/Controllers/Server/BinlogController.php +++ b/src/Controllers/Server/BinlogController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -30,11 +29,8 @@ final class BinlogController implements InvocableController */ private array $binaryLogs; - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { $this->binaryLogs = $this->dbi->fetchResult('SHOW MASTER LOGS', 'Log_name'); } diff --git a/src/Controllers/Server/CollationsController.php b/src/Controllers/Server/CollationsController.php index 7492e3af6e..e2681ce693 100644 --- a/src/Controllers/Server/CollationsController.php +++ b/src/Controllers/Server/CollationsController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; /** @@ -33,7 +32,6 @@ final class CollationsController implements InvocableController */ public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, array|null $charsets = null, array|null $collations = null, diff --git a/src/Controllers/Server/Databases/CreateController.php b/src/Controllers/Server/Databases/CreateController.php index a6ba8c761a..b08160aab8 100644 --- a/src/Controllers/Server/Databases/CreateController.php +++ b/src/Controllers/Server/Databases/CreateController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -27,11 +26,8 @@ use function str_contains; final class CreateController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Server/Databases/DestroyController.php b/src/Controllers/Server/Databases/DestroyController.php index b0e09ea877..a1d72ef55d 100644 --- a/src/Controllers/Server/Databases/DestroyController.php +++ b/src/Controllers/Server/Databases/DestroyController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; @@ -27,7 +26,6 @@ final class DestroyController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly Transformations $transformations, private readonly RelationCleanup $relationCleanup, diff --git a/src/Controllers/Server/DatabasesController.php b/src/Controllers/Server/DatabasesController.php index 5f825cdf7b..74a23e1bb1 100644 --- a/src/Controllers/Server/DatabasesController.php +++ b/src/Controllers/Server/DatabasesController.php @@ -16,7 +16,6 @@ use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Query\Utilities; use PhpMyAdmin\Replication\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; use PhpMyAdmin\Util; @@ -62,7 +61,6 @@ final class DatabasesController implements InvocableController public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly UserPrivilegesFactory $userPrivilegesFactory, ) { diff --git a/src/Controllers/Server/EnginesController.php b/src/Controllers/Server/EnginesController.php index a978af1acd..22a3fb4ffb 100644 --- a/src/Controllers/Server/EnginesController.php +++ b/src/Controllers/Server/EnginesController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\StorageEngine; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; /** @@ -18,11 +17,8 @@ use PhpMyAdmin\Url; */ final class EnginesController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Server/ExportController.php b/src/Controllers/Server/ExportController.php index 961b83728b..ccd577879d 100644 --- a/src/Controllers/Server/ExportController.php +++ b/src/Controllers/Server/ExportController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use function __; @@ -24,7 +23,6 @@ final class ExportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Options $export, private readonly DatabaseInterface $dbi, private readonly PageSettings $pageSettings, diff --git a/src/Controllers/Server/ImportController.php b/src/Controllers/Server/ImportController.php index 25d3103516..a221bf5a71 100644 --- a/src/Controllers/Server/ImportController.php +++ b/src/Controllers/Server/ImportController.php @@ -19,7 +19,6 @@ use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -31,7 +30,6 @@ final class ImportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly PageSettings $pageSettings, ) { diff --git a/src/Controllers/Server/PluginsController.php b/src/Controllers/Server/PluginsController.php index 3006e3400f..da79b628f6 100644 --- a/src/Controllers/Server/PluginsController.php +++ b/src/Controllers/Server/PluginsController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Plugins; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use function array_keys; @@ -25,7 +24,6 @@ final class PluginsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Plugins $plugins, private readonly DatabaseInterface $dbi, ) { diff --git a/src/Controllers/Server/Privileges/AccountLockController.php b/src/Controllers/Server/Privileges/AccountLockController.php index 905128df09..5ddcc6bf04 100644 --- a/src/Controllers/Server/Privileges/AccountLockController.php +++ b/src/Controllers/Server/Privileges/AccountLockController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges\AccountLocking; -use PhpMyAdmin\Template; use Throwable; use function __; @@ -20,7 +19,6 @@ final class AccountLockController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly AccountLocking $accountLocking, ) { } diff --git a/src/Controllers/Server/Privileges/AccountUnlockController.php b/src/Controllers/Server/Privileges/AccountUnlockController.php index a7bad3e3c0..5b68f9a268 100644 --- a/src/Controllers/Server/Privileges/AccountUnlockController.php +++ b/src/Controllers/Server/Privileges/AccountUnlockController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges\AccountLocking; -use PhpMyAdmin\Template; use Throwable; use function __; @@ -20,7 +19,6 @@ final class AccountUnlockController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly AccountLocking $accountLocking, ) { } diff --git a/src/Controllers/Server/ReplicationController.php b/src/Controllers/Server/ReplicationController.php index 76b99053c8..782a18bc2f 100644 --- a/src/Controllers/Server/ReplicationController.php +++ b/src/Controllers/Server/ReplicationController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Replication\ReplicationGui; use PhpMyAdmin\Replication\ReplicationInfo; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use function is_array; @@ -26,7 +25,6 @@ final class ReplicationController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly ReplicationGui $replicationGui, private readonly DatabaseInterface $dbi, ) { diff --git a/src/Controllers/Server/ShowEngineController.php b/src/Controllers/Server/ShowEngineController.php index 46b032b934..b3a12eabad 100644 --- a/src/Controllers/Server/ShowEngineController.php +++ b/src/Controllers/Server/ShowEngineController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\StorageEngine; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use function is_array; @@ -24,11 +23,8 @@ final class ShowEngineController implements InvocableController private string $engine = ''; private string $page = ''; - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Server/SqlController.php b/src/Controllers/Server/SqlController.php index 5a6ac36349..b63af0d444 100644 --- a/src/Controllers/Server/SqlController.php +++ b/src/Controllers/Server/SqlController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; /** @@ -21,7 +20,6 @@ final class SqlController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly SqlQueryForm $sqlQueryForm, private readonly DatabaseInterface $dbi, private readonly PageSettings $pageSettings, diff --git a/src/Controllers/Server/UserGroupsController.php b/src/Controllers/Server/UserGroupsController.php index 1113b87eb5..fc4776c174 100644 --- a/src/Controllers/Server/UserGroupsController.php +++ b/src/Controllers/Server/UserGroupsController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function is_string; @@ -24,7 +23,6 @@ final class UserGroupsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Relation $relation, private readonly DatabaseInterface $dbi, ) { diff --git a/src/Controllers/Server/Variables/GetVariableController.php b/src/Controllers/Server/Variables/GetVariableController.php index 41b17fd10a..ff29d70573 100644 --- a/src/Controllers/Server/Variables/GetVariableController.php +++ b/src/Controllers/Server/Variables/GetVariableController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Providers\ServerVariables\ServerVariablesProvider; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function implode; @@ -19,11 +18,8 @@ use function is_string; final class GetVariableController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Sql/ColumnPreferencesController.php b/src/Controllers/Sql/ColumnPreferencesController.php index 402ce59b72..5623de7f49 100644 --- a/src/Controllers/Sql/ColumnPreferencesController.php +++ b/src/Controllers/Sql/ColumnPreferencesController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Table; -use PhpMyAdmin\Template; use function array_map; use function explode; @@ -21,11 +20,8 @@ use function is_string; final class ColumnPreferencesController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Sql/DefaultForeignKeyCheckValueController.php b/src/Controllers/Sql/DefaultForeignKeyCheckValueController.php index 6a7e271bca..819f242bb5 100644 --- a/src/Controllers/Sql/DefaultForeignKeyCheckValueController.php +++ b/src/Controllers/Sql/DefaultForeignKeyCheckValueController.php @@ -8,12 +8,11 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Utils\ForeignKey; final class DefaultForeignKeyCheckValueController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Sql/RelationalValuesController.php b/src/Controllers/Sql/RelationalValuesController.php index 25b8b356f0..73a0744216 100644 --- a/src/Controllers/Sql/RelationalValuesController.php +++ b/src/Controllers/Sql/RelationalValuesController.php @@ -10,15 +10,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; -use PhpMyAdmin\Template; final class RelationalValuesController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Sql $sql, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Sql $sql) + { } /** diff --git a/src/Controllers/Sql/SqlController.php b/src/Controllers/Sql/SqlController.php index 8d23f7cc90..46fc361c41 100644 --- a/src/Controllers/Sql/SqlController.php +++ b/src/Controllers/Sql/SqlController.php @@ -18,7 +18,6 @@ use PhpMyAdmin\Message; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -31,7 +30,6 @@ class SqlController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Sql $sql, private readonly DatabaseInterface $dbi, private readonly PageSettings $pageSettings, diff --git a/src/Controllers/Table/AddFieldController.php b/src/Controllers/Table/AddFieldController.php index 5795ee28a2..118af2e9b3 100644 --- a/src/Controllers/Table/AddFieldController.php +++ b/src/Controllers/Table/AddFieldController.php @@ -19,7 +19,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\ColumnsDefinition; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; @@ -38,7 +37,6 @@ final class AddFieldController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Transformations $transformations, private readonly Config $config, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/Table/ChangeRowsController.php b/src/Controllers/Table/ChangeRowsController.php index 56146cf43e..dbf33e7ec5 100644 --- a/src/Controllers/Table/ChangeRowsController.php +++ b/src/Controllers/Table/ChangeRowsController.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function array_values; @@ -18,7 +17,6 @@ final class ChangeRowsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly ChangeController $changeController, ) { } diff --git a/src/Controllers/Table/ChartController.php b/src/Controllers/Table/ChartController.php index 054c7b5907..16c944e51f 100644 --- a/src/Controllers/Table/ChartController.php +++ b/src/Controllers/Table/ChartController.php @@ -20,7 +20,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlParser\Components\Limit; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -37,7 +36,6 @@ final class ChartController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly DbTableExists $dbTableExists, ) { diff --git a/src/Controllers/Table/CreateController.php b/src/Controllers/Table/CreateController.php index 94c704095d..d464a058e9 100644 --- a/src/Controllers/Table/CreateController.php +++ b/src/Controllers/Table/CreateController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\ColumnsDefinition; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivilegesFactory; @@ -35,7 +34,6 @@ final class CreateController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Transformations $transformations, private readonly Config $config, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/Table/DeleteConfirmController.php b/src/Controllers/Table/DeleteConfirmController.php index 13fa085112..d0b33d73aa 100644 --- a/src/Controllers/Table/DeleteConfirmController.php +++ b/src/Controllers/Table/DeleteConfirmController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -26,7 +25,6 @@ final class DeleteConfirmController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DbTableExists $dbTableExists, ) { } diff --git a/src/Controllers/Table/DropColumnConfirmationController.php b/src/Controllers/Table/DropColumnConfirmationController.php index bb666cbf21..d32ca7eaa2 100644 --- a/src/Controllers/Table/DropColumnConfirmationController.php +++ b/src/Controllers/Table/DropColumnConfirmationController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\InvalidIdentifier; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -24,7 +23,6 @@ final class DropColumnConfirmationController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DbTableExists $dbTableExists, ) { } diff --git a/src/Controllers/Table/DropColumnController.php b/src/Controllers/Table/DropColumnController.php index 65b9e3c09b..0b99e748e3 100644 --- a/src/Controllers/Table/DropColumnController.php +++ b/src/Controllers/Table/DropColumnController.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function __; @@ -24,7 +23,6 @@ final class DropColumnController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly FlashMessages $flash, private readonly RelationCleanup $relationCleanup, diff --git a/src/Controllers/Table/ExportController.php b/src/Controllers/Table/ExportController.php index 05ceca6483..806214febc 100644 --- a/src/Controllers/Table/ExportController.php +++ b/src/Controllers/Table/ExportController.php @@ -17,7 +17,6 @@ use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Utils\Query; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -30,7 +29,6 @@ class ExportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Options $export, private readonly PageSettings $pageSettings, ) { diff --git a/src/Controllers/Table/ExportRowsController.php b/src/Controllers/Table/ExportRowsController.php index 7d9a3a42e4..f3b4764c25 100644 --- a/src/Controllers/Table/ExportRowsController.php +++ b/src/Controllers/Table/ExportRowsController.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; use function array_values; @@ -18,7 +17,6 @@ final class ExportRowsController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly ExportController $exportController, ) { } diff --git a/src/Controllers/Table/GetFieldController.php b/src/Controllers/Table/GetFieldController.php index 1a521c8f18..e23cc4ca3e 100644 --- a/src/Controllers/Table/GetFieldController.php +++ b/src/Controllers/Table/GetFieldController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Mime; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function __; @@ -28,11 +27,8 @@ use function sprintf; */ final class GetFieldController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/ImportController.php b/src/Controllers/Table/ImportController.php index 931b71031c..c2aea7eabf 100644 --- a/src/Controllers/Table/ImportController.php +++ b/src/Controllers/Table/ImportController.php @@ -22,7 +22,6 @@ use PhpMyAdmin\Import\ImportSettings; use PhpMyAdmin\Message; use PhpMyAdmin\Plugins; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; use PhpMyAdmin\Utils\ForeignKey; @@ -34,7 +33,6 @@ final class ImportController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly PageSettings $pageSettings, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/Table/Maintenance/AnalyzeController.php b/src/Controllers/Table/Maintenance/AnalyzeController.php index ffac1831cd..3600a2feb0 100644 --- a/src/Controllers/Table/Maintenance/AnalyzeController.php +++ b/src/Controllers/Table/Maintenance/AnalyzeController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -26,7 +25,6 @@ final class AnalyzeController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Maintenance $model, private readonly Config $config, ) { diff --git a/src/Controllers/Table/Maintenance/CheckController.php b/src/Controllers/Table/Maintenance/CheckController.php index a5a394f9a2..edf1621477 100644 --- a/src/Controllers/Table/Maintenance/CheckController.php +++ b/src/Controllers/Table/Maintenance/CheckController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -26,7 +25,6 @@ final class CheckController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Maintenance $model, private readonly Config $config, ) { diff --git a/src/Controllers/Table/Maintenance/ChecksumController.php b/src/Controllers/Table/Maintenance/ChecksumController.php index a235d5080d..cc4ee31b90 100644 --- a/src/Controllers/Table/Maintenance/ChecksumController.php +++ b/src/Controllers/Table/Maintenance/ChecksumController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -26,7 +25,6 @@ final class ChecksumController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Maintenance $model, private readonly Config $config, ) { diff --git a/src/Controllers/Table/Maintenance/OptimizeController.php b/src/Controllers/Table/Maintenance/OptimizeController.php index dff58d9523..460a8ee7f6 100644 --- a/src/Controllers/Table/Maintenance/OptimizeController.php +++ b/src/Controllers/Table/Maintenance/OptimizeController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -26,7 +25,6 @@ final class OptimizeController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Maintenance $model, private readonly Config $config, ) { diff --git a/src/Controllers/Table/Maintenance/RepairController.php b/src/Controllers/Table/Maintenance/RepairController.php index e7c02ce363..ea71ffdee6 100644 --- a/src/Controllers/Table/Maintenance/RepairController.php +++ b/src/Controllers/Table/Maintenance/RepairController.php @@ -15,7 +15,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -26,7 +25,6 @@ final class RepairController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Maintenance $model, private readonly Config $config, ) { diff --git a/src/Controllers/Table/Partition/AnalyzeController.php b/src/Controllers/Table/Partition/AnalyzeController.php index fa902b83c6..9ac18f7a08 100644 --- a/src/Controllers/Table/Partition/AnalyzeController.php +++ b/src/Controllers/Table/Partition/AnalyzeController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class AnalyzeController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Partition/CheckController.php b/src/Controllers/Table/Partition/CheckController.php index 380ae8cc7e..f7116384a7 100644 --- a/src/Controllers/Table/Partition/CheckController.php +++ b/src/Controllers/Table/Partition/CheckController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class CheckController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Partition/DropController.php b/src/Controllers/Table/Partition/DropController.php index 5e773c41b8..d86c33a47b 100644 --- a/src/Controllers/Table/Partition/DropController.php +++ b/src/Controllers/Table/Partition/DropController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class DropController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Partition/OptimizeController.php b/src/Controllers/Table/Partition/OptimizeController.php index af1e784148..ce46bb5e38 100644 --- a/src/Controllers/Table/Partition/OptimizeController.php +++ b/src/Controllers/Table/Partition/OptimizeController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class OptimizeController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Partition/RebuildController.php b/src/Controllers/Table/Partition/RebuildController.php index 95f63cec30..51a5f94513 100644 --- a/src/Controllers/Table/Partition/RebuildController.php +++ b/src/Controllers/Table/Partition/RebuildController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class RebuildController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Partition/RepairController.php b/src/Controllers/Table/Partition/RepairController.php index b4e71a9f63..54f06ba4a1 100644 --- a/src/Controllers/Table/Partition/RepairController.php +++ b/src/Controllers/Table/Partition/RepairController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class RepairController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Partition/TruncateController.php b/src/Controllers/Table/Partition/TruncateController.php index ba1236b27d..8770509898 100644 --- a/src/Controllers/Table/Partition/TruncateController.php +++ b/src/Controllers/Table/Partition/TruncateController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -22,11 +21,8 @@ use function __; final class TruncateController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Maintenance $model, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Maintenance $model) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/PrivilegesController.php b/src/Controllers/Table/PrivilegesController.php index fb3520234d..284ef936be 100644 --- a/src/Controllers/Table/PrivilegesController.php +++ b/src/Controllers/Table/PrivilegesController.php @@ -19,7 +19,6 @@ use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Server\Privileges; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function __; @@ -32,7 +31,6 @@ final class PrivilegesController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Privileges $privileges, private readonly DatabaseInterface $dbi, ) { diff --git a/src/Controllers/Table/RecentFavoriteController.php b/src/Controllers/Table/RecentFavoriteController.php index 7cddf0303c..4ba3451fc4 100644 --- a/src/Controllers/Table/RecentFavoriteController.php +++ b/src/Controllers/Table/RecentFavoriteController.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\InvalidIdentifier; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use function __; @@ -23,7 +22,7 @@ use function __; */ final class RecentFavoriteController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Table/ReplaceController.php b/src/Controllers/Table/ReplaceController.php index 623eba8d9d..95879f25c6 100644 --- a/src/Controllers/Table/ReplaceController.php +++ b/src/Controllers/Table/ReplaceController.php @@ -23,7 +23,6 @@ use PhpMyAdmin\Plugins\IOTransformationsPlugin; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Table; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; @@ -43,7 +42,6 @@ final class ReplaceController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly InsertEdit $insertEdit, private readonly Transformations $transformations, private readonly Relation $relation, diff --git a/src/Controllers/Table/SqlController.php b/src/Controllers/Table/SqlController.php index 4ab8eef503..70e4e691bb 100644 --- a/src/Controllers/Table/SqlController.php +++ b/src/Controllers/Table/SqlController.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlQueryForm; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -30,7 +29,6 @@ class SqlController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly SqlQueryForm $sqlQueryForm, private readonly PageSettings $pageSettings, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/Table/Structure/AbstractIndexController.php b/src/Controllers/Table/Structure/AbstractIndexController.php index cdb61b431c..203460914c 100644 --- a/src/Controllers/Table/Structure/AbstractIndexController.php +++ b/src/Controllers/Table/Structure/AbstractIndexController.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Query\Generator; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Indexes; -use PhpMyAdmin\Template; use function __; use function is_array; @@ -19,7 +18,6 @@ abstract class AbstractIndexController { public function __construct( protected readonly ResponseRenderer $response, - protected readonly Template $template, protected readonly StructureController $structureController, protected readonly Indexes $indexes, ) { diff --git a/src/Controllers/Table/Structure/AddKeyController.php b/src/Controllers/Table/Structure/AddKeyController.php index 84840addf2..734b85f1d4 100644 --- a/src/Controllers/Table/Structure/AddKeyController.php +++ b/src/Controllers/Table/Structure/AddKeyController.php @@ -9,14 +9,10 @@ use PhpMyAdmin\Controllers\Sql\SqlController; use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class AddKeyController implements InvocableController { public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, private readonly SqlController $sqlController, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Table/Structure/BrowseController.php b/src/Controllers/Table/Structure/BrowseController.php index 4d9d237b13..6ae2fc08d6 100644 --- a/src/Controllers/Table/Structure/BrowseController.php +++ b/src/Controllers/Table/Structure/BrowseController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ParseAnalyze; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Sql; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function __; @@ -20,11 +19,8 @@ use function sprintf; final class BrowseController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly Sql $sql, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly Sql $sql) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/Table/Structure/CentralColumnsAddController.php b/src/Controllers/Table/Structure/CentralColumnsAddController.php index 00348bccb3..6c75c43ba9 100644 --- a/src/Controllers/Table/Structure/CentralColumnsAddController.php +++ b/src/Controllers/Table/Structure/CentralColumnsAddController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use function __; @@ -22,7 +21,6 @@ final class CentralColumnsAddController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly CentralColumns $centralColumns, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Table/Structure/CentralColumnsRemoveController.php b/src/Controllers/Table/Structure/CentralColumnsRemoveController.php index e486219ef3..e35fc9d9ea 100644 --- a/src/Controllers/Table/Structure/CentralColumnsRemoveController.php +++ b/src/Controllers/Table/Structure/CentralColumnsRemoveController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use Webmozart\Assert\Assert; use function __; @@ -22,7 +21,6 @@ final class CentralColumnsRemoveController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly CentralColumns $centralColumns, private readonly StructureController $structureController, ) { diff --git a/src/Controllers/Table/Structure/ChangeController.php b/src/Controllers/Table/Structure/ChangeController.php index b8fbac2c6a..13b383577e 100644 --- a/src/Controllers/Table/Structure/ChangeController.php +++ b/src/Controllers/Table/Structure/ChangeController.php @@ -12,7 +12,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\ColumnsDefinition; -use PhpMyAdmin\Template; use PhpMyAdmin\UserPrivilegesFactory; use function __; @@ -27,7 +26,6 @@ final class ChangeController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly ColumnsDefinition $columnsDefinition, private readonly UserPrivilegesFactory $userPrivilegesFactory, diff --git a/src/Controllers/Table/Structure/PartitioningController.php b/src/Controllers/Table/Structure/PartitioningController.php index 712885f3d2..d6e2471296 100644 --- a/src/Controllers/Table/Structure/PartitioningController.php +++ b/src/Controllers/Table/Structure/PartitioningController.php @@ -20,7 +20,6 @@ use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\StorageEngine; use PhpMyAdmin\Table\Table; -use PhpMyAdmin\Template; use PhpMyAdmin\Util; use function __; @@ -34,7 +33,6 @@ final class PartitioningController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly CreateAddField $createAddField, private readonly StructureController $structureController, diff --git a/src/Controllers/Table/Structure/PrimaryController.php b/src/Controllers/Table/Structure/PrimaryController.php index 075bd2ff36..6aeeaaa286 100644 --- a/src/Controllers/Table/Structure/PrimaryController.php +++ b/src/Controllers/Table/Structure/PrimaryController.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -28,7 +27,6 @@ final class PrimaryController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly StructureController $structureController, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/Table/Structure/ReservedWordCheckController.php b/src/Controllers/Table/Structure/ReservedWordCheckController.php index cc07d9eb54..015b3c0b91 100644 --- a/src/Controllers/Table/Structure/ReservedWordCheckController.php +++ b/src/Controllers/Table/Structure/ReservedWordCheckController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\SqlParser\Context; -use PhpMyAdmin\Template; use function _ngettext; use function count; @@ -21,7 +20,7 @@ use function trim; final class ReservedWordCheckController implements InvocableController { - public function __construct(private readonly ResponseRenderer $response, private readonly Template $template) + public function __construct(private readonly ResponseRenderer $response) { } diff --git a/src/Controllers/Table/Structure/SaveController.php b/src/Controllers/Table/Structure/SaveController.php index 4363dc1822..42fa59c3f6 100644 --- a/src/Controllers/Table/Structure/SaveController.php +++ b/src/Controllers/Table/Structure/SaveController.php @@ -18,7 +18,6 @@ use PhpMyAdmin\Index; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; use PhpMyAdmin\Table\Table; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Url; use PhpMyAdmin\UserPrivileges; @@ -40,7 +39,6 @@ final class SaveController implements InvocableController public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Relation $relation, private readonly Transformations $transformations, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/Table/TrackingController.php b/src/Controllers/Table/TrackingController.php index 2677a8642a..a4f2143b05 100644 --- a/src/Controllers/Table/TrackingController.php +++ b/src/Controllers/Table/TrackingController.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\LanguageManager; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Tracking\LogTypeEnum; use PhpMyAdmin\Tracking\Tracker; use PhpMyAdmin\Tracking\Tracking; @@ -40,7 +39,6 @@ final class TrackingController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Tracking $tracking, private readonly TrackingChecker $trackingChecker, private readonly DbTableExists $dbTableExists, diff --git a/src/Controllers/TableController.php b/src/Controllers/TableController.php index 0c3e070e76..474cb62089 100644 --- a/src/Controllers/TableController.php +++ b/src/Controllers/TableController.php @@ -9,15 +9,11 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; final class TableController implements InvocableController { - public function __construct( - private readonly ResponseRenderer $response, - private readonly Template $template, - private readonly DatabaseInterface $dbi, - ) { + public function __construct(private readonly ResponseRenderer $response, private readonly DatabaseInterface $dbi) + { } public function __invoke(ServerRequest $request): Response|null diff --git a/src/Controllers/ThemeSetController.php b/src/Controllers/ThemeSetController.php index a3707cfa40..906d97a4c7 100644 --- a/src/Controllers/ThemeSetController.php +++ b/src/Controllers/ThemeSetController.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Theme\ThemeManager; use PhpMyAdmin\Url; use PhpMyAdmin\UserPreferences; @@ -19,7 +18,6 @@ final class ThemeSetController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly ThemeManager $themeManager, private readonly UserPreferences $userPreferences, ) { diff --git a/src/Controllers/Transformation/OverviewController.php b/src/Controllers/Transformation/OverviewController.php index 62e9cdcb2a..96abfb2eba 100644 --- a/src/Controllers/Transformation/OverviewController.php +++ b/src/Controllers/Transformation/OverviewController.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\InvocableController; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use function array_keys; @@ -20,7 +19,6 @@ final class OverviewController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Transformations $transformations, ) { } diff --git a/src/Controllers/Transformation/WrapperController.php b/src/Controllers/Transformation/WrapperController.php index 09f6347c46..e9b9b0d479 100644 --- a/src/Controllers/Transformation/WrapperController.php +++ b/src/Controllers/Transformation/WrapperController.php @@ -17,7 +17,6 @@ use PhpMyAdmin\Identifiers\TableName; use PhpMyAdmin\Image\ImageWrapper; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Transformations; use PhpMyAdmin\Util; @@ -39,7 +38,6 @@ final class WrapperController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly Transformations $transformations, private readonly Relation $relation, private readonly DatabaseInterface $dbi, diff --git a/src/Controllers/UserPasswordController.php b/src/Controllers/UserPasswordController.php index 9e133f2483..e358ef6375 100644 --- a/src/Controllers/UserPasswordController.php +++ b/src/Controllers/UserPasswordController.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\UserPassword; use function __; @@ -23,7 +22,6 @@ final class UserPasswordController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly UserPassword $userPassword, private readonly DatabaseInterface $dbi, ) { diff --git a/src/Controllers/VersionCheckController.php b/src/Controllers/VersionCheckController.php index acb068ecf6..38c116cae5 100644 --- a/src/Controllers/VersionCheckController.php +++ b/src/Controllers/VersionCheckController.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Http\Response; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\VersionInformation; use function header; @@ -22,7 +21,6 @@ final class VersionCheckController implements InvocableController { public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly VersionInformation $versionInformation, ) { } diff --git a/src/Controllers/View/CreateController.php b/src/Controllers/View/CreateController.php index 7f5ceb7a30..5195c9b1c7 100644 --- a/src/Controllers/View/CreateController.php +++ b/src/Controllers/View/CreateController.php @@ -22,7 +22,6 @@ use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\SqlParser\TokensList; use PhpMyAdmin\SystemDatabase; -use PhpMyAdmin\Template; use PhpMyAdmin\Url; use PhpMyAdmin\Util; @@ -49,7 +48,6 @@ final class CreateController implements InvocableController public function __construct( private readonly ResponseRenderer $response, - private readonly Template $template, private readonly DatabaseInterface $dbi, private readonly DbTableExists $dbTableExists, ) { diff --git a/tests/unit/Controllers/BrowseForeignersControllerTest.php b/tests/unit/Controllers/BrowseForeignersControllerTest.php index 30c6643ad6..75f15cafb5 100644 --- a/tests/unit/Controllers/BrowseForeignersControllerTest.php +++ b/tests/unit/Controllers/BrowseForeignersControllerTest.php @@ -160,7 +160,6 @@ HTML; (new BrowseForeignersController( $response, - $template, new BrowseForeigners($template, $config, new ThemeManager()), new Relation($dbi), ))($request); diff --git a/tests/unit/Controllers/ChangeLogControllerTest.php b/tests/unit/Controllers/ChangeLogControllerTest.php index 97327f51be..95c3c7bff8 100644 --- a/tests/unit/Controllers/ChangeLogControllerTest.php +++ b/tests/unit/Controllers/ChangeLogControllerTest.php @@ -27,7 +27,7 @@ final class ChangeLogControllerTest extends AbstractTestCase $responseRenderer = new ResponseRenderer(); $template = new Template(); - $controller = new ChangeLogController($responseRenderer, $template, $config); + $controller = new ChangeLogController($responseRenderer, $config); $controller($request); self::assertTrue($responseRenderer->isDisabled()); @@ -66,7 +66,7 @@ HTML; $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/'); $responseRenderer = new ResponseRenderer(); - $controller = new ChangeLogController($responseRenderer, new Template(), $config); + $controller = new ChangeLogController($responseRenderer, $config); $controller($request); self::assertStringContainsString( @@ -87,7 +87,7 @@ HTML; $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/'); $responseRenderer = new ResponseRenderer(); - $controller = new ChangeLogController($responseRenderer, new Template(), $config); + $controller = new ChangeLogController($responseRenderer, $config); $controller($request); self::assertSame('', $responseRenderer->getHTMLResult()); diff --git a/tests/unit/Controllers/CheckRelationsControllerTest.php b/tests/unit/Controllers/CheckRelationsControllerTest.php index b4a68aac7a..74054af3ba 100644 --- a/tests/unit/Controllers/CheckRelationsControllerTest.php +++ b/tests/unit/Controllers/CheckRelationsControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Controllers\CheckRelationsController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -48,7 +47,7 @@ class CheckRelationsControllerTest extends AbstractTestCase $response = new ResponseRenderer(); Config::getInstance()->selectedServer['pmadb'] = ''; (new ReflectionProperty(Relation::class, 'cache'))->setValue(null, null); - $controller = new CheckRelationsController($response, new Template(), new Relation($this->dbi)); + $controller = new CheckRelationsController($response, new Relation($this->dbi)); $controller($request); $actual = $response->getHTMLResult(); diff --git a/tests/unit/Controllers/CollationConnectionControllerTest.php b/tests/unit/Controllers/CollationConnectionControllerTest.php index a71e0a596d..ea2154be69 100644 --- a/tests/unit/Controllers/CollationConnectionControllerTest.php +++ b/tests/unit/Controllers/CollationConnectionControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\CollationConnectionController; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Url; use PHPUnit\Framework\Attributes\CoversClass; @@ -29,10 +28,6 @@ class CollationConnectionControllerTest extends AbstractTestCase $config->expects(self::once())->method('setUserValue') ->with(null, 'DefaultConnectionCollation', 'utf8mb4_general_ci', 'utf8mb4_unicode_ci'); - (new CollationConnectionController( - $response, - new Template(), - $config, - ))($request); + (new CollationConnectionController($response, $config))($request); } } diff --git a/tests/unit/Controllers/ColumnControllerTest.php b/tests/unit/Controllers/ColumnControllerTest.php index f6828828ef..d79a7ad084 100644 --- a/tests/unit/Controllers/ColumnControllerTest.php +++ b/tests/unit/Controllers/ColumnControllerTest.php @@ -4,11 +4,9 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\ColumnController; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Message; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -23,7 +21,7 @@ final class ColumnControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); $responseRenderer = new ResponseRenderer(); - $controller = new ColumnController($responseRenderer, new Template(new Config()), $dbi); + $controller = new ColumnController($responseRenderer, $dbi); $controller($request); self::assertTrue($responseRenderer->hasSuccessState()); @@ -37,7 +35,7 @@ final class ColumnControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); $responseRenderer = new ResponseRenderer(); - $controller = new ColumnController($responseRenderer, new Template(new Config()), $dbi); + $controller = new ColumnController($responseRenderer, $dbi); $controller($request); self::assertFalse($responseRenderer->hasSuccessState()); diff --git a/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php b/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php index af900910e5..8f693b585d 100644 --- a/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php +++ b/tests/unit/Controllers/Console/Bookmark/AddControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\ConfigStorage\RelationParameters; use PhpMyAdmin\Controllers\Console\Bookmark\AddController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -34,7 +33,7 @@ class AddControllerTest extends AbstractTestCase ]); $relation = new Relation($dbi); $bookmarkRepository = new BookmarkRepository($dbi, $relation); - $controller = new AddController($response, new Template(), $bookmarkRepository); + $controller = new AddController($response, $bookmarkRepository); $controller($request); self::assertSame(['message' => 'Incomplete params'], $response->getJSONResult()); } @@ -55,7 +54,7 @@ class AddControllerTest extends AbstractTestCase ]); $relation = new Relation($dbi); $bookmarkRepository = new BookmarkRepository($dbi, $relation); - $controller = new AddController($response, new Template(), $bookmarkRepository); + $controller = new AddController($response, $bookmarkRepository); $controller($request); self::assertSame(['message' => 'Failed'], $response->getJSONResult()); } @@ -89,7 +88,7 @@ class AddControllerTest extends AbstractTestCase ]); $relation = new Relation($dbi); $bookmarkRepository = new BookmarkRepository($dbi, $relation); - $controller = new AddController($response, new Template(), $bookmarkRepository); + $controller = new AddController($response, $bookmarkRepository); $controller($request); self::assertSame( [ diff --git a/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php b/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php index a31a16d90f..6ed1d234e0 100644 --- a/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php +++ b/tests/unit/Controllers/Console/Bookmark/RefreshControllerTest.php @@ -28,7 +28,6 @@ class RefreshControllerTest extends AbstractTestCase $template = new Template(); $controller = new RefreshController( $response, - $template, new Console($relation, $template, $bookmarkRepository), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Console/UpdateConfigControllerTest.php b/tests/unit/Controllers/Console/UpdateConfigControllerTest.php index 531b964b0e..dcbdb1fb92 100644 --- a/tests/unit/Controllers/Console/UpdateConfigControllerTest.php +++ b/tests/unit/Controllers/Console/UpdateConfigControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Console\UpdateConfigController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Message; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -30,7 +29,7 @@ final class UpdateConfigControllerTest extends AbstractTestCase $config = new Config(); $responseRenderer = new ResponseRenderer(); $responseRenderer->setAjax(true); - $controller = new UpdateConfigController($responseRenderer, new Template($config), $config); + $controller = new UpdateConfigController($responseRenderer, $config); $response = $controller($request); $responseBody = (string) $response->getBody(); @@ -83,7 +82,7 @@ final class UpdateConfigControllerTest extends AbstractTestCase $config = new Config(); $responseRenderer = new ResponseRenderer(); $responseRenderer->setAjax(true); - $controller = new UpdateConfigController($responseRenderer, new Template($config), $config); + $controller = new UpdateConfigController($responseRenderer, $config); $response = $controller($request); $responseBody = (string) $response->getBody(); @@ -143,7 +142,7 @@ final class UpdateConfigControllerTest extends AbstractTestCase $config->method('setUserValue')->willReturn(Message::error('Could not save configuration')); $responseRenderer = new ResponseRenderer(); $responseRenderer->setAjax(true); - $controller = new UpdateConfigController($responseRenderer, new Template($config), $config); + $controller = new UpdateConfigController($responseRenderer, $config); $response = $controller($request); $responseBody = (string) $response->getBody(); diff --git a/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php b/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php index 168aa6cd6b..0a274f6beb 100644 --- a/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php +++ b/tests/unit/Controllers/Database/MultiTableQuery/TablesControllerTest.php @@ -7,7 +7,6 @@ namespace PhpMyAdmin\Tests\Controllers\Database\MultiTableQuery; use PhpMyAdmin\Controllers\Database\MultiTableQuery\TablesController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -37,7 +36,7 @@ class TablesControllerTest extends AbstractTestCase $_GET['db'] = 'test'; $responseRenderer = new ResponseRenderer(); - $multiTableQueryController = new TablesController($responseRenderer, new Template(), $this->dbi); + $multiTableQueryController = new TablesController($responseRenderer, $this->dbi); $request = self::createStub(ServerRequest::class); $request->method('getQueryParam')->willReturn($_GET['tables'], $_GET['db']); diff --git a/tests/unit/Controllers/Database/PrivilegesControllerTest.php b/tests/unit/Controllers/Database/PrivilegesControllerTest.php index 06eaa3341b..282fa6814f 100644 --- a/tests/unit/Controllers/Database/PrivilegesControllerTest.php +++ b/tests/unit/Controllers/Database/PrivilegesControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Privileges; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -68,7 +67,6 @@ class PrivilegesControllerTest extends AbstractTestCase $response = new ResponseRenderer(); (new PrivilegesController( $response, - new Template(), $serverPrivileges, DatabaseInterface::getInstance(), ))($request); @@ -115,7 +113,6 @@ class PrivilegesControllerTest extends AbstractTestCase $response = new ResponseRenderer(); (new PrivilegesController( $response, - new Template(), self::createStub(Privileges::class), $this->createDatabaseInterface(), ))($request); diff --git a/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php b/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php index 6fefa3d694..fcce542d64 100644 --- a/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php +++ b/tests/unit/Controllers/Database/Structure/RealRowCountControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Http\Factory\ServerRequestFactory; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub; use PHPUnit\Framework\Attributes\CoversClass; @@ -35,14 +34,14 @@ class RealRowCountControllerTest extends AbstractTestCase $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') ->withQueryParams(['db' => 'world', 'table' => 'City', 'ajax_request' => '1']); - (new RealRowCountController($response, new Template(), $dbi, new DbTableExists($dbi)))($request); + (new RealRowCountController($response, $dbi, new DbTableExists($dbi)))($request); $json = $response->getJSONResult(); self::assertSame('4,079', $json['real_row_count']); $_REQUEST['real_row_count_all'] = 'on'; - (new RealRowCountController($response, new Template(), $dbi, new DbTableExists($dbi)))($request); + (new RealRowCountController($response, $dbi, new DbTableExists($dbi)))($request); $json = $response->getJSONResult(); $expected = [ diff --git a/tests/unit/Controllers/DatabaseControllerTest.php b/tests/unit/Controllers/DatabaseControllerTest.php index d78eb6acde..5fa16d1879 100644 --- a/tests/unit/Controllers/DatabaseControllerTest.php +++ b/tests/unit/Controllers/DatabaseControllerTest.php @@ -4,12 +4,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Controllers; -use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\DatabaseController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\ListDatabase; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -31,7 +29,7 @@ class DatabaseControllerTest extends AbstractTestCase ); $responseRenderer = new ResponseRenderer(); - $controller = new DatabaseController($responseRenderer, new Template(new Config()), $dbi); + $controller = new DatabaseController($responseRenderer, $dbi); $controller($request); $output = $responseRenderer->getJSONResult(); diff --git a/tests/unit/Controllers/Export/ExportControllerTest.php b/tests/unit/Controllers/Export/ExportControllerTest.php index bd87ed8fcf..b7cdaca618 100644 --- a/tests/unit/Controllers/Export/ExportControllerTest.php +++ b/tests/unit/Controllers/Export/ExportControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Export\ExportController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Export\Export; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\FieldHelper; use PhpMyAdmin\Tests\Stubs\DbiDummy; @@ -195,7 +194,7 @@ ALTER TABLE `test_table` COMMIT; SQL; - $exportController = new ExportController(new ResponseRenderer(), new Template(), new Export($this->dbi)); + $exportController = new ExportController(new ResponseRenderer(), new Export($this->dbi)); $exportController($request); $output = $this->getActualOutputForAssertion(); diff --git a/tests/unit/Controllers/Export/Template/DeleteControllerTest.php b/tests/unit/Controllers/Export/Template/DeleteControllerTest.php index bfd009a6d9..674eb9466b 100644 --- a/tests/unit/Controllers/Export/Template/DeleteControllerTest.php +++ b/tests/unit/Controllers/Export/Template/DeleteControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Controllers\Export\Template\DeleteController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -42,7 +41,6 @@ class DeleteControllerTest extends AbstractTestCase (new DeleteController( $response, - new Template(), new TemplateModel($this->dbi), new Relation($this->dbi), ))($request); diff --git a/tests/unit/Controllers/Export/Template/LoadControllerTest.php b/tests/unit/Controllers/Export/Template/LoadControllerTest.php index 3ed5aa0d32..980fe4b3c3 100644 --- a/tests/unit/Controllers/Export/Template/LoadControllerTest.php +++ b/tests/unit/Controllers/Export/Template/LoadControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Controllers\Export\Template\LoadController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -51,7 +50,6 @@ class LoadControllerTest extends AbstractTestCase (new LoadController( $response, - new Template(), new TemplateModel($this->dbi), new Relation($this->dbi), ))($request); diff --git a/tests/unit/Controllers/Export/Template/UpdateControllerTest.php b/tests/unit/Controllers/Export/Template/UpdateControllerTest.php index 0c9625ef7a..f3c8d6df71 100644 --- a/tests/unit/Controllers/Export/Template/UpdateControllerTest.php +++ b/tests/unit/Controllers/Export/Template/UpdateControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Controllers\Export\Template\UpdateController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Export\TemplateModel; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -45,7 +44,6 @@ class UpdateControllerTest extends AbstractTestCase (new UpdateController( $response, - new Template(), new TemplateModel($this->dbi), new Relation($this->dbi), ))($request); diff --git a/tests/unit/Controllers/HomeControllerTest.php b/tests/unit/Controllers/HomeControllerTest.php index abfd1be8c7..aa1da1ed8b 100644 --- a/tests/unit/Controllers/HomeControllerTest.php +++ b/tests/unit/Controllers/HomeControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ResponseFactory; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\ResponseRenderer; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Theme\ThemeManager; use PHPUnit\Framework\Attributes\CoversClass; @@ -25,7 +24,6 @@ final class HomeControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db']); $controller = new HomeController( self::createStub(ResponseRenderer::class), - self::createStub(Template::class), self::createStub(Config::class), self::createStub(ThemeManager::class), self::createStub(DatabaseInterface::class), @@ -44,7 +42,6 @@ final class HomeControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db', 'table' => 'test_table']); $controller = new HomeController( self::createStub(ResponseRenderer::class), - self::createStub(Template::class), self::createStub(Config::class), self::createStub(ThemeManager::class), self::createStub(DatabaseInterface::class), diff --git a/tests/unit/Controllers/Import/ImportControllerTest.php b/tests/unit/Controllers/Import/ImportControllerTest.php index 009729aba4..a752782511 100644 --- a/tests/unit/Controllers/Import/ImportControllerTest.php +++ b/tests/unit/Controllers/Import/ImportControllerTest.php @@ -97,7 +97,6 @@ class ImportControllerTest extends AbstractTestCase $importController = new ImportController( $responseRenderer, - $template, new Import(), $sql, $this->dbi, diff --git a/tests/unit/Controllers/LintControllerTest.php b/tests/unit/Controllers/LintControllerTest.php index 60d9f40535..7d7669ad9d 100644 --- a/tests/unit/Controllers/LintControllerTest.php +++ b/tests/unit/Controllers/LintControllerTest.php @@ -7,7 +7,6 @@ namespace PhpMyAdmin\Tests\Controllers; use PhpMyAdmin\Controllers\LintController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -109,6 +108,6 @@ class LintControllerTest extends AbstractTestCase private function getLintController(): LintController { - return new LintController(new ResponseRenderer(), new Template()); + return new LintController(new ResponseRenderer()); } } diff --git a/tests/unit/Controllers/Navigation/UpdateNavWidthConfigControllerTest.php b/tests/unit/Controllers/Navigation/UpdateNavWidthConfigControllerTest.php index 00c6eac8c9..aab97e8744 100644 --- a/tests/unit/Controllers/Navigation/UpdateNavWidthConfigControllerTest.php +++ b/tests/unit/Controllers/Navigation/UpdateNavWidthConfigControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\Navigation\UpdateNavWidthConfigController; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Message; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -25,7 +24,7 @@ final class UpdateNavWidthConfigControllerTest extends AbstractTestCase $config = new Config(); $responseRenderer = new ResponseRenderer(); - $controller = new UpdateNavWidthConfigController($responseRenderer, new Template($config), $config); + $controller = new UpdateNavWidthConfigController($responseRenderer, $config); $controller($request); self::assertSame($expected, $config->settings['NavigationWidth']); @@ -50,7 +49,7 @@ final class UpdateNavWidthConfigControllerTest extends AbstractTestCase $config = new Config(); $responseRenderer = new ResponseRenderer(); - $controller = new UpdateNavWidthConfigController($responseRenderer, new Template($config), $config); + $controller = new UpdateNavWidthConfigController($responseRenderer, $config); $controller($request); self::assertSame( @@ -77,7 +76,7 @@ final class UpdateNavWidthConfigControllerTest extends AbstractTestCase $config = self::createStub(Config::class); $config->method('setUserValue')->willReturn(Message::error('Could not save configuration')); $responseRenderer = new ResponseRenderer(); - $controller = new UpdateNavWidthConfigController($responseRenderer, new Template($config), $config); + $controller = new UpdateNavWidthConfigController($responseRenderer, $config); $controller($request); self::assertSame( diff --git a/tests/unit/Controllers/NavigationControllerTest.php b/tests/unit/Controllers/NavigationControllerTest.php index 7adbfc97d2..e3df2d7e78 100644 --- a/tests/unit/Controllers/NavigationControllerTest.php +++ b/tests/unit/Controllers/NavigationControllerTest.php @@ -122,7 +122,6 @@ class NavigationControllerTest extends AbstractTestCase $relation = new Relation($this->dbi); $navigationController = new NavigationController( $responseRenderer, - $template, new Navigation($template, $relation, $this->dbi, $config), $relation, new PageSettings(new UserPreferences($this->dbi, $relation, $template)), @@ -272,7 +271,6 @@ class NavigationControllerTest extends AbstractTestCase $relation = new Relation($this->dbi); $navigationController = new NavigationController( $responseRenderer, - $template, new Navigation($template, $relation, $this->dbi, $config), $relation, new PageSettings(new UserPreferences($this->dbi, $relation, $template)), diff --git a/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php b/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php index 5daf993ad1..f13eaaa9dc 100644 --- a/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php +++ b/tests/unit/Controllers/Normalization/AddNewPrimaryControllerTest.php @@ -36,7 +36,6 @@ class AddNewPrimaryControllerTest extends AbstractTestCase $controller = new AddNewPrimaryController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), new UserPrivilegesFactory($dbi), ); diff --git a/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php b/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php index 6e2d873fcf..b2180f9d4e 100644 --- a/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php +++ b/tests/unit/Controllers/Normalization/CreateNewColumnControllerTest.php @@ -38,7 +38,6 @@ class CreateNewColumnControllerTest extends AbstractTestCase $controller = new CreateNewColumnController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), new UserPrivilegesFactory($dbi), ); diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php index 11fb2aa67f..f4fbe49a93 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php @@ -41,7 +41,6 @@ class FirstStepControllerTest extends AbstractTestCase $controller = new FirstStepController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php index b01f14ae7f..72a2e23975 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/FourthStepControllerTest.php @@ -34,7 +34,6 @@ class FourthStepControllerTest extends AbstractTestCase $controller = new FourthStepController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php index d4dc3b0005..e4d029aece 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/SecondStepControllerTest.php @@ -31,7 +31,6 @@ class SecondStepControllerTest extends AbstractTestCase $controller = new SecondStepController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php b/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php index 0c774de6f0..60a0a13244 100644 --- a/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/FirstNormalForm/ThirdStepControllerTest.php @@ -34,7 +34,6 @@ class ThirdStepControllerTest extends AbstractTestCase $controller = new ThirdStepController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php b/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php index be04a37d4e..6604ca9cd8 100644 --- a/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php +++ b/tests/unit/Controllers/Normalization/GetColumnsControllerTest.php @@ -34,7 +34,6 @@ class GetColumnsControllerTest extends AbstractTestCase $controller = new GetColumnsController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Normalization/MainControllerTest.php b/tests/unit/Controllers/Normalization/MainControllerTest.php index a62cb26b91..fe457ae1b3 100644 --- a/tests/unit/Controllers/Normalization/MainControllerTest.php +++ b/tests/unit/Controllers/Normalization/MainControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Normalization\MainController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -43,7 +42,7 @@ class MainControllerTest extends AbstractTestCase Current::$table = 'test_table'; $response = new ResponseRenderer(); - $controller = new MainController($response, new Template()); + $controller = new MainController($response); $controller(self::createStub(ServerRequest::class)); $files = $response->getHeader()->getScripts()->getFiles(); diff --git a/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php b/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php index fe22744abc..63dd23bd81 100644 --- a/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php +++ b/tests/unit/Controllers/Normalization/MoveRepeatingGroupTest.php @@ -49,7 +49,6 @@ class MoveRepeatingGroupTest extends AbstractTestCase $controller = new MoveRepeatingGroup( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php b/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php index f5ddbbaa90..2197dfc3e6 100644 --- a/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php +++ b/tests/unit/Controllers/Normalization/PartialDependenciesControllerTest.php @@ -42,7 +42,6 @@ class PartialDependenciesControllerTest extends AbstractTestCase $controller = new PartialDependenciesController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php index 708276b25f..ecddddf1bc 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/CreateNewTablesControllerTest.php @@ -44,7 +44,6 @@ class CreateNewTablesControllerTest extends AbstractTestCase $controller = new CreateNewTablesController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php index 116d0b871c..10be82ceec 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/FirstStepControllerTest.php @@ -31,7 +31,6 @@ class FirstStepControllerTest extends AbstractTestCase $controller = new FirstStepController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php b/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php index 3bc2aa466f..58a64de048 100644 --- a/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/SecondNormalForm/NewTablesControllerTest.php @@ -36,7 +36,6 @@ class NewTablesControllerTest extends AbstractTestCase ]); $controller = new NewTablesController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php index 904afa9dae..7efdc0f788 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php @@ -58,7 +58,6 @@ class CreateNewTablesControllerTest extends AbstractTestCase $controller = new CreateNewTablesController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php index f1157c42a0..f6ffa0b3d9 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php @@ -36,7 +36,6 @@ class FirstStepControllerTest extends AbstractTestCase $controller = new FirstStepController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php b/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php index 3bff5a2e8e..21aa97553e 100644 --- a/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php +++ b/tests/unit/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php @@ -44,7 +44,6 @@ class NewTablesControllerTest extends AbstractTestCase $controller = new NewTablesController( $response, - $template, new Normalization($dbi, new Relation($dbi), new Transformations(), $template), ); $controller($request); diff --git a/tests/unit/Controllers/Operations/TableControllerTest.php b/tests/unit/Controllers/Operations/TableControllerTest.php index 388bb8b9b6..b4640e114e 100644 --- a/tests/unit/Controllers/Operations/TableControllerTest.php +++ b/tests/unit/Controllers/Operations/TableControllerTest.php @@ -124,7 +124,6 @@ class TableControllerTest extends AbstractTestCase $relation = new Relation($this->dbi); $controller = new TableController( $responseRenderer, - new Template($config), new Operations($this->dbi, $relation), new UserPrivilegesFactory($this->dbi), $relation, diff --git a/tests/unit/Controllers/Server/BinlogControllerTest.php b/tests/unit/Controllers/Server/BinlogControllerTest.php index 0b99cb5c19..5550860ae2 100644 --- a/tests/unit/Controllers/Server/BinlogControllerTest.php +++ b/tests/unit/Controllers/Server/BinlogControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Server\BinlogController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -49,7 +48,7 @@ class BinlogControllerTest extends AbstractTestCase { $response = new ResponseRenderer(); - $controller = new BinlogController($response, new Template(), DatabaseInterface::getInstance()); + $controller = new BinlogController($response, DatabaseInterface::getInstance()); $request = self::createStub(ServerRequest::class); $request->method('getParsedBodyParam')->willReturnMap([['log', null, 'index1'], ['pos', 0, '3']]); diff --git a/tests/unit/Controllers/Server/CollationsControllerTest.php b/tests/unit/Controllers/Server/CollationsControllerTest.php index e56a3f1b6f..c84c423fec 100644 --- a/tests/unit/Controllers/Server/CollationsControllerTest.php +++ b/tests/unit/Controllers/Server/CollationsControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Server\CollationsController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -44,7 +43,7 @@ class CollationsControllerTest extends AbstractTestCase { $response = new ResponseRenderer(); - $controller = new CollationsController($response, new Template(), DatabaseInterface::getInstance()); + $controller = new CollationsController($response, DatabaseInterface::getInstance()); $this->dummyDbi->addSelectDb('mysql'); $controller(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Server/Databases/CreateControllerTest.php b/tests/unit/Controllers/Server/Databases/CreateControllerTest.php index 48cbf40297..19c621a9dd 100644 --- a/tests/unit/Controllers/Server/Databases/CreateControllerTest.php +++ b/tests/unit/Controllers/Server/Databases/CreateControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Server\Databases\CreateController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -42,8 +41,7 @@ final class CreateControllerTest extends AbstractTestCase $response = new ResponseRenderer(); - $template = new Template(); - $controller = new CreateController($response, $template, $this->dbi); + $controller = new CreateController($response, $this->dbi); $request = self::createStub(ServerRequest::class); $request->method('getParsedBodyParam')->willReturnMap([ @@ -59,7 +57,7 @@ final class CreateControllerTest extends AbstractTestCase $response = new ResponseRenderer(); - $controller = new CreateController($response, $template, $this->dbi); + $controller = new CreateController($response, $this->dbi); $request = self::createStub(ServerRequest::class); $request->method('isAjax')->willReturn(true); diff --git a/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php b/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php index 1273ec6953..cce3c61bc8 100644 --- a/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php +++ b/tests/unit/Controllers/Server/Databases/DestroyControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\ConfigStorage\RelationCleanup; use PhpMyAdmin\Controllers\Server\Databases\DestroyController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Transformations; @@ -41,7 +40,6 @@ class DestroyControllerTest extends AbstractTestCase $controller = new DestroyController( $response, - new Template(), $dbi, new Transformations(), new RelationCleanup($dbi, new Relation($dbi)), diff --git a/tests/unit/Controllers/Server/DatabasesControllerTest.php b/tests/unit/Controllers/Server/DatabasesControllerTest.php index 75c1435881..235d5ec2c1 100644 --- a/tests/unit/Controllers/Server/DatabasesControllerTest.php +++ b/tests/unit/Controllers/Server/DatabasesControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Server\DatabasesController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -44,11 +43,10 @@ class DatabasesControllerTest extends AbstractTestCase { $config = Config::getInstance(); $config->selectedServer['only_db'] = ''; - $template = new Template(); $response = new ResponseRenderer(); - $controller = new DatabasesController($response, $template, $this->dbi, new UserPrivilegesFactory($this->dbi)); + $controller = new DatabasesController($response, $this->dbi, new UserPrivilegesFactory($this->dbi)); $this->dummyDbi->addResult( 'SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`', @@ -86,7 +84,7 @@ class DatabasesControllerTest extends AbstractTestCase $response = new ResponseRenderer(); $dbi = DatabaseInterface::getInstance(); - $controller = new DatabasesController($response, $template, $dbi, new UserPrivilegesFactory($dbi)); + $controller = new DatabasesController($response, $dbi, new UserPrivilegesFactory($dbi)); $config->settings['ShowCreateDb'] = true; diff --git a/tests/unit/Controllers/Server/EnginesControllerTest.php b/tests/unit/Controllers/Server/EnginesControllerTest.php index 1d188e5d04..4fca232e42 100644 --- a/tests/unit/Controllers/Server/EnginesControllerTest.php +++ b/tests/unit/Controllers/Server/EnginesControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Server\EnginesController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -44,7 +43,7 @@ class EnginesControllerTest extends AbstractTestCase { $response = new ResponseRenderer(); - $controller = new EnginesController($response, new Template(), DatabaseInterface::getInstance()); + $controller = new EnginesController($response, DatabaseInterface::getInstance()); $this->dummyDbi->addSelectDb('mysql'); $controller->__invoke(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Server/PluginsControllerTest.php b/tests/unit/Controllers/Server/PluginsControllerTest.php index 2ef678bb9b..51930c58d2 100644 --- a/tests/unit/Controllers/Server/PluginsControllerTest.php +++ b/tests/unit/Controllers/Server/PluginsControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Plugins; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\DummyResult; @@ -74,7 +73,7 @@ class PluginsControllerTest extends AbstractTestCase $response = new ResponseRenderer(); - $controller = new PluginsController($response, new Template(), new Plugins($dbi), $this->dbi); + $controller = new PluginsController($response, new Plugins($dbi), $this->dbi); $this->dummyDbi->addSelectDb('mysql'); $controller(self::createStub(ServerRequest::class)); $this->dummyDbi->assertAllSelectsConsumed(); diff --git a/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php b/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php index fb0f276883..629f12146c 100644 --- a/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php +++ b/tests/unit/Controllers/Server/Privileges/AccountLockControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Server\Privileges\AccountLocking; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -44,7 +43,6 @@ class AccountLockControllerTest extends AbstractTestCase $this->controller = new AccountLockController( $this->responseRendererStub, - new Template(), new AccountLocking($this->dbiStub), ); } diff --git a/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php b/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php index 34566e2977..92907c3f36 100644 --- a/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php +++ b/tests/unit/Controllers/Server/Privileges/AccountUnlockControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Server\Privileges\AccountLocking; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DummyResult; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -44,7 +43,6 @@ class AccountUnlockControllerTest extends AbstractTestCase $this->controller = new AccountUnlockController( $this->responseRendererStub, - new Template(), new AccountLocking($this->dbiStub), ); } diff --git a/tests/unit/Controllers/Server/ShowEngineControllerTest.php b/tests/unit/Controllers/Server/ShowEngineControllerTest.php index 2460f89737..9711413a18 100644 --- a/tests/unit/Controllers/Server/ShowEngineControllerTest.php +++ b/tests/unit/Controllers/Server/ShowEngineControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\StorageEngine; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; @@ -49,7 +48,7 @@ class ShowEngineControllerTest extends AbstractTestCase $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/') ->withAttribute('routeVars', ['engine' => 'Pbxt', 'page' => 'page']); - (new ShowEngineController($response, new Template(), DatabaseInterface::getInstance()))($request); + (new ShowEngineController($response, DatabaseInterface::getInstance()))($request); $this->dummyDbi->assertAllSelectsConsumed(); $actual = $response->getHTMLResult(); diff --git a/tests/unit/Controllers/Table/AddFieldControllerTest.php b/tests/unit/Controllers/Table/AddFieldControllerTest.php index 1af596fdc8..fcc0a00977 100644 --- a/tests/unit/Controllers/Table/AddFieldControllerTest.php +++ b/tests/unit/Controllers/Table/AddFieldControllerTest.php @@ -260,7 +260,6 @@ class AddFieldControllerTest extends AbstractTestCase $transformations = new Transformations(); (new AddFieldController( $response, - $template, $transformations, $this->createConfig(), $dbi, diff --git a/tests/unit/Controllers/Table/ChangeRowsControllerTest.php b/tests/unit/Controllers/Table/ChangeRowsControllerTest.php index 67487f0d87..f981a22b07 100644 --- a/tests/unit/Controllers/Table/ChangeRowsControllerTest.php +++ b/tests/unit/Controllers/Table/ChangeRowsControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Table\ChangeRowsController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\Factory\ServerRequestFactory; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -35,7 +34,7 @@ class ChangeRowsControllerTest extends AbstractTestCase $mock = self::createMock(ChangeController::class); $mock->expects(self::once())->method('__invoke')->with($request); - (new ChangeRowsController(new ResponseRenderer(), new Template(), $mock))($request); + (new ChangeRowsController(new ResponseRenderer(), $mock))($request); /** @psalm-suppress InvalidArrayOffset */ self::assertSame([], $GLOBALS['where_clause']); @@ -50,7 +49,7 @@ class ChangeRowsControllerTest extends AbstractTestCase $mock->expects(self::never())->method('__invoke')->with($request); $response = new ResponseRenderer(); - (new ChangeRowsController($response, new Template(), $mock))($request); + (new ChangeRowsController($response, $mock))($request); self::assertSame(['message' => 'No row selected.'], $response->getJSONResult()); self::assertFalse($response->hasSuccessState()); @@ -66,7 +65,7 @@ class ChangeRowsControllerTest extends AbstractTestCase $mock = self::createMock(ChangeController::class); $mock->expects(self::once())->method('__invoke')->with($request); - (new ChangeRowsController(new ResponseRenderer(), new Template(), $mock))($request); + (new ChangeRowsController(new ResponseRenderer(), $mock))($request); /** @psalm-suppress InvalidArrayOffset */ self::assertSame(['row1', 'row2'], $GLOBALS['where_clause']); diff --git a/tests/unit/Controllers/Table/ChartControllerTest.php b/tests/unit/Controllers/Table/ChartControllerTest.php index 94df09575d..e43af89011 100644 --- a/tests/unit/Controllers/Table/ChartControllerTest.php +++ b/tests/unit/Controllers/Table/ChartControllerTest.php @@ -104,7 +104,7 @@ class ChartControllerTest extends AbstractTestCase 'unlim_num_rows' => '4', ]); - (new ChartController($response, $template, $dbi, new DbTableExists($dbi)))($request); + (new ChartController($response, $dbi, new DbTableExists($dbi)))($request); self::assertSame($expected, $response->getHTMLResult()); } } diff --git a/tests/unit/Controllers/Table/CreateControllerTest.php b/tests/unit/Controllers/Table/CreateControllerTest.php index b07aca326e..5af85b99e7 100644 --- a/tests/unit/Controllers/Table/CreateControllerTest.php +++ b/tests/unit/Controllers/Table/CreateControllerTest.php @@ -255,7 +255,6 @@ class CreateControllerTest extends AbstractTestCase $transformations = new Transformations(); (new CreateController( $response, - $template, $transformations, $this->createConfig(), $dbi, diff --git a/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php b/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php index 802c65b4d2..2ede60888e 100644 --- a/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php +++ b/tests/unit/Controllers/Table/DeleteConfirmControllerTest.php @@ -52,7 +52,7 @@ class DeleteConfirmControllerTest extends AbstractTestCase 'sql_query' => 'SELECT * FROM `test_db`.`test_table`', ]); - (new DeleteConfirmController($response, $template, new DbTableExists($dbi)))($request); + (new DeleteConfirmController($response, new DbTableExists($dbi)))($request); self::assertSame($expected, $response->getHTMLResult()); } } diff --git a/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php b/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php index 089bb716a9..6873a7eff3 100644 --- a/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php +++ b/tests/unit/Controllers/Table/DropColumnConfirmationControllerTest.php @@ -48,7 +48,7 @@ class DropColumnConfirmationControllerTest extends AbstractTestCase 'fields' => ['name', 'datetimefield'], ]); - (new DropColumnConfirmationController($response, $template, new DbTableExists($dbi)))($request); + (new DropColumnConfirmationController($response, new DbTableExists($dbi)))($request); self::assertSame(200, $response->getResponse()->getStatusCode()); self::assertTrue($response->hasSuccessState()); @@ -70,7 +70,6 @@ class DropColumnConfirmationControllerTest extends AbstractTestCase (new DropColumnConfirmationController( $response, - new Template(), new DbTableExists(DatabaseInterface::getInstance()), ))($request); @@ -94,7 +93,6 @@ class DropColumnConfirmationControllerTest extends AbstractTestCase (new DropColumnConfirmationController( $response, - new Template(), new DbTableExists(DatabaseInterface::getInstance()), ))($request); diff --git a/tests/unit/Controllers/Table/DropColumnControllerTest.php b/tests/unit/Controllers/Table/DropColumnControllerTest.php index be2b6091de..087dcb1f56 100644 --- a/tests/unit/Controllers/Table/DropColumnControllerTest.php +++ b/tests/unit/Controllers/Table/DropColumnControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\FlashMessages; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -47,7 +46,6 @@ class DropColumnControllerTest extends AbstractTestCase (new DropColumnController( new ResponseRenderer(), - new Template(), $dbi, new FlashMessages(), new RelationCleanup($dbi, new Relation($dbi)), diff --git a/tests/unit/Controllers/Table/ExportControllerTest.php b/tests/unit/Controllers/Table/ExportControllerTest.php index e177332046..e69ce41ea4 100644 --- a/tests/unit/Controllers/Table/ExportControllerTest.php +++ b/tests/unit/Controllers/Table/ExportControllerTest.php @@ -114,7 +114,6 @@ class ExportControllerTest extends AbstractTestCase (new ExportController( $response, - $template, new Options(new Relation($dbi), new TemplateModel($dbi)), $pageSettings, ))(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Table/ExportRowsControllerTest.php b/tests/unit/Controllers/Table/ExportRowsControllerTest.php index c8d89dba7d..8e270cb946 100644 --- a/tests/unit/Controllers/Table/ExportRowsControllerTest.php +++ b/tests/unit/Controllers/Table/ExportRowsControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Controllers\Table\ExportRowsController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -37,7 +36,6 @@ class ExportRowsControllerTest extends AbstractTestCase (new ExportRowsController( new ResponseRenderer(), - new Template(), $controller, ))(self::createStub(ServerRequest::class)); @@ -55,11 +53,7 @@ class ExportRowsControllerTest extends AbstractTestCase $controller->expects(self::never())->method('__invoke'); $response = new ResponseRenderer(); - (new ExportRowsController( - $response, - new Template(), - $controller, - ))(self::createStub(ServerRequest::class)); + (new ExportRowsController($response, $controller))(self::createStub(ServerRequest::class)); self::assertSame(['message' => 'No row selected.'], $response->getJSONResult()); self::assertFalse($response->hasSuccessState()); @@ -79,7 +73,6 @@ class ExportRowsControllerTest extends AbstractTestCase (new ExportRowsController( new ResponseRenderer(), - new Template(), $controller, ))(self::createStub(ServerRequest::class)); diff --git a/tests/unit/Controllers/Table/GetFieldControllerTest.php b/tests/unit/Controllers/Table/GetFieldControllerTest.php index d624796439..ec9f7173d0 100644 --- a/tests/unit/Controllers/Table/GetFieldControllerTest.php +++ b/tests/unit/Controllers/Table/GetFieldControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -52,7 +51,7 @@ class GetFieldControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface($dummyDbi); DatabaseInterface::$instance = $dbi; - (new GetFieldController(new ResponseRenderer(), new Template(), $dbi))($request); + (new GetFieldController(new ResponseRenderer(), $dbi))($request); $this->expectOutputString('46494c45'); } } diff --git a/tests/unit/Controllers/Table/ImportControllerTest.php b/tests/unit/Controllers/Table/ImportControllerTest.php index 583d3620a4..9e94800df9 100644 --- a/tests/unit/Controllers/Table/ImportControllerTest.php +++ b/tests/unit/Controllers/Table/ImportControllerTest.php @@ -95,7 +95,7 @@ class ImportControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db', 'table' => 'test_table']); $response = new ResponseRenderer(); - (new ImportController($response, $template, $dbi, $pageSettings, new DbTableExists($dbi)))($request); + (new ImportController($response, $dbi, $pageSettings, new DbTableExists($dbi)))($request); self::assertSame($expected, $response->getHTMLResult()); } } diff --git a/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php b/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php index 5579c65625..fd5d17ab32 100644 --- a/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/AnalyzeControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Table\Maintenance\AnalyzeController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -26,7 +25,7 @@ class AnalyzeControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new AnalyzeController($response, new Template(), new Maintenance($dbi), $this->createConfig()); + $controller = new AnalyzeController($response, new Maintenance($dbi), $this->createConfig()); $controller($request); self::assertFalse($response->hasSuccessState()); self::assertSame(['message' => 'No table selected.'], $response->getJSONResult()); diff --git a/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php b/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php index 60e5803b5a..5a311619b0 100644 --- a/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/CheckControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Table\Maintenance\CheckController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -26,7 +25,7 @@ class CheckControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new CheckController($response, new Template(), new Maintenance($dbi), $this->createConfig()); + $controller = new CheckController($response, new Maintenance($dbi), $this->createConfig()); $controller($request); self::assertFalse($response->hasSuccessState()); self::assertSame(['message' => 'No table selected.'], $response->getJSONResult()); diff --git a/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php b/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php index 0e481e5a60..04ffa99b15 100644 --- a/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/ChecksumControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Table\Maintenance\ChecksumController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -26,7 +25,7 @@ class ChecksumControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new ChecksumController($response, new Template(), new Maintenance($dbi), $this->createConfig()); + $controller = new ChecksumController($response, new Maintenance($dbi), $this->createConfig()); $controller($request); self::assertFalse($response->hasSuccessState()); self::assertSame(['message' => 'No table selected.'], $response->getJSONResult()); diff --git a/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php b/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php index 19a51d34fc..f4144e4146 100644 --- a/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/OptimizeControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Table\Maintenance\OptimizeController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -26,7 +25,7 @@ class OptimizeControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new OptimizeController($response, new Template(), new Maintenance($dbi), $this->createConfig()); + $controller = new OptimizeController($response, new Maintenance($dbi), $this->createConfig()); $controller($request); self::assertFalse($response->hasSuccessState()); self::assertSame(['message' => 'No table selected.'], $response->getJSONResult()); diff --git a/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php b/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php index a085db5e43..0faff935eb 100644 --- a/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php +++ b/tests/unit/Controllers/Table/Maintenance/RepairControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Table\Maintenance\RepairController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Table\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -26,7 +25,7 @@ class RepairControllerTest extends AbstractTestCase $dbi = $this->createDatabaseInterface(); DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new RepairController($response, new Template(), new Maintenance($dbi), $this->createConfig()); + $controller = new RepairController($response, new Maintenance($dbi), $this->createConfig()); $controller($request); self::assertFalse($response->hasSuccessState()); self::assertSame(['message' => 'No table selected.'], $response->getJSONResult()); diff --git a/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php b/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php index 4ef8ad7eda..c948724edd 100644 --- a/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/AnalyzeControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class AnalyzeControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new AnalyzeController($response, new Template(), new Maintenance($dbi)); + $controller = new AnalyzeController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/Partition/CheckControllerTest.php b/tests/unit/Controllers/Table/Partition/CheckControllerTest.php index d51e72b368..a8ae7544a4 100644 --- a/tests/unit/Controllers/Table/Partition/CheckControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/CheckControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class CheckControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new CheckController($response, new Template(), new Maintenance($dbi)); + $controller = new CheckController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/Partition/DropControllerTest.php b/tests/unit/Controllers/Table/Partition/DropControllerTest.php index 77d53986f4..4661ed568f 100644 --- a/tests/unit/Controllers/Table/Partition/DropControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/DropControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class DropControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new DropController($response, new Template(), new Maintenance($dbi)); + $controller = new DropController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php b/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php index 4ee6da1693..b0ae29efd4 100644 --- a/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/OptimizeControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class OptimizeControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new OptimizeController($response, new Template(), new Maintenance($dbi)); + $controller = new OptimizeController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php b/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php index 2e1477c9a5..3f7ee38b76 100644 --- a/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/RebuildControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class RebuildControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new RebuildController($response, new Template(), new Maintenance($dbi)); + $controller = new RebuildController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/Partition/RepairControllerTest.php b/tests/unit/Controllers/Table/Partition/RepairControllerTest.php index 4c0e45b3fd..74257a7af8 100644 --- a/tests/unit/Controllers/Table/Partition/RepairControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/RepairControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class RepairControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new RepairController($response, new Template(), new Maintenance($dbi)); + $controller = new RepairController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php b/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php index 7a820805ea..445fb2c5a8 100644 --- a/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php +++ b/tests/unit/Controllers/Table/Partition/TruncateControllerTest.php @@ -9,7 +9,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Partitioning\Maintenance; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -32,7 +31,7 @@ class TruncateControllerTest extends AbstractTestCase DatabaseInterface::$instance = $dbi; $response = new ResponseRenderer(); - $controller = new TruncateController($response, new Template(), new Maintenance($dbi)); + $controller = new TruncateController($response, new Maintenance($dbi)); $controller($request); self::assertSame(Message::error($message)->getDisplay(), $response->getHTMLResult()); diff --git a/tests/unit/Controllers/Table/PrivilegesControllerTest.php b/tests/unit/Controllers/Table/PrivilegesControllerTest.php index a781ed5c2a..a7a3d1a983 100644 --- a/tests/unit/Controllers/Table/PrivilegesControllerTest.php +++ b/tests/unit/Controllers/Table/PrivilegesControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Server\Privileges; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Url; @@ -51,7 +50,6 @@ class PrivilegesControllerTest extends AbstractTestCase $response = new ResponseRenderer(); (new PrivilegesController( $response, - new Template(), $serverPrivileges, DatabaseInterface::getInstance(), ))($request); @@ -102,7 +100,6 @@ class PrivilegesControllerTest extends AbstractTestCase $response = new ResponseRenderer(); (new PrivilegesController( $response, - new Template(), self::createStub(Privileges::class), $this->createDatabaseInterface(), ))($request); @@ -120,7 +117,6 @@ class PrivilegesControllerTest extends AbstractTestCase $response = new ResponseRenderer(); (new PrivilegesController( $response, - new Template(), self::createStub(Privileges::class), $this->createDatabaseInterface(), ))($request); diff --git a/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php b/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php index 1e7ddaf13a..2b07b087d8 100644 --- a/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php +++ b/tests/unit/Controllers/Table/RecentFavoriteControllerTest.php @@ -14,7 +14,6 @@ use PhpMyAdmin\Favorites\TableType; use PhpMyAdmin\Http\Factory\ServerRequestFactory; use PhpMyAdmin\Identifiers\DatabaseName; use PhpMyAdmin\Identifiers\TableName; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -53,7 +52,7 @@ class RecentFavoriteControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'test_db', 'table' => 'test_table']); $responseRenderer = new ResponseRenderer(); - (new RecentFavoriteController($responseRenderer, new Template()))($request); + (new RecentFavoriteController($responseRenderer))($request); $response = $responseRenderer->getResponse(); self::assertSame(302, $response->getStatusCode()); @@ -92,7 +91,7 @@ class RecentFavoriteControllerTest extends AbstractTestCase ->withQueryParams(['db' => 'invalid_db', 'table' => 'invalid_table']); $responseRenderer = new ResponseRenderer(); - (new RecentFavoriteController($responseRenderer, new Template()))($request); + (new RecentFavoriteController($responseRenderer))($request); $response = $responseRenderer->getResponse(); self::assertSame(302, $response->getStatusCode()); @@ -114,7 +113,7 @@ class RecentFavoriteControllerTest extends AbstractTestCase ->withQueryParams(['db' => '', 'table' => '']); $responseRenderer = new ResponseRenderer(); - (new RecentFavoriteController($responseRenderer, new Template()))($request); + (new RecentFavoriteController($responseRenderer))($request); $response = $responseRenderer->getResponse(); self::assertSame(302, $response->getStatusCode()); diff --git a/tests/unit/Controllers/Table/ReplaceControllerTest.php b/tests/unit/Controllers/Table/ReplaceControllerTest.php index 8ab9c558cd..fc2191c912 100644 --- a/tests/unit/Controllers/Table/ReplaceControllerTest.php +++ b/tests/unit/Controllers/Table/ReplaceControllerTest.php @@ -103,7 +103,6 @@ class ReplaceControllerTest extends AbstractTestCase $bookmarkRepository = new BookmarkRepository($dbi, $relation); $sqlController = new SqlController( $response, - $template, new Sql( $dbi, $relation, @@ -120,7 +119,6 @@ class ReplaceControllerTest extends AbstractTestCase $replaceController = new ReplaceController( $response, - $template, new InsertEdit($dbi, $relation, $transformations, new FileListing(), $template, Config::getInstance()), $transformations, $relation, @@ -157,7 +155,6 @@ class ReplaceControllerTest extends AbstractTestCase $replaceController = new ReplaceController( self::createStub(ResponseRenderer::class), - self::createStub(Template::class), self::createStub(InsertEdit::class), self::createStub(Transformations::class), self::createStub(Relation::class), diff --git a/tests/unit/Controllers/Table/SqlControllerTest.php b/tests/unit/Controllers/Table/SqlControllerTest.php index bda2c0bc87..d0fdc6bbd8 100644 --- a/tests/unit/Controllers/Table/SqlControllerTest.php +++ b/tests/unit/Controllers/Table/SqlControllerTest.php @@ -94,7 +94,6 @@ class SqlControllerTest extends AbstractTestCase $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); (new SqlController( $response, - $template, new SqlQueryForm($template, $this->dbi, $bookmarkRepository), $pageSettings, new DbTableExists($this->dbi), diff --git a/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php b/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php index 988b2f2346..7ab0475455 100644 --- a/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/ChangeControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Controllers\Table\Structure\ChangeController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Table\ColumnsDefinition; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\DbiDummy; use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseStub; @@ -49,7 +48,6 @@ class ChangeControllerTest extends AbstractTestCase $ctrl = new ChangeController( $response, - new Template(), $this->dbi, new ColumnsDefinition($this->dbi, new Relation($this->dbi), new Transformations()), new UserPrivilegesFactory($this->dbi), diff --git a/tests/unit/Controllers/Table/Structure/SaveControllerTest.php b/tests/unit/Controllers/Table/Structure/SaveControllerTest.php index 8f26eb34b9..b025fdedef 100644 --- a/tests/unit/Controllers/Table/Structure/SaveControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/SaveControllerTest.php @@ -10,7 +10,6 @@ use PhpMyAdmin\Controllers\Table\StructureController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Transformations; @@ -94,7 +93,6 @@ class SaveControllerTest extends AbstractTestCase (new SaveController( new ResponseRenderer(), - new Template(), new Relation($dbi), new Transformations(), $dbi, @@ -117,7 +115,6 @@ class SaveControllerTest extends AbstractTestCase $ctrl = new SaveController( new ResponseRenderer(), - new Template(), new Relation($dbi), new Transformations(), $dbi, diff --git a/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php b/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php index 1930e2f58c..0a23a594de 100644 --- a/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/SpatialControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Table\Indexes; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -37,7 +36,7 @@ class SpatialControllerTest extends AbstractTestCase $controllerStub->expects(self::once())->method('__invoke')->with($request); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new SpatialController(new ResponseRenderer(), new Template(), $controllerStub, $indexes); + $controller = new SpatialController(new ResponseRenderer(), $controllerStub, $indexes); $controller($request); self::assertEquals(Message::success(), $GLOBALS['message']); @@ -65,7 +64,7 @@ class SpatialControllerTest extends AbstractTestCase $controllerStub->expects(self::once())->method('__invoke')->with($request); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new SpatialController(new ResponseRenderer(), new Template(), $controllerStub, $indexes); + $controller = new SpatialController(new ResponseRenderer(), $controllerStub, $indexes); $controller($request); self::assertEquals(Message::success(), $GLOBALS['message']); @@ -91,7 +90,7 @@ class SpatialControllerTest extends AbstractTestCase $response = new ResponseRenderer(); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new SpatialController($response, new Template(), $controllerStub, $indexes); + $controller = new SpatialController($response, $controllerStub, $indexes); $controller($request); self::assertFalse($response->hasSuccessState()); @@ -121,7 +120,7 @@ class SpatialControllerTest extends AbstractTestCase $controllerStub->expects(self::once())->method('__invoke')->with($request); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new SpatialController(new ResponseRenderer(), new Template(), $controllerStub, $indexes); + $controller = new SpatialController(new ResponseRenderer(), $controllerStub, $indexes); $controller($request); self::assertEquals( diff --git a/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php b/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php index 131255d5ad..90dc2e24b5 100644 --- a/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php +++ b/tests/unit/Controllers/Table/Structure/UniqueControllerTest.php @@ -11,7 +11,6 @@ use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Message; use PhpMyAdmin\Table\Indexes; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PHPUnit\Framework\Attributes\CoversClass; @@ -37,7 +36,7 @@ class UniqueControllerTest extends AbstractTestCase $controllerStub->expects(self::once())->method('__invoke')->with($request); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new UniqueController(new ResponseRenderer(), new Template(), $controllerStub, $indexes); + $controller = new UniqueController(new ResponseRenderer(), $controllerStub, $indexes); $controller($request); self::assertEquals(Message::success(), $GLOBALS['message']); @@ -65,7 +64,7 @@ class UniqueControllerTest extends AbstractTestCase $controllerStub->expects(self::once())->method('__invoke')->with($request); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new UniqueController(new ResponseRenderer(), new Template(), $controllerStub, $indexes); + $controller = new UniqueController(new ResponseRenderer(), $controllerStub, $indexes); $controller($request); self::assertEquals(Message::success(), $GLOBALS['message']); @@ -91,7 +90,7 @@ class UniqueControllerTest extends AbstractTestCase $response = new ResponseRenderer(); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new UniqueController($response, new Template(), $controllerStub, $indexes); + $controller = new UniqueController($response, $controllerStub, $indexes); $controller($request); self::assertFalse($response->hasSuccessState()); @@ -121,7 +120,7 @@ class UniqueControllerTest extends AbstractTestCase $controllerStub->expects(self::once())->method('__invoke')->with($request); $indexes = new Indexes(DatabaseInterface::getInstance()); - $controller = new UniqueController(new ResponseRenderer(), new Template(), $controllerStub, $indexes); + $controller = new UniqueController(new ResponseRenderer(), $controllerStub, $indexes); $controller($request); self::assertEquals( diff --git a/tests/unit/Controllers/Table/TrackingControllerTest.php b/tests/unit/Controllers/Table/TrackingControllerTest.php index 54fd392f94..952edb783b 100644 --- a/tests/unit/Controllers/Table/TrackingControllerTest.php +++ b/tests/unit/Controllers/Table/TrackingControllerTest.php @@ -58,7 +58,6 @@ class TrackingControllerTest extends AbstractTestCase $bookmarkRepository = new BookmarkRepository($this->dbi, $relation); (new TrackingController( $response, - $template, new Tracking( new SqlQueryForm($template, $this->dbi, $bookmarkRepository), $template, diff --git a/tests/unit/Controllers/ThemeSetControllerTest.php b/tests/unit/Controllers/ThemeSetControllerTest.php index a6d516ebe4..91a98b83d5 100644 --- a/tests/unit/Controllers/ThemeSetControllerTest.php +++ b/tests/unit/Controllers/ThemeSetControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Config; use PhpMyAdmin\Controllers\ThemeSetController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Theme\ThemeManager; @@ -43,7 +42,7 @@ class ThemeSetControllerTest extends AbstractTestCase $userPreferences->expects(self::once())->method('save') ->with(self::equalTo(['ThemeDefault' => 'theme_name'])); - (new ThemeSetController(new ResponseRenderer(), new Template(), $themeManager, $userPreferences))($request); + (new ThemeSetController(new ResponseRenderer(), $themeManager, $userPreferences))($request); } /** @param string[]|string|null $themeName */ @@ -63,7 +62,7 @@ class ThemeSetControllerTest extends AbstractTestCase $userPreferences->expects(self::never())->method('load'); $userPreferences->expects(self::never())->method('save'); - (new ThemeSetController(new ResponseRenderer(), new Template(), $themeManager, $userPreferences))($request); + (new ThemeSetController(new ResponseRenderer(), $themeManager, $userPreferences))($request); } /** diff --git a/tests/unit/Controllers/Transformation/OverviewControllerTest.php b/tests/unit/Controllers/Transformation/OverviewControllerTest.php index f5d27238b9..e9bf00b1c9 100644 --- a/tests/unit/Controllers/Transformation/OverviewControllerTest.php +++ b/tests/unit/Controllers/Transformation/OverviewControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\Transformation\OverviewController; use PhpMyAdmin\Current; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\Transformations; @@ -38,7 +37,7 @@ class OverviewControllerTest extends AbstractTestCase { $response = new ResponseRenderer(); - $controller = new OverviewController($response, new Template(), new Transformations()); + $controller = new OverviewController($response, new Transformations()); $controller(self::createStub(ServerRequest::class)); $actual = $response->getHTMLResult(); diff --git a/tests/unit/Controllers/VersionCheckControllerTest.php b/tests/unit/Controllers/VersionCheckControllerTest.php index da1cf8b1e3..21d2f7d609 100644 --- a/tests/unit/Controllers/VersionCheckControllerTest.php +++ b/tests/unit/Controllers/VersionCheckControllerTest.php @@ -8,7 +8,6 @@ use PhpMyAdmin\Controllers\VersionCheckController; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Http\ServerRequest; use PhpMyAdmin\Release; -use PhpMyAdmin\Template; use PhpMyAdmin\Tests\AbstractTestCase; use PhpMyAdmin\Tests\Stubs\ResponseRenderer; use PhpMyAdmin\VersionInformation; @@ -42,7 +41,6 @@ class VersionCheckControllerTest extends AbstractTestCase (new VersionCheckController( new ResponseRenderer(), - new Template(), $versionInformation, ))(self::createStub(ServerRequest::class)); @@ -67,7 +65,6 @@ class VersionCheckControllerTest extends AbstractTestCase (new VersionCheckController( new ResponseRenderer(), - new Template(), $versionInformation, ))(self::createStub(ServerRequest::class)); @@ -86,7 +83,6 @@ class VersionCheckControllerTest extends AbstractTestCase (new VersionCheckController( new ResponseRenderer(), - new Template(), $versionInformation, ))(self::createStub(ServerRequest::class));