From 3531775b7cd2aa72ddff970aa6e6ca36568c146a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sat, 11 Sep 2021 17:32:22 -0300 Subject: [PATCH] Add type declarations to the controllers contructors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .../classes/Controllers/AbstractController.php | 5 +---- .../Controllers/BrowseForeignersController.php | 13 ++++++------- .../Controllers/CheckRelationsController.php | 5 +---- .../CollationConnectionController.php | 6 +----- .../classes/Controllers/ColumnController.php | 6 +----- .../Controllers/Config/GetConfigController.php | 5 +---- .../Controllers/Config/SetConfigController.php | 5 +---- .../Controllers/Database/AbstractController.php | 6 +----- .../PopulateColumnsController.php | 13 ++++++------- .../Database/CentralColumnsController.php | 13 ++++++------- .../Database/DataDictionaryController.php | 17 ++++++++--------- .../Controllers/Database/DesignerController.php | 8 ++------ .../Controllers/Database/EventsController.php | 14 +++++++------- .../Controllers/Database/ExportController.php | 13 +++++++------ .../Controllers/Database/ImportController.php | 7 +------ .../MultiTableQuery/TablesController.php | 6 +----- .../Database/MultiTableQueryController.php | 7 +------ .../Database/Operations/CollationController.php | 11 +++-------- .../Database/OperationsController.php | 11 +++-------- .../Database/PrivilegesController.php | 14 +++++++------- .../Database/QueryByExampleController.php | 14 +++++++------- .../Controllers/Database/RoutinesController.php | 14 +++++++------- .../Controllers/Database/SearchController.php | 7 +------ .../Database/SqlAutoCompleteController.php | 7 +------ .../Controllers/Database/SqlController.php | 6 +----- .../Structure/AddPrefixTableController.php | 14 +++++++------- .../Structure/CentralColumns/AddController.php | 14 +++++++------- .../CentralColumns/MakeConsistentController.php | 14 +++++++------- .../CentralColumns/RemoveController.php | 14 +++++++------- .../Database/Structure/CopyTableController.php | 8 ++------ .../Structure/CopyTableWithPrefixController.php | 12 ++++++------ .../Database/Structure/DropFormController.php | 7 +------ .../Database/Structure/DropTableController.php | 11 +++-------- .../Database/Structure/EmptyTableController.php | 11 +++-------- .../Structure/FavoriteTableController.php | 6 +----- .../Structure/RealRowCountController.php | 7 +------ .../Structure/ReplacePrefixController.php | 14 +++++++------- .../Database/Structure/ShowCreateController.php | 7 +------ .../Database/StructureController.php | 17 +++++------------ .../Controllers/Database/TrackingController.php | 14 +++++++------- .../Controllers/Database/TriggersController.php | 7 +------ .../Controllers/ErrorReportController.php | 5 +---- .../Controllers/Export/ExportController.php | 5 +---- .../Controllers/Export/TablesController.php | 5 +---- .../Export/Template/CreateController.php | 5 +---- .../Export/Template/DeleteController.php | 5 +---- .../Export/Template/LoadController.php | 5 +---- .../Export/Template/UpdateController.php | 5 +---- .../classes/Controllers/GitInfoController.php | 6 +----- .../classes/Controllers/HomeController.php | 14 +++++++------- .../classes/Controllers/ImportController.php | 13 +++++++------ .../Controllers/ImportStatusController.php | 3 --- .../Controllers/NavigationController.php | 5 +---- .../Controllers/NormalizationController.php | 5 +---- .../Preferences/ExportController.php | 5 +---- .../Preferences/FeaturesController.php | 5 +---- .../Preferences/ImportController.php | 5 +---- .../Preferences/MainPanelController.php | 5 +---- .../Preferences/ManageController.php | 5 +---- .../Preferences/NavigationController.php | 5 +---- .../Controllers/Preferences/SqlController.php | 5 +---- .../Preferences/TwoFactorController.php | 5 +---- .../Controllers/SchemaExportController.php | 4 ---- .../Controllers/Server/BinlogController.php | 6 +----- .../Controllers/Server/CollationsController.php | 10 ++++------ .../Server/Databases/CreateController.php | 6 +----- .../Server/Databases/DestroyController.php | 8 ++------ .../Controllers/Server/DatabasesController.php | 8 ++------ .../Controllers/Server/EnginesController.php | 6 +----- .../Controllers/Server/ExportController.php | 6 +----- .../Controllers/Server/ImportController.php | 6 +----- .../Controllers/Server/PluginsController.php | 12 ++++++------ .../Controllers/Server/PrivilegesController.php | 12 ++++++------ .../Server/ReplicationController.php | 12 ++++++------ .../Controllers/Server/ShowEngineController.php | 6 +----- .../Controllers/Server/SqlController.php | 12 ++++++------ .../Server/Status/AbstractController.php | 6 +----- .../Server/Status/AdvisorController.php | 6 +----- .../Status/Monitor/ChartingDataController.php | 15 +++++++-------- .../Status/Monitor/GeneralLogController.php | 15 +++++++-------- .../Server/Status/Monitor/LogVarsController.php | 15 +++++++-------- .../Status/Monitor/QueryAnalyzerController.php | 15 +++++++-------- .../Server/Status/Monitor/SlowLogController.php | 15 +++++++-------- .../Server/Status/MonitorController.php | 7 +------ .../Server/Status/Processes/KillController.php | 7 +------ .../Status/Processes/RefreshController.php | 6 +----- .../Server/Status/ProcessesController.php | 14 +++++++------- .../Server/Status/QueriesController.php | 7 +------ .../Server/Status/StatusController.php | 14 +++++++------- .../Server/Status/VariablesController.php | 7 +------ .../Controllers/Server/UserGroupsController.php | 12 ++++++------ .../Server/UserGroupsFormController.php | 12 ++++++------ .../Server/Variables/GetVariableController.php | 6 +----- .../Server/Variables/SetVariableController.php | 6 +----- .../Controllers/Server/VariablesController.php | 6 +----- .../Controllers/Setup/AbstractController.php | 6 +----- .../Sql/ColumnPreferencesController.php | 8 ++------ .../DefaultForeignKeyCheckValueController.php | 10 +++++----- .../Controllers/Sql/EnumValuesController.php | 5 +---- .../Sql/RelationalValuesController.php | 5 +---- .../Controllers/Sql/SetValuesController.php | 5 +---- .../classes/Controllers/Sql/SqlController.php | 8 ++------ .../Controllers/Table/AbstractController.php | 7 +------ .../Controllers/Table/AddFieldController.php | 14 ++++---------- .../Controllers/Table/ChangeController.php | 11 +++-------- .../Controllers/Table/ChangeRowsController.php | 14 +++++++------- .../Controllers/Table/ChartController.php | 15 +++++++-------- .../Controllers/Table/CreateController.php | 14 ++++---------- .../Controllers/Table/DeleteRowsController.php | 15 +++++++-------- .../Controllers/Table/DropColumnController.php | 14 ++++---------- .../Controllers/Table/ExportController.php | 11 +++-------- .../Controllers/Table/ExportRowsController.php | 14 +++++++------- .../Controllers/Table/FindReplaceController.php | 15 +++++++-------- .../Controllers/Table/GetFieldController.php | 15 +++++++-------- .../Table/GisVisualizationController.php | 15 +++++++-------- .../Controllers/Table/ImportController.php | 15 +++++++-------- .../Controllers/Table/IndexRenameController.php | 16 ++++++++-------- .../Controllers/Table/IndexesController.php | 16 ++++++++-------- .../Table/Maintenance/AnalyzeController.php | 11 +++-------- .../Table/Maintenance/CheckController.php | 11 +++-------- .../Table/Maintenance/ChecksumController.php | 11 +++-------- .../Table/Maintenance/OptimizeController.php | 11 +++-------- .../Table/Maintenance/RepairController.php | 11 +++-------- .../Controllers/Table/OperationsController.php | 14 ++++---------- .../Table/Partition/AnalyzeController.php | 15 +++++++-------- .../Table/Partition/CheckController.php | 15 +++++++-------- .../Table/Partition/DropController.php | 15 +++++++-------- .../Table/Partition/OptimizeController.php | 15 +++++++-------- .../Table/Partition/RebuildController.php | 15 +++++++-------- .../Table/Partition/RepairController.php | 15 +++++++-------- .../Table/Partition/TruncateController.php | 15 +++++++-------- .../Controllers/Table/PrivilegesController.php | 16 ++++++++-------- .../Controllers/Table/RelationController.php | 14 ++++---------- .../Controllers/Table/ReplaceController.php | 14 ++++---------- .../Controllers/Table/SearchController.php | 14 ++++---------- .../classes/Controllers/Table/SqlController.php | 14 +++++++------- .../Table/Structure/AddIndexController.php | 14 ++++---------- .../Table/Structure/AddKeyController.php | 11 +++-------- .../Table/Structure/BrowseController.php | 7 +------ .../Structure/CentralColumnsAddController.php | 11 +++-------- .../CentralColumnsRemoveController.php | 11 +++-------- .../Table/Structure/ChangeController.php | 14 ++++---------- .../Table/Structure/FulltextController.php | 14 ++++---------- .../Table/Structure/MoveColumnsController.php | 15 +++++++-------- .../Table/Structure/PartitioningController.php | 14 ++++---------- .../Table/Structure/PrimaryController.php | 14 ++++---------- .../Table/Structure/SaveController.php | 14 ++++---------- .../Table/Structure/SpatialController.php | 14 ++++---------- .../Table/Structure/UniqueController.php | 14 ++++---------- .../Controllers/Table/StructureController.php | 14 ++++---------- .../Controllers/Table/TrackingController.php | 11 +++-------- .../Controllers/Table/TriggersController.php | 15 +++++++-------- .../Controllers/Table/ZoomSearchController.php | 17 +++++++++-------- .../classes/Controllers/TableController.php | 6 +----- .../classes/Controllers/ThemeSetController.php | 5 +---- .../classes/Controllers/ThemesController.php | 5 +---- .../Transformation/OverviewController.php | 6 +----- .../Transformation/WrapperController.php | 8 ++------ .../Controllers/UserPasswordController.php | 12 ++++++------ .../Controllers/View/CreateController.php | 6 +----- .../Controllers/View/OperationsController.php | 12 ++++++------ libraries/services_controllers.php | 1 - psalm-baseline.xml | 3 +-- 163 files changed, 580 insertions(+), 1058 deletions(-) diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index 130696e8e3..ac808b23ae 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -21,10 +21,7 @@ abstract class AbstractController /** @var Template */ protected $template; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template) + public function __construct(ResponseRenderer $response, Template $template) { $this->response = $response; $this->template = $template; diff --git a/libraries/classes/Controllers/BrowseForeignersController.php b/libraries/classes/Controllers/BrowseForeignersController.php index 275a71572d..0ab7c3e24d 100644 --- a/libraries/classes/Controllers/BrowseForeignersController.php +++ b/libraries/classes/Controllers/BrowseForeignersController.php @@ -21,13 +21,12 @@ class BrowseForeignersController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - * @param BrowseForeigners $browseForeigners - * @param Relation $relation - */ - public function __construct($response, Template $template, $browseForeigners, $relation) - { + public function __construct( + ResponseRenderer $response, + Template $template, + BrowseForeigners $browseForeigners, + Relation $relation + ) { parent::__construct($response, $template); $this->browseForeigners = $browseForeigners; $this->relation = $relation; diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index 5e075e9539..73d8d47bc5 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -17,10 +17,7 @@ class CheckRelationsController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, Relation $relation) + public function __construct(ResponseRenderer $response, Template $template, Relation $relation) { parent::__construct($response, $template); $this->relation = $relation; diff --git a/libraries/classes/Controllers/CollationConnectionController.php b/libraries/classes/Controllers/CollationConnectionController.php index a8edeaf9d6..e11fe462bd 100644 --- a/libraries/classes/Controllers/CollationConnectionController.php +++ b/libraries/classes/Controllers/CollationConnectionController.php @@ -14,11 +14,7 @@ final class CollationConnectionController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - * @param Config $config - */ - public function __construct($response, Template $template, $config) + public function __construct(ResponseRenderer $response, Template $template, Config $config) { parent::__construct($response, $template); $this->config = $config; diff --git a/libraries/classes/Controllers/ColumnController.php b/libraries/classes/Controllers/ColumnController.php index 4beae8d011..d6a53ffbb8 100644 --- a/libraries/classes/Controllers/ColumnController.php +++ b/libraries/classes/Controllers/ColumnController.php @@ -15,11 +15,7 @@ final class ColumnController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Config/GetConfigController.php b/libraries/classes/Controllers/Config/GetConfigController.php index 220fedfeb9..5910f8665c 100644 --- a/libraries/classes/Controllers/Config/GetConfigController.php +++ b/libraries/classes/Controllers/Config/GetConfigController.php @@ -16,10 +16,7 @@ final class GetConfigController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, Config $config) + public function __construct(ResponseRenderer $response, Template $template, Config $config) { parent::__construct($response, $template); $this->config = $config; diff --git a/libraries/classes/Controllers/Config/SetConfigController.php b/libraries/classes/Controllers/Config/SetConfigController.php index f40486d493..4962329035 100644 --- a/libraries/classes/Controllers/Config/SetConfigController.php +++ b/libraries/classes/Controllers/Config/SetConfigController.php @@ -18,10 +18,7 @@ final class SetConfigController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, Config $config) + public function __construct(ResponseRenderer $response, Template $template, Config $config) { parent::__construct($response, $template); $this->config = $config; diff --git a/libraries/classes/Controllers/Database/AbstractController.php b/libraries/classes/Controllers/Database/AbstractController.php index e24b041b2b..296920e2ec 100644 --- a/libraries/classes/Controllers/Database/AbstractController.php +++ b/libraries/classes/Controllers/Database/AbstractController.php @@ -13,11 +13,7 @@ abstract class AbstractController extends Controller /** @var string */ protected $db; - /** - * @param ResponseRenderer $response - * @param string $db Database name - */ - public function __construct($response, Template $template, $db) + public function __construct(ResponseRenderer $response, Template $template, string $db) { parent::__construct($response, $template); $this->db = $db; diff --git a/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php b/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php index 6fce7d0c07..259976236b 100644 --- a/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php @@ -14,13 +14,12 @@ final class PopulateColumnsController extends AbstractController /** @var CentralColumns */ private $centralColumns; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param CentralColumns $centralColumns - */ - public function __construct($response, Template $template, $db, $centralColumns) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + CentralColumns $centralColumns + ) { parent::__construct($response, $template, $db); $this->centralColumns = $centralColumns; } diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 5b607a7e38..ff288ea905 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -23,13 +23,12 @@ class CentralColumnsController extends AbstractController /** @var CentralColumns */ private $centralColumns; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param CentralColumns $centralColumns - */ - public function __construct($response, Template $template, $db, $centralColumns) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + CentralColumns $centralColumns + ) { parent::__construct($response, $template, $db); $this->centralColumns = $centralColumns; } diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index 86ce0c4621..ad52ba60df 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -26,15 +26,14 @@ class DataDictionaryController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param Relation $relation - * @param Transformations $transformations - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $relation, $transformations, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + Relation $relation, + Transformations $transformations, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db); $this->relation = $relation; $this->transformations = $transformations; diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index f732a83546..312ea89299 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -24,14 +24,10 @@ class DesignerController extends AbstractController /** @var DesignerCommon */ private $designerCommon; - /** - * @param ResponseRenderer $response - * @param string $db Database name - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, + string $db, Designer $databaseDesigner, DesignerCommon $designerCommon ) { diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index d012d187e3..6868233b1d 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -21,13 +21,13 @@ final class EventsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, Events $events, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + Events $events, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db); $this->events = $events; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index f9f90e53b1..2ea7e2b922 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -26,12 +26,13 @@ final class ExportController extends AbstractController /** @var Options */ private $exportOptions; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - */ - public function __construct($response, Template $template, $db, Export $export, Options $exportOptions) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + Export $export, + Options $exportOptions + ) { parent::__construct($response, $template, $db); $this->export = $export; $this->exportOptions = $exportOptions; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 90b976b36e..803400fb15 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -28,12 +28,7 @@ final class ImportController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php b/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php index 6508ffa0b6..f04f84eadb 100644 --- a/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php +++ b/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php @@ -17,11 +17,7 @@ final class TablesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index 191479a10e..69f798fadb 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -17,12 +17,7 @@ class MultiTableQueryController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/Operations/CollationController.php b/libraries/classes/Controllers/Database/Operations/CollationController.php index 212e893324..149de56353 100644 --- a/libraries/classes/Controllers/Database/Operations/CollationController.php +++ b/libraries/classes/Controllers/Database/Operations/CollationController.php @@ -23,17 +23,12 @@ final class CollationController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, + string $db, Operations $operations, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db); $this->operations = $operations; diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index 17f148293c..6084b6494d 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -45,20 +45,15 @@ class OperationsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, + string $db, Operations $operations, CheckUserPrivileges $checkUserPrivileges, Relation $relation, RelationCleanup $relationCleanup, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db); $this->operations = $operations; diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index b8e82f8e4a..032c505e78 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -24,13 +24,13 @@ class PrivilegesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, Privileges $privileges, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + Privileges $privileges, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db); $this->privileges = $privileges; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index d62b14a01d..4f7a088425 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -27,13 +27,13 @@ class QueryByExampleController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, Relation $relation, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + Relation $relation, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db); $this->relation = $relation; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 63c73a4a17..e3e435b574 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -27,13 +27,13 @@ class RoutinesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, CheckUserPrivileges $checkUserPrivileges, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + CheckUserPrivileges $checkUserPrivileges, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db); $this->checkUserPrivileges = $checkUserPrivileges; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index f0417b692e..084c7c3a33 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -19,12 +19,7 @@ class SearchController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php index 0d818058c0..b01edac6a3 100644 --- a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php +++ b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php @@ -18,12 +18,7 @@ class SqlAutoCompleteController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index 142435b40f..f18cdb7239 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -21,11 +21,7 @@ class SqlController extends AbstractController /** @var SqlQueryForm */ private $sqlQueryForm; - /** - * @param ResponseRenderer $response - * @param string $db Database name - */ - public function __construct($response, Template $template, $db, SqlQueryForm $sqlQueryForm) + public function __construct(ResponseRenderer $response, Template $template, string $db, SqlQueryForm $sqlQueryForm) { parent::__construct($response, $template, $db); $this->sqlQueryForm = $sqlQueryForm; diff --git a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php index 711a562d6d..fb41a5a5e8 100644 --- a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php +++ b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php @@ -22,13 +22,13 @@ final class AddPrefixTableController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi, StructureController $structureController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + DatabaseInterface $dbi, + StructureController $structureController + ) { parent::__construct($response, $template, $db); $this->dbi = $dbi; $this->structureController = $structureController; diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php index cb10f368c6..9689b976f0 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php @@ -22,13 +22,13 @@ final class AddController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi, StructureController $structureController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + DatabaseInterface $dbi, + StructureController $structureController + ) { parent::__construct($response, $template, $db); $this->dbi = $dbi; $this->structureController = $structureController; diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php index a0dfe49e70..24b3fc4e2e 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php @@ -22,13 +22,13 @@ final class MakeConsistentController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi, StructureController $structureController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + DatabaseInterface $dbi, + StructureController $structureController + ) { parent::__construct($response, $template, $db); $this->dbi = $dbi; $this->structureController = $structureController; diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php index c58785214c..8c79e0d3f3 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php @@ -22,13 +22,13 @@ final class RemoveController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi, StructureController $structureController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + DatabaseInterface $dbi, + StructureController $structureController + ) { parent::__construct($response, $template, $db); $this->dbi = $dbi; $this->structureController = $structureController; diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableController.php b/libraries/classes/Controllers/Database/Structure/CopyTableController.php index 7af069693c..a334a3f133 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyTableController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyTableController.php @@ -22,14 +22,10 @@ final class CopyTableController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, + string $db, Operations $operations, StructureController $structureController ) { diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php index de07cf8f4b..f835680367 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php @@ -20,12 +20,12 @@ final class CopyTableWithPrefixController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - */ - public function __construct($response, Template $template, $db, StructureController $structureController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + StructureController $structureController + ) { parent::__construct($response, $template, $db); $this->structureController = $structureController; } diff --git a/libraries/classes/Controllers/Database/Structure/DropFormController.php b/libraries/classes/Controllers/Database/Structure/DropFormController.php index 91793c1373..33740e4537 100644 --- a/libraries/classes/Controllers/Database/Structure/DropFormController.php +++ b/libraries/classes/Controllers/Database/Structure/DropFormController.php @@ -20,12 +20,7 @@ final class DropFormController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/Structure/DropTableController.php b/libraries/classes/Controllers/Database/Structure/DropTableController.php index 113a918eed..0d97484cf8 100644 --- a/libraries/classes/Controllers/Database/Structure/DropTableController.php +++ b/libraries/classes/Controllers/Database/Structure/DropTableController.php @@ -29,16 +29,11 @@ final class DropTableController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $dbi, + string $db, + DatabaseInterface $dbi, RelationCleanup $relationCleanup, StructureController $structureController ) { diff --git a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php index c543eb0090..80c5d95e0f 100644 --- a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php +++ b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php @@ -42,16 +42,11 @@ final class EmptyTableController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $dbi, + string $db, + DatabaseInterface $dbi, Relation $relation, RelationCleanup $relationCleanup, Operations $operations, diff --git a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php index 596dc6de9d..e6878875c8 100644 --- a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php +++ b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php @@ -24,11 +24,7 @@ final class FavoriteTableController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - * @param string $db - */ - public function __construct($response, Template $template, $db, Relation $relation) + public function __construct(ResponseRenderer $response, Template $template, string $db, Relation $relation) { parent::__construct($response, $template, $db); $this->relation = $relation; diff --git a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php index 1446140793..05017ddeac 100644 --- a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php +++ b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php @@ -21,12 +21,7 @@ final class RealRowCountController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php index 2ac587aaa9..b3d7282e82 100644 --- a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php @@ -24,13 +24,13 @@ final class ReplacePrefixController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi, StructureController $structureController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + DatabaseInterface $dbi, + StructureController $structureController + ) { parent::__construct($response, $template, $db); $this->dbi = $dbi; $this->structureController = $structureController; diff --git a/libraries/classes/Controllers/Database/Structure/ShowCreateController.php b/libraries/classes/Controllers/Database/Structure/ShowCreateController.php index f148316e94..77bc2863dd 100644 --- a/libraries/classes/Controllers/Database/Structure/ShowCreateController.php +++ b/libraries/classes/Controllers/Database/Structure/ShowCreateController.php @@ -17,12 +17,7 @@ final class ShowCreateController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 3bbd1e5b70..8c9796c606 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -87,22 +87,15 @@ class StructureController extends AbstractController /** @var FlashMessages */ private $flash; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param Relation $relation - * @param Replication $replication - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $relation, - $replication, + string $db, + Relation $relation, + Replication $replication, RelationCleanup $relationCleanup, Operations $operations, - $dbi, + DatabaseInterface $dbi, FlashMessages $flash ) { parent::__construct($response, $template, $db); diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 4d4acd837c..a3bf5a6574 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -31,13 +31,13 @@ class TrackingController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, Tracking $tracking, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + Tracking $tracking, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db); $this->tracking = $tracking; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 4e0a0db939..5f330369ef 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -23,12 +23,7 @@ class TriggersController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $dbi) + public function __construct(ResponseRenderer $response, Template $template, string $db, DatabaseInterface $dbi) { parent::__construct($response, $template, $db); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/ErrorReportController.php b/libraries/classes/Controllers/ErrorReportController.php index fbb88e5724..32f4f8648f 100644 --- a/libraries/classes/Controllers/ErrorReportController.php +++ b/libraries/classes/Controllers/ErrorReportController.php @@ -33,11 +33,8 @@ class ErrorReportController extends AbstractController /** @var ErrorHandler */ private $errorHandler; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, ErrorReport $errorReport, ErrorHandler $errorHandler diff --git a/libraries/classes/Controllers/Export/ExportController.php b/libraries/classes/Controllers/Export/ExportController.php index 78f28a7514..1852e31a6f 100644 --- a/libraries/classes/Controllers/Export/ExportController.php +++ b/libraries/classes/Controllers/Export/ExportController.php @@ -47,10 +47,7 @@ final class ExportController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, Export $export, Relation $relation) + public function __construct(ResponseRenderer $response, Template $template, Export $export, Relation $relation) { parent::__construct($response, $template); $this->export = $export; diff --git a/libraries/classes/Controllers/Export/TablesController.php b/libraries/classes/Controllers/Export/TablesController.php index 85a392962a..73d56b3179 100644 --- a/libraries/classes/Controllers/Export/TablesController.php +++ b/libraries/classes/Controllers/Export/TablesController.php @@ -16,10 +16,7 @@ final class TablesController extends AbstractController /** @var ExportController */ private $exportController; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, ExportController $exportController) + public function __construct(ResponseRenderer $response, Template $template, ExportController $exportController) { parent::__construct($response, $template); $this->exportController = $exportController; diff --git a/libraries/classes/Controllers/Export/Template/CreateController.php b/libraries/classes/Controllers/Export/Template/CreateController.php index d55005eb90..40301a4124 100644 --- a/libraries/classes/Controllers/Export/Template/CreateController.php +++ b/libraries/classes/Controllers/Export/Template/CreateController.php @@ -23,11 +23,8 @@ final class CreateController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, TemplateModel $model, Relation $relation diff --git a/libraries/classes/Controllers/Export/Template/DeleteController.php b/libraries/classes/Controllers/Export/Template/DeleteController.php index 348430bd9f..cdb0d5963d 100644 --- a/libraries/classes/Controllers/Export/Template/DeleteController.php +++ b/libraries/classes/Controllers/Export/Template/DeleteController.php @@ -21,11 +21,8 @@ final class DeleteController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, TemplateModel $model, Relation $relation diff --git a/libraries/classes/Controllers/Export/Template/LoadController.php b/libraries/classes/Controllers/Export/Template/LoadController.php index 3cf4bbdb2c..8a6114ead1 100644 --- a/libraries/classes/Controllers/Export/Template/LoadController.php +++ b/libraries/classes/Controllers/Export/Template/LoadController.php @@ -20,11 +20,8 @@ final class LoadController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, TemplateModel $model, Relation $relation diff --git a/libraries/classes/Controllers/Export/Template/UpdateController.php b/libraries/classes/Controllers/Export/Template/UpdateController.php index 3ac3c4d1c3..c127f2c0f2 100644 --- a/libraries/classes/Controllers/Export/Template/UpdateController.php +++ b/libraries/classes/Controllers/Export/Template/UpdateController.php @@ -22,11 +22,8 @@ final class UpdateController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, TemplateModel $model, Relation $relation diff --git a/libraries/classes/Controllers/GitInfoController.php b/libraries/classes/Controllers/GitInfoController.php index 6500046bfc..e1250a0136 100644 --- a/libraries/classes/Controllers/GitInfoController.php +++ b/libraries/classes/Controllers/GitInfoController.php @@ -17,11 +17,7 @@ final class GitInfoController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - * @param Config $config - */ - public function __construct($response, Template $template, $config) + public function __construct(ResponseRenderer $response, Template $template, Config $config) { parent::__construct($response, $template); $this->config = $config; diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 6ee1349233..fbeae67b99 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -49,13 +49,13 @@ class HomeController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Config $config - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $config, ThemeManager $themeManager, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Config $config, + ThemeManager $themeManager, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->config = $config; $this->themeManager = $themeManager; diff --git a/libraries/classes/Controllers/ImportController.php b/libraries/classes/Controllers/ImportController.php index e442ce77c2..d2206572d9 100644 --- a/libraries/classes/Controllers/ImportController.php +++ b/libraries/classes/Controllers/ImportController.php @@ -57,12 +57,13 @@ final class ImportController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Import $import, Sql $sql, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Import $import, + Sql $sql, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->import = $import; $this->sql = $sql; diff --git a/libraries/classes/Controllers/ImportStatusController.php b/libraries/classes/Controllers/ImportStatusController.php index 50582b383c..9acbde687e 100644 --- a/libraries/classes/Controllers/ImportStatusController.php +++ b/libraries/classes/Controllers/ImportStatusController.php @@ -25,9 +25,6 @@ class ImportStatusController /** @var Template */ private $template; - /** - * @param Template $template Template object - */ public function __construct(Template $template) { $this->template = $template; diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index a793667d69..254598cbcd 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -27,11 +27,8 @@ class NavigationController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Navigation $navigation, Relation $relation diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index 8a7187f8bd..f3c0d52755 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -26,10 +26,7 @@ class NormalizationController extends AbstractController /** @var Normalization */ private $normalization; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, Normalization $normalization) + public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { parent::__construct($response, $template); $this->normalization = $normalization; diff --git a/libraries/classes/Controllers/Preferences/ExportController.php b/libraries/classes/Controllers/Preferences/ExportController.php index 33366cb3a7..17a188771e 100644 --- a/libraries/classes/Controllers/Preferences/ExportController.php +++ b/libraries/classes/Controllers/Preferences/ExportController.php @@ -29,11 +29,8 @@ class ExportController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/FeaturesController.php b/libraries/classes/Controllers/Preferences/FeaturesController.php index a96d6b5981..a4480c974c 100644 --- a/libraries/classes/Controllers/Preferences/FeaturesController.php +++ b/libraries/classes/Controllers/Preferences/FeaturesController.php @@ -29,11 +29,8 @@ class FeaturesController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/ImportController.php b/libraries/classes/Controllers/Preferences/ImportController.php index bc230ccd36..7a230ba670 100644 --- a/libraries/classes/Controllers/Preferences/ImportController.php +++ b/libraries/classes/Controllers/Preferences/ImportController.php @@ -29,11 +29,8 @@ class ImportController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/MainPanelController.php b/libraries/classes/Controllers/Preferences/MainPanelController.php index f5a54a2a91..e01d2e38af 100644 --- a/libraries/classes/Controllers/Preferences/MainPanelController.php +++ b/libraries/classes/Controllers/Preferences/MainPanelController.php @@ -29,11 +29,8 @@ class MainPanelController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index d8741a45c1..598b4d3e31 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -51,11 +51,8 @@ class ManageController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/NavigationController.php b/libraries/classes/Controllers/Preferences/NavigationController.php index 1800c66844..10708abb32 100644 --- a/libraries/classes/Controllers/Preferences/NavigationController.php +++ b/libraries/classes/Controllers/Preferences/NavigationController.php @@ -29,11 +29,8 @@ class NavigationController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/SqlController.php b/libraries/classes/Controllers/Preferences/SqlController.php index 3f0101245a..331d38a35e 100644 --- a/libraries/classes/Controllers/Preferences/SqlController.php +++ b/libraries/classes/Controllers/Preferences/SqlController.php @@ -29,11 +29,8 @@ class SqlController extends AbstractController /** @var Config */ private $config; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, UserPreferences $userPreferences, Relation $relation, diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index 622a2613e3..ece1c4bc57 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -19,10 +19,7 @@ class TwoFactorController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, Relation $relation) + public function __construct(ResponseRenderer $response, Template $template, Relation $relation) { parent::__construct($response, $template); $this->relation = $relation; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index f6a3e2f1ea..23713dc575 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -19,10 +19,6 @@ class SchemaExportController /** @var Relation */ private $relation; - /** - * @param Export $export A Export instance. - * @param Relation $relation A Relation instance. - */ public function __construct(Export $export, Relation $relation) { $this->export = $export; diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index 5e90f2fb07..85a2853555 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -30,11 +30,7 @@ class BinlogController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/CollationsController.php b/libraries/classes/Controllers/Server/CollationsController.php index c0bb245b38..b7ede287ad 100644 --- a/libraries/classes/Controllers/Server/CollationsController.php +++ b/libraries/classes/Controllers/Server/CollationsController.php @@ -28,15 +28,13 @@ class CollationsController extends AbstractController private $dbi; /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - * @param array|null $charsets Array of charsets - * @param array|null $collations Array of collations + * @param array|null $charsets + * @param array|null $collations */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $dbi, + DatabaseInterface $dbi, ?array $charsets = null, ?array $collations = null ) { diff --git a/libraries/classes/Controllers/Server/Databases/CreateController.php b/libraries/classes/Controllers/Server/Databases/CreateController.php index 0c6b1442b0..158fea9029 100644 --- a/libraries/classes/Controllers/Server/Databases/CreateController.php +++ b/libraries/classes/Controllers/Server/Databases/CreateController.php @@ -26,11 +26,7 @@ final class CreateController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Databases/DestroyController.php b/libraries/classes/Controllers/Server/Databases/DestroyController.php index 4f7d50cf0f..e0e80d6120 100644 --- a/libraries/classes/Controllers/Server/Databases/DestroyController.php +++ b/libraries/classes/Controllers/Server/Databases/DestroyController.php @@ -29,14 +29,10 @@ final class DestroyController extends AbstractController /** @var RelationCleanup */ private $relationCleanup; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $dbi, + DatabaseInterface $dbi, Transformations $transformations, RelationCleanup $relationCleanup ) { diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index ad5d353971..d7a97a0896 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -60,16 +60,12 @@ class DatabasesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Transformations $transformations, RelationCleanup $relationCleanup, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template); $this->transformations = $transformations; diff --git a/libraries/classes/Controllers/Server/EnginesController.php b/libraries/classes/Controllers/Server/EnginesController.php index a18998a506..e9c90c34f0 100644 --- a/libraries/classes/Controllers/Server/EnginesController.php +++ b/libraries/classes/Controllers/Server/EnginesController.php @@ -19,11 +19,7 @@ class EnginesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 74b13e1d9e..fc46eb0dcd 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -25,11 +25,7 @@ final class ExportController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Options $export, $dbi) + public function __construct(ResponseRenderer $response, Template $template, Options $export, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->export = $export; diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index aeb1146fa9..8d3cb0e88e 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -29,11 +29,7 @@ final class ImportController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index 9b8098afcc..bf8b01b94b 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -27,12 +27,12 @@ class PluginsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Plugins $plugins, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Plugins $plugins, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->plugins = $plugins; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index 82449f3b0b..15d7f32c63 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -42,12 +42,12 @@ class PrivilegesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Relation $relation, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Relation $relation, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->relation = $relation; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index 043c3944a3..4f0215a74a 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -28,12 +28,12 @@ class ReplicationController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, ReplicationGui $replicationGui, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + ReplicationGui $replicationGui, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->replicationGui = $replicationGui; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/ShowEngineController.php b/libraries/classes/Controllers/Server/ShowEngineController.php index 3057f1615d..7e01099337 100644 --- a/libraries/classes/Controllers/Server/ShowEngineController.php +++ b/libraries/classes/Controllers/Server/ShowEngineController.php @@ -20,11 +20,7 @@ final class ShowEngineController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php index 41c0a9395b..20ca5b1339 100644 --- a/libraries/classes/Controllers/Server/SqlController.php +++ b/libraries/classes/Controllers/Server/SqlController.php @@ -23,12 +23,12 @@ class SqlController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, SqlQueryForm $sqlQueryForm, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + SqlQueryForm $sqlQueryForm, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->sqlQueryForm = $sqlQueryForm; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/AbstractController.php b/libraries/classes/Controllers/Server/Status/AbstractController.php index 06be11bf51..096e186ff9 100644 --- a/libraries/classes/Controllers/Server/Status/AbstractController.php +++ b/libraries/classes/Controllers/Server/Status/AbstractController.php @@ -14,11 +14,7 @@ abstract class AbstractController extends Controller /** @var Data */ protected $data; - /** - * @param ResponseRenderer $response - * @param Data $data - */ - public function __construct($response, Template $template, $data) + public function __construct(ResponseRenderer $response, Template $template, Data $data) { parent::__construct($response, $template); $this->data = $data; diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 033d82ef07..a016ec72dd 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -17,11 +17,7 @@ class AdvisorController extends AbstractController /** @var Advisor */ private $advisor; - /** - * @param ResponseRenderer $response - * @param Data $data - */ - public function __construct($response, Template $template, $data, Advisor $advisor) + public function __construct(ResponseRenderer $response, Template $template, Data $data, Advisor $advisor) { parent::__construct($response, $template, $data); $this->advisor = $advisor; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php index 50235fd2fb..dfdfe7739f 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php @@ -20,14 +20,13 @@ final class ChartingDataController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param Monitor $monitor - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $monitor, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + Monitor $monitor, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $data); $this->monitor = $monitor; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php index 4406e78dcd..1fb20be619 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php @@ -20,14 +20,13 @@ final class GeneralLogController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param Monitor $monitor - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $monitor, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + Monitor $monitor, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $data); $this->monitor = $monitor; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php index 0e8dd1e6e2..8d628996a3 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php @@ -20,14 +20,13 @@ final class LogVarsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param Monitor $monitor - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $monitor, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + Monitor $monitor, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $data); $this->monitor = $monitor; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php index dec930a15d..93ae374ec4 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php @@ -20,14 +20,13 @@ final class QueryAnalyzerController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param Monitor $monitor - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $monitor, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + Monitor $monitor, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $data); $this->monitor = $monitor; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php index 37906eadfa..f734c66847 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php @@ -20,14 +20,13 @@ final class SlowLogController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param Monitor $monitor - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $monitor, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + Monitor $monitor, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $data); $this->monitor = $monitor; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/MonitorController.php b/libraries/classes/Controllers/Server/Status/MonitorController.php index 940e02b54b..74ad8a2c85 100644 --- a/libraries/classes/Controllers/Server/Status/MonitorController.php +++ b/libraries/classes/Controllers/Server/Status/MonitorController.php @@ -19,12 +19,7 @@ class MonitorController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $dbi) + public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { parent::__construct($response, $template, $data); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/Processes/KillController.php b/libraries/classes/Controllers/Server/Status/Processes/KillController.php index 36eacfc4a0..2e894ee0af 100644 --- a/libraries/classes/Controllers/Server/Status/Processes/KillController.php +++ b/libraries/classes/Controllers/Server/Status/Processes/KillController.php @@ -19,12 +19,7 @@ final class KillController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $dbi) + public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { parent::__construct($response, $template, $data); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php b/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php index d42198b19e..1c513aec8f 100644 --- a/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php +++ b/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php @@ -15,11 +15,7 @@ final class RefreshController extends AbstractController /** @var Processes */ private $processes; - /** - * @param ResponseRenderer $response - * @param Data $data - */ - public function __construct($response, Template $template, $data, Processes $processes) + public function __construct(ResponseRenderer $response, Template $template, Data $data, Processes $processes) { parent::__construct($response, $template, $data); $this->processes = $processes; diff --git a/libraries/classes/Controllers/Server/Status/ProcessesController.php b/libraries/classes/Controllers/Server/Status/ProcessesController.php index 0f6ee43ff3..5ea1a9a959 100644 --- a/libraries/classes/Controllers/Server/Status/ProcessesController.php +++ b/libraries/classes/Controllers/Server/Status/ProcessesController.php @@ -19,13 +19,13 @@ class ProcessesController extends AbstractController /** @var Processes */ private $processes; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $dbi, Processes $processes) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + DatabaseInterface $dbi, + Processes $processes + ) { parent::__construct($response, $template, $data); $this->dbi = $dbi; $this->processes = $processes; diff --git a/libraries/classes/Controllers/Server/Status/QueriesController.php b/libraries/classes/Controllers/Server/Status/QueriesController.php index 3f31599460..f74809735f 100644 --- a/libraries/classes/Controllers/Server/Status/QueriesController.php +++ b/libraries/classes/Controllers/Server/Status/QueriesController.php @@ -24,12 +24,7 @@ class QueriesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $dbi) + public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { parent::__construct($response, $template, $data); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index a42d58dd22..54c12f02a3 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -26,13 +26,13 @@ class StatusController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, ReplicationGui $replicationGui, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Data $data, + ReplicationGui $replicationGui, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $data); $this->replicationGui = $replicationGui; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index bc2042e64e..3bcfe1fee0 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -24,12 +24,7 @@ class VariablesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param Data $data - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $data, $dbi) + public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { parent::__construct($response, $template, $data); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php index 0db59b9538..6ef76ec4c0 100644 --- a/libraries/classes/Controllers/Server/UserGroupsController.php +++ b/libraries/classes/Controllers/Server/UserGroupsController.php @@ -25,12 +25,12 @@ class UserGroupsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Relation $relation, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Relation $relation, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->relation = $relation; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/UserGroupsFormController.php b/libraries/classes/Controllers/Server/UserGroupsFormController.php index 216fa4eddd..5330aab54e 100644 --- a/libraries/classes/Controllers/Server/UserGroupsFormController.php +++ b/libraries/classes/Controllers/Server/UserGroupsFormController.php @@ -24,12 +24,12 @@ final class UserGroupsFormController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Relation $relation, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Relation $relation, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->relation = $relation; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Variables/GetVariableController.php b/libraries/classes/Controllers/Server/Variables/GetVariableController.php index afdfc013b3..1663a52654 100644 --- a/libraries/classes/Controllers/Server/Variables/GetVariableController.php +++ b/libraries/classes/Controllers/Server/Variables/GetVariableController.php @@ -20,11 +20,7 @@ final class GetVariableController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/Variables/SetVariableController.php b/libraries/classes/Controllers/Server/Variables/SetVariableController.php index 3945a6920d..650c000df8 100644 --- a/libraries/classes/Controllers/Server/Variables/SetVariableController.php +++ b/libraries/classes/Controllers/Server/Variables/SetVariableController.php @@ -26,11 +26,7 @@ final class SetVariableController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index f0d584b6ad..eb5564d8d9 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -28,11 +28,7 @@ class VariablesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Setup/AbstractController.php b/libraries/classes/Controllers/Setup/AbstractController.php index f10e5b70f7..1eb383bbfa 100644 --- a/libraries/classes/Controllers/Setup/AbstractController.php +++ b/libraries/classes/Controllers/Setup/AbstractController.php @@ -19,11 +19,7 @@ abstract class AbstractController /** @var Template */ protected $template; - /** - * @param ConfigFile $config ConfigFile instance - * @param Template $template Template instance - */ - public function __construct($config, $template) + public function __construct(ConfigFile $config, Template $template) { $this->config = $config; $this->template = $template; diff --git a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php index 50aabe5213..bd82f79c0f 100644 --- a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php +++ b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php @@ -23,16 +23,12 @@ final class ColumnPreferencesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Sql $sql, CheckUserPrivileges $checkUserPrivileges, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template); $this->sql = $sql; diff --git a/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php b/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php index b6cb7d5556..fbba9e7f70 100644 --- a/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php +++ b/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php @@ -15,11 +15,11 @@ final class DefaultForeignKeyCheckValueController extends AbstractController /** @var CheckUserPrivileges */ private $checkUserPrivileges; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, CheckUserPrivileges $checkUserPrivileges) - { + public function __construct( + ResponseRenderer $response, + Template $template, + CheckUserPrivileges $checkUserPrivileges + ) { parent::__construct($response, $template); $this->checkUserPrivileges = $checkUserPrivileges; } diff --git a/libraries/classes/Controllers/Sql/EnumValuesController.php b/libraries/classes/Controllers/Sql/EnumValuesController.php index 4248b40955..843d0ca8be 100644 --- a/libraries/classes/Controllers/Sql/EnumValuesController.php +++ b/libraries/classes/Controllers/Sql/EnumValuesController.php @@ -23,11 +23,8 @@ final class EnumValuesController extends AbstractController /** @var CheckUserPrivileges */ private $checkUserPrivileges; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Sql $sql, CheckUserPrivileges $checkUserPrivileges diff --git a/libraries/classes/Controllers/Sql/RelationalValuesController.php b/libraries/classes/Controllers/Sql/RelationalValuesController.php index f036c0079d..0f670efc81 100644 --- a/libraries/classes/Controllers/Sql/RelationalValuesController.php +++ b/libraries/classes/Controllers/Sql/RelationalValuesController.php @@ -18,11 +18,8 @@ final class RelationalValuesController extends AbstractController /** @var CheckUserPrivileges */ private $checkUserPrivileges; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Sql $sql, CheckUserPrivileges $checkUserPrivileges diff --git a/libraries/classes/Controllers/Sql/SetValuesController.php b/libraries/classes/Controllers/Sql/SetValuesController.php index b13f7b20a2..b2ed5fb689 100644 --- a/libraries/classes/Controllers/Sql/SetValuesController.php +++ b/libraries/classes/Controllers/Sql/SetValuesController.php @@ -23,11 +23,8 @@ final class SetValuesController extends AbstractController /** @var CheckUserPrivileges */ private $checkUserPrivileges; - /** - * @param ResponseRenderer $response - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Sql $sql, CheckUserPrivileges $checkUserPrivileges diff --git a/libraries/classes/Controllers/Sql/SqlController.php b/libraries/classes/Controllers/Sql/SqlController.php index d722592284..18fa35ab56 100644 --- a/libraries/classes/Controllers/Sql/SqlController.php +++ b/libraries/classes/Controllers/Sql/SqlController.php @@ -36,16 +36,12 @@ class SqlController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Sql $sql, CheckUserPrivileges $checkUserPrivileges, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template); $this->sql = $sql; diff --git a/libraries/classes/Controllers/Table/AbstractController.php b/libraries/classes/Controllers/Table/AbstractController.php index 3cac7467ed..8b2dd05f7f 100644 --- a/libraries/classes/Controllers/Table/AbstractController.php +++ b/libraries/classes/Controllers/Table/AbstractController.php @@ -16,12 +16,7 @@ abstract class AbstractController extends Controller /** @var string */ protected $table; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ - public function __construct($response, Template $template, $db, $table) + public function __construct(ResponseRenderer $response, Template $template, string $db, string $table) { parent::__construct($response, $template); $this->db = $db; diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index 7c58609d98..20b50dd4ae 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -42,21 +42,15 @@ class AddFieldController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Transformations $transformations, Config $config, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->transformations = $transformations; diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index fc18643204..86ef421c46 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -32,16 +32,11 @@ class ChangeController extends AbstractController /** @var Relation */ private $relation; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, InsertEdit $insertEdit, Relation $relation ) { diff --git a/libraries/classes/Controllers/Table/ChangeRowsController.php b/libraries/classes/Controllers/Table/ChangeRowsController.php index 1218c53e2e..4cbe6b7628 100644 --- a/libraries/classes/Controllers/Table/ChangeRowsController.php +++ b/libraries/classes/Controllers/Table/ChangeRowsController.php @@ -16,13 +16,13 @@ final class ChangeRowsController extends AbstractController /** @var ChangeController */ private $changeController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ - public function __construct($response, Template $template, $db, $table, ChangeController $changeController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + ChangeController $changeController + ) { parent::__construct($response, $template, $db, $table); $this->changeController = $changeController; } diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index 2baf8e2fe9..9b4b25d32e 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -32,14 +32,13 @@ class ChartController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; } diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 009ed0395d..658db519e2 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -41,21 +41,15 @@ class CreateController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Transformations $transformations, Config $config, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->transformations = $transformations; diff --git a/libraries/classes/Controllers/Table/DeleteRowsController.php b/libraries/classes/Controllers/Table/DeleteRowsController.php index 08347c7b53..a019e2dc50 100644 --- a/libraries/classes/Controllers/Table/DeleteRowsController.php +++ b/libraries/classes/Controllers/Table/DeleteRowsController.php @@ -24,14 +24,13 @@ final class DeleteRowsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; } diff --git a/libraries/classes/Controllers/Table/DropColumnController.php b/libraries/classes/Controllers/Table/DropColumnController.php index 18346d9911..f742de4a0d 100644 --- a/libraries/classes/Controllers/Table/DropColumnController.php +++ b/libraries/classes/Controllers/Table/DropColumnController.php @@ -27,18 +27,12 @@ final class DropColumnController extends AbstractController /** @var RelationCleanup */ private $relationCleanup; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, FlashMessages $flash, RelationCleanup $relationCleanup ) { diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 428d23873b..70f490798b 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -26,16 +26,11 @@ class ExportController extends AbstractController /** @var Options */ private $export; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Options $export ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/ExportRowsController.php b/libraries/classes/Controllers/Table/ExportRowsController.php index 424fe4896a..be3fd2730d 100644 --- a/libraries/classes/Controllers/Table/ExportRowsController.php +++ b/libraries/classes/Controllers/Table/ExportRowsController.php @@ -16,13 +16,13 @@ final class ExportRowsController extends AbstractController /** @var ExportController */ private $exportController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ - public function __construct($response, Template $template, $db, $table, ExportController $exportController) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + ExportController $exportController + ) { parent::__construct($response, $template, $db, $table); $this->exportController = $exportController; } diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index a9a6e2803f..7ab45a97c5 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -43,14 +43,13 @@ class FindReplaceController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index a48d8916be..bbc574a4f3 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -26,14 +26,13 @@ class GetFieldController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; } diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index e0595ca795..717c327b6b 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -29,14 +29,13 @@ final class GisVisualizationController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; } diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index ffa98db165..86b3217d03 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -29,14 +29,13 @@ final class ImportController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; } diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php index 23e545a565..181ba2a18f 100644 --- a/libraries/classes/Controllers/Table/IndexRenameController.php +++ b/libraries/classes/Controllers/Table/IndexRenameController.php @@ -23,14 +23,14 @@ final class IndexRenameController extends AbstractController /** @var Indexes */ private $indexes; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi, Indexes $indexes) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi, + Indexes $indexes + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; $this->indexes = $indexes; diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 99f53df2db..04f6591e7a 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -28,14 +28,14 @@ class IndexesController extends AbstractController /** @var Indexes */ private $indexes; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi, Indexes $indexes) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi, + Indexes $indexes + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; $this->indexes = $indexes; diff --git a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php index 1b822035c7..30d23bdb41 100644 --- a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php +++ b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php @@ -19,16 +19,11 @@ final class AnalyzeController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Maintenance $model ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Maintenance/CheckController.php b/libraries/classes/Controllers/Table/Maintenance/CheckController.php index 4bed3f3b1d..c0d49cc15a 100644 --- a/libraries/classes/Controllers/Table/Maintenance/CheckController.php +++ b/libraries/classes/Controllers/Table/Maintenance/CheckController.php @@ -19,16 +19,11 @@ final class CheckController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Maintenance $model ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php index 1568058ad2..7368e2acce 100644 --- a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php +++ b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php @@ -19,16 +19,11 @@ final class ChecksumController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Maintenance $model ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php index c0c7249924..0f96646e4e 100644 --- a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php +++ b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php @@ -19,16 +19,11 @@ final class OptimizeController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Maintenance $model ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Maintenance/RepairController.php b/libraries/classes/Controllers/Table/Maintenance/RepairController.php index 0ea2144136..be3519541a 100644 --- a/libraries/classes/Controllers/Table/Maintenance/RepairController.php +++ b/libraries/classes/Controllers/Table/Maintenance/RepairController.php @@ -19,16 +19,11 @@ final class RepairController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Maintenance $model ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index 043f142b31..fdb3c4695a 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -46,21 +46,15 @@ class OperationsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Operations $operations, CheckUserPrivileges $checkUserPrivileges, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->operations = $operations; diff --git a/libraries/classes/Controllers/Table/Partition/AnalyzeController.php b/libraries/classes/Controllers/Table/Partition/AnalyzeController.php index e769c6672a..32c1e409ff 100644 --- a/libraries/classes/Controllers/Table/Partition/AnalyzeController.php +++ b/libraries/classes/Controllers/Table/Partition/AnalyzeController.php @@ -21,14 +21,13 @@ final class AnalyzeController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/Partition/CheckController.php b/libraries/classes/Controllers/Table/Partition/CheckController.php index 8c877abf5a..7b40a96c22 100644 --- a/libraries/classes/Controllers/Table/Partition/CheckController.php +++ b/libraries/classes/Controllers/Table/Partition/CheckController.php @@ -21,14 +21,13 @@ final class CheckController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/Partition/DropController.php b/libraries/classes/Controllers/Table/Partition/DropController.php index a01e89f4a5..49d7622354 100644 --- a/libraries/classes/Controllers/Table/Partition/DropController.php +++ b/libraries/classes/Controllers/Table/Partition/DropController.php @@ -21,14 +21,13 @@ final class DropController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/Partition/OptimizeController.php b/libraries/classes/Controllers/Table/Partition/OptimizeController.php index 2815c33bbe..f2a14951e1 100644 --- a/libraries/classes/Controllers/Table/Partition/OptimizeController.php +++ b/libraries/classes/Controllers/Table/Partition/OptimizeController.php @@ -21,14 +21,13 @@ final class OptimizeController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/Partition/RebuildController.php b/libraries/classes/Controllers/Table/Partition/RebuildController.php index 4236a8ad78..7356506e78 100644 --- a/libraries/classes/Controllers/Table/Partition/RebuildController.php +++ b/libraries/classes/Controllers/Table/Partition/RebuildController.php @@ -21,14 +21,13 @@ final class RebuildController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/Partition/RepairController.php b/libraries/classes/Controllers/Table/Partition/RepairController.php index 4d488efc74..faa3e63b91 100644 --- a/libraries/classes/Controllers/Table/Partition/RepairController.php +++ b/libraries/classes/Controllers/Table/Partition/RepairController.php @@ -21,14 +21,13 @@ final class RepairController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/Partition/TruncateController.php b/libraries/classes/Controllers/Table/Partition/TruncateController.php index 26464128e6..ea7d2c3ab6 100644 --- a/libraries/classes/Controllers/Table/Partition/TruncateController.php +++ b/libraries/classes/Controllers/Table/Partition/TruncateController.php @@ -21,14 +21,13 @@ final class TruncateController extends AbstractController /** @var Maintenance */ private $model; - /** - * @param ResponseRenderer $response - * @param string $db - * @param string $table - * @param Maintenance $maintenance - */ - public function __construct($response, Template $template, $db, $table, $maintenance) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Maintenance $maintenance + ) { parent::__construct($response, $template, $db, $table); $this->model = $maintenance; } diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 11e95b1f2e..c925c9dd3a 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -24,14 +24,14 @@ class PrivilegesController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, Privileges $privileges, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Privileges $privileges, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->privileges = $privileges; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index 6cca9de7fe..ee392781eb 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -39,19 +39,13 @@ final class RelationController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->relation = $relation; diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index 492936c0e5..4b3b16cc9b 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -50,21 +50,15 @@ final class ReplaceController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, InsertEdit $insertEdit, Transformations $transformations, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->insertEdit = $insertEdit; diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index c367b0492e..800d0f7965 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -97,20 +97,14 @@ class SearchController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Search $search, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->search = $search; diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index e4775fcc6a..933fd01792 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -22,13 +22,13 @@ final class SqlController extends AbstractController /** @var SqlQueryForm */ private $sqlQueryForm; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - */ - public function __construct($response, Template $template, $db, $table, SqlQueryForm $sqlQueryForm) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + SqlQueryForm $sqlQueryForm + ) { parent::__construct($response, $template, $db, $table); $this->sqlQueryForm = $sqlQueryForm; } diff --git a/libraries/classes/Controllers/Table/Structure/AddIndexController.php b/libraries/classes/Controllers/Table/Structure/AddIndexController.php index 17157819cc..1527b9de2b 100644 --- a/libraries/classes/Controllers/Table/Structure/AddIndexController.php +++ b/libraries/classes/Controllers/Table/Structure/AddIndexController.php @@ -23,18 +23,12 @@ final class AddIndexController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, StructureController $structureController ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Structure/AddKeyController.php b/libraries/classes/Controllers/Table/Structure/AddKeyController.php index 933dd5163b..59f92f16b6 100644 --- a/libraries/classes/Controllers/Table/Structure/AddKeyController.php +++ b/libraries/classes/Controllers/Table/Structure/AddKeyController.php @@ -18,16 +18,11 @@ final class AddKeyController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, SqlController $sqlController, StructureController $structureController ) { diff --git a/libraries/classes/Controllers/Table/Structure/BrowseController.php b/libraries/classes/Controllers/Table/Structure/BrowseController.php index 799b9ca7c5..558d5e88d0 100644 --- a/libraries/classes/Controllers/Table/Structure/BrowseController.php +++ b/libraries/classes/Controllers/Table/Structure/BrowseController.php @@ -21,12 +21,7 @@ final class BrowseController extends AbstractController /** @var Sql */ private $sql; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ - public function __construct($response, Template $template, $db, $table, Sql $sql) + public function __construct(ResponseRenderer $response, Template $template, string $db, string $table, Sql $sql) { parent::__construct($response, $template, $db, $table); $this->sql = $sql; diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php index 576667c7de..c2cb69dae1 100644 --- a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php +++ b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php @@ -21,16 +21,11 @@ final class CentralColumnsAddController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, CentralColumns $centralColumns, StructureController $structureController ) { diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php index 068706bd39..7ccfe4e2ae 100644 --- a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php +++ b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php @@ -21,16 +21,11 @@ final class CentralColumnsRemoveController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, CentralColumns $centralColumns, StructureController $structureController ) { diff --git a/libraries/classes/Controllers/Table/Structure/ChangeController.php b/libraries/classes/Controllers/Table/Structure/ChangeController.php index acedd6743a..16ccc00a11 100644 --- a/libraries/classes/Controllers/Table/Structure/ChangeController.php +++ b/libraries/classes/Controllers/Table/Structure/ChangeController.php @@ -29,20 +29,14 @@ final class ChangeController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Relation $relation, Transformations $transformations, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template, $db, $table); $this->relation = $relation; diff --git a/libraries/classes/Controllers/Table/Structure/FulltextController.php b/libraries/classes/Controllers/Table/Structure/FulltextController.php index 381971feb4..08f62cf58e 100644 --- a/libraries/classes/Controllers/Table/Structure/FulltextController.php +++ b/libraries/classes/Controllers/Table/Structure/FulltextController.php @@ -23,18 +23,12 @@ final class FulltextController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, StructureController $structureController ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php index 7e08c4150b..4e2029e75b 100644 --- a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php +++ b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php @@ -32,14 +32,13 @@ final class MoveColumnsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; $this->tableObj = $this->dbi->getTable($this->db, $this->table); diff --git a/libraries/classes/Controllers/Table/Structure/PartitioningController.php b/libraries/classes/Controllers/Table/Structure/PartitioningController.php index becbc75b7c..1c945e6d73 100644 --- a/libraries/classes/Controllers/Table/Structure/PartitioningController.php +++ b/libraries/classes/Controllers/Table/Structure/PartitioningController.php @@ -38,18 +38,12 @@ final class PartitioningController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, CreateAddField $createAddField, StructureController $structureController ) { diff --git a/libraries/classes/Controllers/Table/Structure/PrimaryController.php b/libraries/classes/Controllers/Table/Structure/PrimaryController.php index 7cc2280d20..97704e0e29 100644 --- a/libraries/classes/Controllers/Table/Structure/PrimaryController.php +++ b/libraries/classes/Controllers/Table/Structure/PrimaryController.php @@ -26,18 +26,12 @@ final class PrimaryController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, StructureController $structureController ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Structure/SaveController.php b/libraries/classes/Controllers/Table/Structure/SaveController.php index 874f9a7257..eff57b74ff 100644 --- a/libraries/classes/Controllers/Table/Structure/SaveController.php +++ b/libraries/classes/Controllers/Table/Structure/SaveController.php @@ -45,20 +45,14 @@ final class SaveController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Relation $relation, Transformations $transformations, - $dbi, + DatabaseInterface $dbi, StructureController $structureController ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Structure/SpatialController.php b/libraries/classes/Controllers/Table/Structure/SpatialController.php index 5580d587cb..a8412b847c 100644 --- a/libraries/classes/Controllers/Table/Structure/SpatialController.php +++ b/libraries/classes/Controllers/Table/Structure/SpatialController.php @@ -23,18 +23,12 @@ final class SpatialController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, StructureController $structureController ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/Structure/UniqueController.php b/libraries/classes/Controllers/Table/Structure/UniqueController.php index b3c3a143e7..06810469fc 100644 --- a/libraries/classes/Controllers/Table/Structure/UniqueController.php +++ b/libraries/classes/Controllers/Table/Structure/UniqueController.php @@ -23,18 +23,12 @@ final class UniqueController extends AbstractController /** @var StructureController */ private $structureController; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, - $dbi, + string $db, + string $table, + DatabaseInterface $dbi, StructureController $structureController ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index 1fb5918c29..ba9ec441a0 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -62,22 +62,16 @@ class StructureController extends AbstractController /** @var FlashMessages */ private $flash; - /** - * @param ResponseRenderer $response - * @param string $db Database name - * @param string $table Table name - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Relation $relation, Transformations $transformations, CreateAddField $createAddField, RelationCleanup $relationCleanup, - $dbi, + DatabaseInterface $dbi, FlashMessages $flash ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index a32074de12..a949630333 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -26,16 +26,11 @@ final class TrackingController extends AbstractController /** @var Tracking */ private $tracking; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, - $db, - $table, + string $db, + string $table, Tracking $tracking ) { parent::__construct($response, $template, $db, $table); diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index a80558e5e4..5a6d5046b0 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -23,14 +23,13 @@ class TriggersController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->dbi = $dbi; } diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index e9725bcad5..701996769e 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -68,14 +68,15 @@ class ZoomSearchController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param string $db Database name. - * @param string $table Table name. - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $db, $table, Search $search, Relation $relation, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + string $db, + string $table, + Search $search, + Relation $relation, + DatabaseInterface $dbi + ) { parent::__construct($response, $template, $db, $table); $this->search = $search; $this->relation = $relation; diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php index e39f847149..c3ee04058c 100644 --- a/libraries/classes/Controllers/TableController.php +++ b/libraries/classes/Controllers/TableController.php @@ -14,11 +14,7 @@ final class TableController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/ThemeSetController.php b/libraries/classes/Controllers/ThemeSetController.php index 6615971ff2..90ad6ecbbb 100644 --- a/libraries/classes/Controllers/ThemeSetController.php +++ b/libraries/classes/Controllers/ThemeSetController.php @@ -15,10 +15,7 @@ final class ThemeSetController extends AbstractController /** @var ThemeManager */ private $themeManager; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, ThemeManager $themeManager) + public function __construct(ResponseRenderer $response, Template $template, ThemeManager $themeManager) { parent::__construct($response, $template); $this->themeManager = $themeManager; diff --git a/libraries/classes/Controllers/ThemesController.php b/libraries/classes/Controllers/ThemesController.php index 1b6b92a2dc..caf3d9f6fe 100644 --- a/libraries/classes/Controllers/ThemesController.php +++ b/libraries/classes/Controllers/ThemesController.php @@ -13,10 +13,7 @@ class ThemesController extends AbstractController /** @var ThemeManager */ private $themeManager; - /** - * @param ResponseRenderer $response - */ - public function __construct($response, Template $template, ThemeManager $themeManager) + public function __construct(ResponseRenderer $response, Template $template, ThemeManager $themeManager) { parent::__construct($response, $template); $this->themeManager = $themeManager; diff --git a/libraries/classes/Controllers/Transformation/OverviewController.php b/libraries/classes/Controllers/Transformation/OverviewController.php index f781db4774..fd988ecce9 100644 --- a/libraries/classes/Controllers/Transformation/OverviewController.php +++ b/libraries/classes/Controllers/Transformation/OverviewController.php @@ -19,11 +19,7 @@ class OverviewController extends AbstractController /** @var Transformations */ private $transformations; - /** - * @param ResponseRenderer $response - * @param Transformations $transformations - */ - public function __construct($response, Template $template, $transformations) + public function __construct(ResponseRenderer $response, Template $template, Transformations $transformations) { parent::__construct($response, $template); $this->transformations = $transformations; diff --git a/libraries/classes/Controllers/Transformation/WrapperController.php b/libraries/classes/Controllers/Transformation/WrapperController.php index a5ec4c3ce8..258d5642c8 100644 --- a/libraries/classes/Controllers/Transformation/WrapperController.php +++ b/libraries/classes/Controllers/Transformation/WrapperController.php @@ -39,16 +39,12 @@ class WrapperController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ public function __construct( - $response, + ResponseRenderer $response, Template $template, Transformations $transformations, Relation $relation, - $dbi + DatabaseInterface $dbi ) { parent::__construct($response, $template); $this->transformations = $transformations; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index 58e00cfd65..e8a14170a6 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -24,12 +24,12 @@ class UserPasswordController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, UserPassword $userPassword, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + UserPassword $userPassword, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->userPassword = $userPassword; $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/View/CreateController.php b/libraries/classes/Controllers/View/CreateController.php index 098d4654a0..c313abb9c7 100644 --- a/libraries/classes/Controllers/View/CreateController.php +++ b/libraries/classes/Controllers/View/CreateController.php @@ -36,11 +36,7 @@ class CreateController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, $dbi) + public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { parent::__construct($response, $template); $this->dbi = $dbi; diff --git a/libraries/classes/Controllers/View/OperationsController.php b/libraries/classes/Controllers/View/OperationsController.php index 7a48e0925f..f411b2fc13 100644 --- a/libraries/classes/Controllers/View/OperationsController.php +++ b/libraries/classes/Controllers/View/OperationsController.php @@ -28,12 +28,12 @@ class OperationsController extends AbstractController /** @var DatabaseInterface */ private $dbi; - /** - * @param ResponseRenderer $response - * @param DatabaseInterface $dbi - */ - public function __construct($response, Template $template, Operations $operations, $dbi) - { + public function __construct( + ResponseRenderer $response, + Template $template, + Operations $operations, + DatabaseInterface $dbi + ) { parent::__construct($response, $template); $this->operations = $operations; $this->dbi = $dbi; diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php index 56db96bbf4..521be3d6bb 100644 --- a/libraries/services_controllers.php +++ b/libraries/services_controllers.php @@ -934,7 +934,6 @@ return [ '$response' => '@response', '$template' => '@template', '$data' => '@status_data', - '$monitor' => '@status_monitor', '$dbi' => '@dbi', ], ], diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 6fee22d806..214482e6b2 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -2671,13 +2671,12 @@ - + $_GET['checkprivsdb'] $_GET['checkprivsdb'] $_POST['userGroup'] $db $db - $db $db_name ?? '' $dbname $dbname