From 8a1d6f1eaa3b0e1477a21ff4dca5d6953dacb2c8 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 12 Feb 2023 21:22:33 +0000 Subject: [PATCH] Convert var annotations to typed properties Signed-off-by: Kamil Tekiela --- libraries/classes/Advisory/Advisor.php | 6 +-- libraries/classes/Bookmark.php | 6 +-- libraries/classes/BrowseForeigners.php | 12 ++--- libraries/classes/Charsets/Charset.php | 16 ++----- libraries/classes/Charsets/Collation.php | 32 ++++--------- libraries/classes/CheckUserPrivileges.php | 3 +- libraries/classes/Config/ConfigFile.php | 12 ++--- libraries/classes/Config/Form.php | 4 +- libraries/classes/Config/FormDisplay.php | 7 +-- .../classes/Config/FormDisplayTemplate.php | 3 +- libraries/classes/Config/PageSettings.php | 7 +-- .../classes/Config/ServerConfigChecks.php | 2 +- libraries/classes/Console.php | 3 +- .../Controllers/AbstractController.php | 6 +-- .../BrowseForeignersController.php | 6 +-- .../Controllers/CheckRelationsController.php | 3 +- .../CollationConnectionController.php | 3 +- .../classes/Controllers/ColumnController.php | 3 +- .../Config/GetConfigController.php | 3 +- .../Config/SetConfigController.php | 3 +- .../Console/Bookmark/AddController.php | 3 +- .../PopulateColumnsController.php | 3 +- .../Database/CentralColumnsController.php | 3 +- .../Database/DataDictionaryController.php | 9 ++-- .../Database/DesignerController.php | 6 +-- .../Controllers/Database/EventsController.php | 6 +-- .../Controllers/Database/ExportController.php | 6 +-- .../Controllers/Database/ImportController.php | 3 +- .../MultiTableQuery/TablesController.php | 3 +- .../Database/MultiTableQueryController.php | 3 +- .../Operations/CollationController.php | 6 +-- .../Database/OperationsController.php | 15 ++---- .../Database/PrivilegesController.php | 6 +-- .../Database/QueryByExampleController.php | 6 +-- .../Database/RoutinesController.php | 9 ++-- .../Controllers/Database/SearchController.php | 3 +- .../Database/SqlAutoCompleteController.php | 3 +- .../Controllers/Database/SqlController.php | 3 +- .../Structure/AddPrefixTableController.php | 6 +-- .../CentralColumns/AddController.php | 6 +-- .../MakeConsistentController.php | 6 +-- .../CentralColumns/RemoveController.php | 6 +-- .../Structure/CopyTableController.php | 6 +-- .../CopyTableWithPrefixController.php | 3 +- .../Database/Structure/DropFormController.php | 3 +- .../Structure/DropTableController.php | 9 ++-- .../Structure/EmptyTableController.php | 18 +++----- .../Structure/FavoriteTableController.php | 3 +- .../Structure/RealRowCountController.php | 3 +- .../Structure/ReplacePrefixController.php | 6 +-- .../Structure/ShowCreateController.php | 3 +- .../Database/StructureController.php | 12 ++--- .../Database/TrackingController.php | 6 +-- .../Database/TriggersController.php | 6 +-- .../Controllers/ErrorReportController.php | 9 ++-- .../Controllers/Export/ExportController.php | 3 +- .../Controllers/Export/TablesController.php | 3 +- .../Export/Template/CreateController.php | 6 +-- .../Export/Template/DeleteController.php | 6 +-- .../Export/Template/LoadController.php | 6 +-- .../Export/Template/UpdateController.php | 6 +-- .../classes/Controllers/GitInfoController.php | 3 +- .../classes/Controllers/HomeController.php | 9 ++-- .../Controllers/Import/ImportController.php | 9 ++-- .../Import/SimulateDmlController.php | 3 +- .../Controllers/Import/StatusController.php | 3 +- .../JavaScriptMessagesController.php | 2 +- .../classes/Controllers/LogoutController.php | 3 +- .../Controllers/NavigationController.php | 6 +-- .../Normalization/AddNewPrimaryController.php | 3 +- .../CreateNewColumnController.php | 3 +- .../FirstNormalForm/FirstStepController.php | 3 +- .../FirstNormalForm/FourthStepController.php | 3 +- .../FirstNormalForm/SecondStepController.php | 3 +- .../FirstNormalForm/ThirdStepController.php | 3 +- .../Normalization/GetColumnsController.php | 3 +- .../Normalization/MoveRepeatingGroup.php | 3 +- .../PartialDependenciesController.php | 3 +- .../CreateNewTablesController.php | 3 +- .../SecondNormalForm/FirstStepController.php | 3 +- .../SecondNormalForm/NewTablesController.php | 3 +- .../CreateNewTablesController.php | 3 +- .../ThirdNormalForm/FirstStepController.php | 3 +- .../ThirdNormalForm/NewTablesController.php | 3 +- .../Preferences/ExportController.php | 9 ++-- .../Preferences/FeaturesController.php | 9 ++-- .../Preferences/ImportController.php | 9 ++-- .../Preferences/MainPanelController.php | 9 ++-- .../Preferences/ManageController.php | 9 ++-- .../Preferences/NavigationController.php | 9 ++-- .../Controllers/Preferences/SqlController.php | 9 ++-- .../Preferences/TwoFactorController.php | 3 +- .../Controllers/SchemaExportController.php | 6 +-- .../Controllers/Server/BinlogController.php | 7 +-- .../Server/CollationsController.php | 7 ++- .../Server/Databases/CreateController.php | 3 +- .../Server/Databases/DestroyController.php | 9 ++-- .../Server/DatabasesController.php | 3 +- .../Controllers/Server/EnginesController.php | 3 +- .../Controllers/Server/ExportController.php | 6 +-- .../Controllers/Server/ImportController.php | 3 +- .../Controllers/Server/PluginsController.php | 6 +-- .../Privileges/AccountLockController.php | 3 +- .../Privileges/AccountUnlockController.php | 3 +- .../Server/PrivilegesController.php | 6 +-- .../Server/ReplicationController.php | 6 +-- .../Server/ShowEngineController.php | 3 +- .../Controllers/Server/SqlController.php | 6 +-- .../Server/Status/AbstractController.php | 3 +- .../Server/Status/AdvisorController.php | 3 +- .../Status/Monitor/ChartingDataController.php | 6 +-- .../Status/Monitor/GeneralLogController.php | 6 +-- .../Status/Monitor/LogVarsController.php | 6 +-- .../Monitor/QueryAnalyzerController.php | 6 +-- .../Status/Monitor/SlowLogController.php | 6 +-- .../Server/Status/MonitorController.php | 3 +- .../Status/Processes/KillController.php | 3 +- .../Status/Processes/RefreshController.php | 3 +- .../Server/Status/ProcessesController.php | 6 +-- .../Server/Status/QueriesController.php | 3 +- .../Server/Status/StatusController.php | 6 +-- .../Server/Status/VariablesController.php | 3 +- .../Server/UserGroupsController.php | 6 +-- .../Server/UserGroupsFormController.php | 6 +-- .../Variables/GetVariableController.php | 3 +- .../Variables/SetVariableController.php | 3 +- .../Server/VariablesController.php | 3 +- .../Controllers/Setup/AbstractController.php | 6 +-- .../Sql/ColumnPreferencesController.php | 6 +-- .../DefaultForeignKeyCheckValueController.php | 3 +- .../Controllers/Sql/EnumValuesController.php | 6 +-- .../Sql/RelationalValuesController.php | 6 +-- .../Controllers/Sql/SetValuesController.php | 6 +-- .../classes/Controllers/Sql/SqlController.php | 9 ++-- .../Controllers/Table/AddFieldController.php | 12 ++--- .../Controllers/Table/ChangeController.php | 6 +-- .../Table/ChangeRowsController.php | 3 +- .../Controllers/Table/ChartController.php | 3 +- .../Controllers/Table/CreateController.php | 12 ++--- .../Table/DeleteRowsController.php | 3 +- .../Table/DropColumnController.php | 9 ++-- .../Controllers/Table/ExportController.php | 3 +- .../Table/ExportRowsController.php | 3 +- .../Table/FindReplaceController.php | 6 +-- .../Controllers/Table/GetFieldController.php | 3 +- .../Table/GisVisualizationController.php | 3 +- .../Controllers/Table/ImportController.php | 3 +- .../Table/IndexRenameController.php | 6 +-- .../Controllers/Table/IndexesController.php | 6 +-- .../Table/Maintenance/AnalyzeController.php | 6 +-- .../Table/Maintenance/CheckController.php | 6 +-- .../Table/Maintenance/ChecksumController.php | 6 +-- .../Table/Maintenance/OptimizeController.php | 6 +-- .../Table/Maintenance/RepairController.php | 6 +-- .../Table/OperationsController.php | 12 ++--- .../Table/Partition/AnalyzeController.php | 3 +- .../Table/Partition/CheckController.php | 3 +- .../Table/Partition/DropController.php | 3 +- .../Table/Partition/OptimizeController.php | 3 +- .../Table/Partition/RebuildController.php | 3 +- .../Table/Partition/RepairController.php | 3 +- .../Table/Partition/TruncateController.php | 3 +- .../Table/PrivilegesController.php | 6 +-- .../Controllers/Table/RelationController.php | 6 +-- .../Controllers/Table/ReplaceController.php | 12 ++--- .../Controllers/Table/SearchController.php | 13 ++---- .../Controllers/Table/SqlController.php | 3 +- .../Structure/AbstractIndexController.php | 6 +-- .../Table/Structure/AddKeyController.php | 6 +-- .../Table/Structure/BrowseController.php | 3 +- .../Structure/CentralColumnsAddController.php | 6 +-- .../CentralColumnsRemoveController.php | 6 +-- .../Table/Structure/ChangeController.php | 6 +-- .../Table/Structure/MoveColumnsController.php | 6 +-- .../Structure/PartitioningController.php | 9 ++-- .../Table/Structure/PrimaryController.php | 6 +-- .../Table/Structure/SaveController.php | 15 ++---- .../Controllers/Table/StructureController.php | 12 ++--- .../Controllers/Table/TrackingController.php | 3 +- .../Controllers/Table/TriggersController.php | 6 +-- .../Table/ZoomSearchController.php | 11 ++--- .../classes/Controllers/TableController.php | 3 +- .../Controllers/ThemeSetController.php | 6 +-- .../classes/Controllers/ThemesController.php | 3 +- .../Transformation/OverviewController.php | 3 +- .../Transformation/WrapperController.php | 9 ++-- .../Controllers/UserPasswordController.php | 6 +-- .../Controllers/VersionCheckController.php | 3 +- .../Controllers/View/CreateController.php | 3 +- .../Controllers/View/OperationsController.php | 6 +-- libraries/classes/CreateAddField.php | 3 +- libraries/classes/Database/CentralColumns.php | 18 ++------ libraries/classes/Database/Designer.php | 6 +-- .../classes/Database/Designer/Common.php | 6 +-- .../Database/Designer/DesignerTable.php | 12 ++--- libraries/classes/Database/Events.php | 6 +-- .../classes/Database/MultiTableQuery.php | 6 +-- libraries/classes/Database/Routines.php | 6 +-- libraries/classes/Database/Search.php | 7 +-- libraries/classes/Database/Triggers.php | 6 +-- libraries/classes/DatabaseInterface.php | 6 +-- libraries/classes/Dbal/MysqliResult.php | 4 +- libraries/classes/Dbal/MysqliStatement.php | 3 +- libraries/classes/Display/Results.php | 9 ++-- libraries/classes/Error.php | 4 +- libraries/classes/ErrorHandler.php | 4 +- libraries/classes/ErrorReport.php | 12 ++--- libraries/classes/Export/Options.php | 6 +-- libraries/classes/Export/Template.php | 14 ++---- libraries/classes/Export/TemplateModel.php | 3 +- libraries/classes/File.php | 3 +- libraries/classes/Footer.php | 18 ++------ libraries/classes/Git.php | 4 +- libraries/classes/Header.php | 46 +++++-------------- .../Http/Factory/ServerRequestFactory.php | 6 +-- libraries/classes/Http/ServerRequest.php | 3 +- libraries/classes/Import/SimulateDml.php | 3 +- libraries/classes/InsertEdit.php | 15 ++---- libraries/classes/Language.php | 3 +- libraries/classes/Menu.php | 17 ++----- libraries/classes/Navigation/Navigation.php | 3 +- .../classes/Navigation/NavigationTree.php | 5 +- libraries/classes/Navigation/Nodes/Node.php | 3 +- libraries/classes/Normalization.php | 10 ++-- libraries/classes/Operations.php | 6 +-- libraries/classes/OutputBuffering.php | 3 +- .../classes/Partitioning/Maintenance.php | 3 +- .../classes/Plugins/AuthenticationPlugin.php | 3 +- .../classes/Plugins/Export/Helpers/Pdf.php | 6 +-- libraries/classes/Plugins/ExportPlugin.php | 10 ++-- libraries/classes/Plugins/ImportPlugin.php | 7 +-- .../Plugins/Schema/ExportRelationSchema.php | 3 +- libraries/classes/Plugins/Schema/Pdf/Pdf.php | 3 +- .../Plugins/Schema/Pdf/PdfRelationSchema.php | 3 +- .../classes/Plugins/Schema/TableStats.php | 6 +-- libraries/classes/Plugins/SchemaPlugin.php | 4 +- .../classes/Plugins/TwoFactor/Application.php | 3 +- .../classes/Plugins/TwoFactor/WebAuthn.php | 3 +- libraries/classes/Plugins/TwoFactorPlugin.php | 3 +- libraries/classes/RecentFavoriteTable.php | 7 +-- libraries/classes/Replication.php | 3 +- libraries/classes/ReplicationGui.php | 6 +-- libraries/classes/ReplicationInfo.php | 3 +- libraries/classes/ResponseRenderer.php | 23 +++------- libraries/classes/Scripts.php | 7 +-- libraries/classes/Server/Plugin.php | 39 ++++++---------- libraries/classes/Server/Plugins.php | 3 +- libraries/classes/Server/Privileges.php | 6 +-- .../Server/Privileges/AccountLocking.php | 3 +- libraries/classes/Server/Status/Data.php | 6 +-- libraries/classes/Server/Status/Processes.php | 3 +- libraries/classes/Sql.php | 18 +++----- libraries/classes/SqlQueryForm.php | 6 +-- libraries/classes/SystemDatabase.php | 6 +-- libraries/classes/Table.php | 6 +-- libraries/classes/Table/ColumnsDefinition.php | 9 ++-- libraries/classes/Table/Indexes.php | 9 ++-- libraries/classes/Table/Maintenance.php | 3 +- libraries/classes/Table/Search.php | 3 +- libraries/classes/ThemeManager.php | 4 +- libraries/classes/Tracking.php | 12 ++--- libraries/classes/TwoFactor.php | 9 ++-- libraries/classes/UserPassword.php | 9 ++-- libraries/classes/UserPreferences.php | 6 +-- .../classes/WebAuthn/WebauthnLibServer.php | 6 +-- libraries/classes/ZipExtension.php | 3 +- 266 files changed, 525 insertions(+), 1098 deletions(-) diff --git a/libraries/classes/Advisory/Advisor.php b/libraries/classes/Advisory/Advisor.php index 5c64b03f08..5f7e902608 100644 --- a/libraries/classes/Advisory/Advisor.php +++ b/libraries/classes/Advisory/Advisor.php @@ -31,8 +31,7 @@ use function vsprintf; */ class Advisor { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** @var array */ private $variables; @@ -54,8 +53,7 @@ class Advisor 'errors' => [], ]; - /** @var ExpressionLanguage */ - private $expression; + private ExpressionLanguage $expression; /** * @param DatabaseInterface $dbi DatabaseInterface object diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index ff21f7ae46..abf0440092 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -56,11 +56,9 @@ class Bookmark */ private $query; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct(DatabaseInterface $dbi, Relation $relation) { diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index c644c0eaed..4216bfc820 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -22,14 +22,10 @@ use function mb_substr; */ class BrowseForeigners { - /** @var int */ - private $limitChars; - /** @var int */ - private $maxRows; - /** @var int */ - private $repeatCells; - /** @var bool */ - private $showAll; + private int $limitChars; + private int $maxRows; + private int $repeatCells; + private bool $showAll; /** @var Template */ public $template; diff --git a/libraries/classes/Charsets/Charset.php b/libraries/classes/Charsets/Charset.php index 86b3c1d96f..d9f397410e 100644 --- a/libraries/classes/Charsets/Charset.php +++ b/libraries/classes/Charsets/Charset.php @@ -14,31 +14,23 @@ final class Charset { /** * The character set name - * - * @var string */ - private $name; + private string $name; /** * A description of the character set - * - * @var string */ - private $description; + private string $description; /** * The default collation for the character set - * - * @var string */ - private $defaultCollation; + private string $defaultCollation; /** * The maximum number of bytes required to store one character - * - * @var int */ - private $maxLength; + private int $maxLength; /** * @param string $name Charset name diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index 8dafef9460..a9a803c59f 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -20,59 +20,43 @@ final class Collation { /** * The collation name - * - * @var string */ - private $name; + private string $name; /** * A description of the collation - * - * @var string */ - private $description; + private string $description; /** * The name of the character set with which the collation is associated - * - * @var string */ - private $charset; + private string $charset; /** * The collation ID - * - * @var int */ - private $id; + private int $id; /** * Whether the collation is the default for its character set - * - * @var bool */ - private $isDefault; + private bool $isDefault; /** * Whether the character set is compiled into the server - * - * @var bool */ - private $isCompiled; + private bool $isCompiled; /** * Used for determining the memory used to sort strings in this collation - * - * @var int */ - private $sortLength; + private int $sortLength; /** * The collation pad attribute - * - * @var string */ - private $padAttribute; + private string $padAttribute; /** * @param string $name Collation name diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php index de1844cedf..8212e8196f 100644 --- a/libraries/classes/CheckUserPrivileges.php +++ b/libraries/classes/CheckUserPrivileges.php @@ -21,8 +21,7 @@ use function str_contains; */ class CheckUserPrivileges { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param DatabaseInterface $dbi DatabaseInterface object diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php index 857a8f0613..556d969d50 100644 --- a/libraries/classes/Config/ConfigFile.php +++ b/libraries/classes/Config/ConfigFile.php @@ -26,10 +26,8 @@ class ConfigFile * Stores default phpMyAdmin config * * @see Settings - * - * @var array */ - private $defaultCfg; + private array $defaultCfg; /** * Stores allowed values for non-standard fields @@ -47,10 +45,8 @@ class ConfigFile /** * Whether we are currently working in PMA Setup context - * - * @var bool */ - private $isInSetup; + private bool $isInSetup; /** * Keys which will be always written to config file @@ -77,10 +73,8 @@ class ConfigFile /** * Instance id (key in $_SESSION array, separate for each server - * ConfigFile{server id}) - * - * @var string */ - private $id; + private string $id; /** * @param array|null $baseConfig base configuration read from diff --git a/libraries/classes/Config/Form.php b/libraries/classes/Config/Form.php index 00737b490c..50ef3c6eb5 100644 --- a/libraries/classes/Config/Form.php +++ b/libraries/classes/Config/Form.php @@ -68,10 +68,8 @@ class Form /** * ConfigFile instance - * - * @var ConfigFile */ - private $configFile; + private ConfigFile $configFile; /** * A counter for the number of groups diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index 8f0ac48af1..a41f0558c4 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -48,10 +48,8 @@ class FormDisplay { /** * ConfigFile instance - * - * @var ConfigFile */ - private $configFile; + private ConfigFile $configFile; /** * Form list @@ -105,8 +103,7 @@ class FormDisplay */ private $userprefsDisallow; - /** @var FormDisplayTemplate */ - private $formDisplayTemplate; + private FormDisplayTemplate $formDisplayTemplate; /** * @param ConfigFile $cf Config file instance diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index e0f48fa54a..c98c7d1128 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -23,8 +23,7 @@ class FormDisplayTemplate /** @var int */ public $group; - /** @var Config */ - protected $config; + protected Config $config; /** @var Template */ public $template; diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php index fb71d33277..1f35411a94 100644 --- a/libraries/classes/Config/PageSettings.php +++ b/libraries/classes/Config/PageSettings.php @@ -43,13 +43,10 @@ class PageSettings /** * Contains HTML of settings - * - * @var string */ - private $HTML = ''; + private string $HTML = ''; - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; /** * @param string $formGroupName The name of config form group to display diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php index 86f05d2267..49155ec737 100644 --- a/libraries/classes/Config/ServerConfigChecks.php +++ b/libraries/classes/Config/ServerConfigChecks.php @@ -31,7 +31,7 @@ use const SODIUM_CRYPTO_SECRETBOX_KEYBYTES; class ServerConfigChecks { /** @var ConfigFile configurations being checked */ - protected $cfg; + protected ConfigFile $cfg; /** * @param ConfigFile $cfg Configuration diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index c02a2b64b0..e784e76492 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -33,8 +33,7 @@ class Console */ private $isAjax = false; - /** @var Relation */ - private $relation; + private Relation $relation; /** @var Template */ public $template; diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index 2c8f12ff66..dceb41e99f 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -18,11 +18,9 @@ use function defined; abstract class AbstractController { - /** @var ResponseRenderer */ - protected $response; + protected ResponseRenderer $response; - /** @var Template */ - protected $template; + protected Template $template; public function __construct(ResponseRenderer $response, Template $template) { diff --git a/libraries/classes/Controllers/BrowseForeignersController.php b/libraries/classes/Controllers/BrowseForeignersController.php index 098632f46f..d8b5fde5b1 100644 --- a/libraries/classes/Controllers/BrowseForeignersController.php +++ b/libraries/classes/Controllers/BrowseForeignersController.php @@ -15,11 +15,9 @@ use PhpMyAdmin\Template; */ class BrowseForeignersController extends AbstractController { - /** @var BrowseForeigners */ - private $browseForeigners; + private BrowseForeigners $browseForeigners; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index b4a1369c59..48e22ba7f2 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -17,8 +17,7 @@ use const SQL_DIR; */ class CheckRelationsController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct(ResponseRenderer $response, Template $template, Relation $relation) { diff --git a/libraries/classes/Controllers/CollationConnectionController.php b/libraries/classes/Controllers/CollationConnectionController.php index 15fdc71610..1e7415ba98 100644 --- a/libraries/classes/Controllers/CollationConnectionController.php +++ b/libraries/classes/Controllers/CollationConnectionController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Url; final class CollationConnectionController extends AbstractController { - /** @var Config */ - private $config; + private Config $config; public function __construct(ResponseRenderer $response, Template $template, Config $config) { diff --git a/libraries/classes/Controllers/ColumnController.php b/libraries/classes/Controllers/ColumnController.php index d6a53ffbb8..d09e1ce3ed 100644 --- a/libraries/classes/Controllers/ColumnController.php +++ b/libraries/classes/Controllers/ColumnController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class ColumnController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Config/GetConfigController.php b/libraries/classes/Controllers/Config/GetConfigController.php index 5910f8665c..d4fa6ea475 100644 --- a/libraries/classes/Controllers/Config/GetConfigController.php +++ b/libraries/classes/Controllers/Config/GetConfigController.php @@ -13,8 +13,7 @@ use PhpMyAdmin\Template; final class GetConfigController extends AbstractController { - /** @var Config */ - private $config; + private Config $config; public function __construct(ResponseRenderer $response, Template $template, Config $config) { diff --git a/libraries/classes/Controllers/Config/SetConfigController.php b/libraries/classes/Controllers/Config/SetConfigController.php index 4962329035..b5b2c63766 100644 --- a/libraries/classes/Controllers/Config/SetConfigController.php +++ b/libraries/classes/Controllers/Config/SetConfigController.php @@ -15,8 +15,7 @@ use function json_decode; final class SetConfigController extends AbstractController { - /** @var Config */ - private $config; + private Config $config; public function __construct(ResponseRenderer $response, Template $template, Config $config) { diff --git a/libraries/classes/Controllers/Console/Bookmark/AddController.php b/libraries/classes/Controllers/Console/Bookmark/AddController.php index 42b7ee6c09..f7d75188d8 100644 --- a/libraries/classes/Controllers/Console/Bookmark/AddController.php +++ b/libraries/classes/Controllers/Console/Bookmark/AddController.php @@ -16,8 +16,7 @@ use function is_string; final class AddController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php b/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php index a3fa59ace0..a3ac032b6f 100644 --- a/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumns/PopulateColumnsController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class PopulateColumnsController extends AbstractController { - /** @var CentralColumns */ - private $centralColumns; + private CentralColumns $centralColumns; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index e912e5fd21..96dd251dee 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -22,8 +22,7 @@ use function sprintf; class CentralColumnsController extends AbstractController { - /** @var CentralColumns */ - private $centralColumns; + private CentralColumns $centralColumns; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index 8284d5e39a..627afc8dc4 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -19,14 +19,11 @@ use function str_replace; class DataDictionaryController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index c4da92b4b3..8add231277 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -20,11 +20,9 @@ use function sprintf; class DesignerController extends AbstractController { - /** @var Designer */ - private $databaseDesigner; + private Designer $databaseDesigner; - /** @var DesignerCommon */ - private $designerCommon; + private DesignerCommon $designerCommon; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index 9a94b4894a..b687153eae 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -17,11 +17,9 @@ use function strlen; final class EventsController extends AbstractController { - /** @var Events */ - private $events; + private Events $events; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 47d73aa147..dc78c0fb43 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -22,11 +22,9 @@ use function is_array; final class ExportController extends AbstractController { - /** @var Export */ - private $export; + private Export $export; - /** @var Options */ - private $exportOptions; + private Options $exportOptions; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 8175da7519..fe1303567d 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -26,8 +26,7 @@ use function is_numeric; final class ImportController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php b/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php index 98e8289115..74ac79c1ba 100644 --- a/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php +++ b/libraries/classes/Controllers/Database/MultiTableQuery/TablesController.php @@ -15,8 +15,7 @@ use function rtrim; final class TablesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index 9e269cf944..c4c785c466 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -16,8 +16,7 @@ use PhpMyAdmin\Template; */ class MultiTableQueryController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/Operations/CollationController.php b/libraries/classes/Controllers/Database/Operations/CollationController.php index c50420fe90..63e3b14a17 100644 --- a/libraries/classes/Controllers/Database/Operations/CollationController.php +++ b/libraries/classes/Controllers/Database/Operations/CollationController.php @@ -18,11 +18,9 @@ use function __; final class CollationController extends AbstractController { - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index f20fbe5bdc..9b9bab3012 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -32,20 +32,15 @@ use function strlen; */ class OperationsController extends AbstractController { - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index 144391a8bd..5d16f0d027 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -27,11 +27,9 @@ use function mb_strtolower; */ class PrivilegesController extends AbstractController { - /** @var Privileges */ - private $privileges; + private Privileges $privileges; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php index ccb118ba5f..dfa980c3e4 100644 --- a/libraries/classes/Controllers/Database/QueryByExampleController.php +++ b/libraries/classes/Controllers/Database/QueryByExampleController.php @@ -25,11 +25,9 @@ use function stripos; class QueryByExampleController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 194cf41597..7f463b4175 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -23,14 +23,11 @@ use function strlen; */ class RoutinesController extends AbstractController { - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Routines */ - private $routines; + private Routines $routines; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/SearchController.php b/libraries/classes/Controllers/Database/SearchController.php index 686aaefec2..df260e68a3 100644 --- a/libraries/classes/Controllers/Database/SearchController.php +++ b/libraries/classes/Controllers/Database/SearchController.php @@ -19,8 +19,7 @@ use function __; class SearchController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php index 23cdf87cc5..de8737b086 100644 --- a/libraries/classes/Controllers/Database/SqlAutoCompleteController.php +++ b/libraries/classes/Controllers/Database/SqlAutoCompleteController.php @@ -15,8 +15,7 @@ use PhpMyAdmin\Template; */ class SqlAutoCompleteController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/SqlController.php b/libraries/classes/Controllers/Database/SqlController.php index 2124b544d5..8dc0051cb3 100644 --- a/libraries/classes/Controllers/Database/SqlController.php +++ b/libraries/classes/Controllers/Database/SqlController.php @@ -20,8 +20,7 @@ use function htmlspecialchars; */ class SqlController extends AbstractController { - /** @var SqlQueryForm */ - private $sqlQueryForm; + private SqlQueryForm $sqlQueryForm; public function __construct(ResponseRenderer $response, Template $template, SqlQueryForm $sqlQueryForm) { diff --git a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php index 838c463101..231ef4f583 100644 --- a/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php +++ b/libraries/classes/Controllers/Database/Structure/AddPrefixTableController.php @@ -17,11 +17,9 @@ use function count; final class AddPrefixTableController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php index 6437943513..7a9cc0c68e 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/AddController.php @@ -17,11 +17,9 @@ use function __; final class AddController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php index 253ba17036..39b5d7a481 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/MakeConsistentController.php @@ -17,11 +17,9 @@ use function __; final class MakeConsistentController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php index e313dc970d..e275b0f650 100644 --- a/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php +++ b/libraries/classes/Controllers/Database/Structure/CentralColumns/RemoveController.php @@ -17,11 +17,9 @@ use function __; final class RemoveController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableController.php b/libraries/classes/Controllers/Database/Structure/CopyTableController.php index e5cdae40f3..2c361bbbae 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyTableController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyTableController.php @@ -17,11 +17,9 @@ use function count; final class CopyTableController extends AbstractController { - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php index aafa97a7b1..17d0dd656d 100644 --- a/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/CopyTableWithPrefixController.php @@ -18,8 +18,7 @@ use function mb_substr; final class CopyTableWithPrefixController extends AbstractController { - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/DropFormController.php b/libraries/classes/Controllers/Database/Structure/DropFormController.php index b177ed1cbc..d7613733de 100644 --- a/libraries/classes/Controllers/Database/Structure/DropFormController.php +++ b/libraries/classes/Controllers/Database/Structure/DropFormController.php @@ -18,8 +18,7 @@ use function in_array; final class DropFormController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/Structure/DropTableController.php b/libraries/classes/Controllers/Database/Structure/DropTableController.php index 8c3386e997..8b4b912aa6 100644 --- a/libraries/classes/Controllers/Database/Structure/DropTableController.php +++ b/libraries/classes/Controllers/Database/Structure/DropTableController.php @@ -21,14 +21,11 @@ use function in_array; final class DropTableController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php index c54533ea97..7740ec523e 100644 --- a/libraries/classes/Controllers/Database/Structure/EmptyTableController.php +++ b/libraries/classes/Controllers/Database/Structure/EmptyTableController.php @@ -25,23 +25,17 @@ use function count; final class EmptyTableController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var FlashMessages */ - private $flash; + private FlashMessages $flash; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php index 1b3acd6471..4f70e251d7 100644 --- a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php +++ b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php @@ -22,8 +22,7 @@ use function sha1; final class FavoriteTableController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct(ResponseRenderer $response, Template $template, Relation $relation) { diff --git a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php index 7800ccd991..70824764b3 100644 --- a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php +++ b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php @@ -19,8 +19,7 @@ use function json_encode; */ final class RealRowCountController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php index e8384e68a5..eac6dea6c7 100644 --- a/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php +++ b/libraries/classes/Controllers/Database/Structure/ReplacePrefixController.php @@ -19,11 +19,9 @@ use function mb_substr; final class ReplacePrefixController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/Structure/ShowCreateController.php b/libraries/classes/Controllers/Database/Structure/ShowCreateController.php index 3e04470e36..747a2aea3a 100644 --- a/libraries/classes/Controllers/Database/Structure/ShowCreateController.php +++ b/libraries/classes/Controllers/Database/Structure/ShowCreateController.php @@ -15,8 +15,7 @@ use function __; final class ShowCreateController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 4087b1652e..83ab8f2f32 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -66,17 +66,13 @@ class StructureController extends AbstractController /** @var bool whether stats show or not */ protected $isShowStats; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Replication */ - private $replication; + private Replication $replication; - /** @var ReplicationInfo */ - private $replicationInfo; + private ReplicationInfo $replicationInfo; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/TrackingController.php b/libraries/classes/Controllers/Database/TrackingController.php index 0e2337dd63..e1959d4378 100644 --- a/libraries/classes/Controllers/Database/TrackingController.php +++ b/libraries/classes/Controllers/Database/TrackingController.php @@ -28,11 +28,9 @@ use function sprintf; */ class TrackingController extends AbstractController { - /** @var Tracking */ - private $tracking; + private Tracking $tracking; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index ea518bdbac..534523c301 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -22,11 +22,9 @@ use function strlen; */ class TriggersController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Triggers */ - private $triggers; + private Triggers $triggers; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/ErrorReportController.php b/libraries/classes/Controllers/ErrorReportController.php index 57c859bf47..447f367251 100644 --- a/libraries/classes/Controllers/ErrorReportController.php +++ b/libraries/classes/Controllers/ErrorReportController.php @@ -28,14 +28,11 @@ use function time; */ class ErrorReportController extends AbstractController { - /** @var ErrorReport */ - private $errorReport; + private ErrorReport $errorReport; - /** @var ErrorHandler */ - private $errorHandler; + private ErrorHandler $errorHandler; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Export/ExportController.php b/libraries/classes/Controllers/Export/ExportController.php index ab7c76d558..1ab97417e8 100644 --- a/libraries/classes/Controllers/Export/ExportController.php +++ b/libraries/classes/Controllers/Export/ExportController.php @@ -38,8 +38,7 @@ use function time; final class ExportController extends AbstractController { - /** @var Export */ - private $export; + private Export $export; public function __construct(ResponseRenderer $response, Template $template, Export $export) { diff --git a/libraries/classes/Controllers/Export/TablesController.php b/libraries/classes/Controllers/Export/TablesController.php index 996c619a8e..1837785a53 100644 --- a/libraries/classes/Controllers/Export/TablesController.php +++ b/libraries/classes/Controllers/Export/TablesController.php @@ -14,8 +14,7 @@ use function __; final class TablesController extends AbstractController { - /** @var ExportController */ - private $exportController; + private ExportController $exportController; public function __construct(ResponseRenderer $response, Template $template, ExportController $exportController) { diff --git a/libraries/classes/Controllers/Export/Template/CreateController.php b/libraries/classes/Controllers/Export/Template/CreateController.php index 932aa351c5..8a67f728de 100644 --- a/libraries/classes/Controllers/Export/Template/CreateController.php +++ b/libraries/classes/Controllers/Export/Template/CreateController.php @@ -16,11 +16,9 @@ use function is_array; final class CreateController extends AbstractController { - /** @var TemplateModel */ - private $model; + private TemplateModel $model; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Export/Template/DeleteController.php b/libraries/classes/Controllers/Export/Template/DeleteController.php index 29a7628e86..7a5d6fb79b 100644 --- a/libraries/classes/Controllers/Export/Template/DeleteController.php +++ b/libraries/classes/Controllers/Export/Template/DeleteController.php @@ -13,11 +13,9 @@ use PhpMyAdmin\Template; final class DeleteController extends AbstractController { - /** @var TemplateModel */ - private $model; + private TemplateModel $model; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Export/Template/LoadController.php b/libraries/classes/Controllers/Export/Template/LoadController.php index 03bd33503c..d7f9023fbd 100644 --- a/libraries/classes/Controllers/Export/Template/LoadController.php +++ b/libraries/classes/Controllers/Export/Template/LoadController.php @@ -14,11 +14,9 @@ use PhpMyAdmin\Template; final class LoadController extends AbstractController { - /** @var TemplateModel */ - private $model; + private TemplateModel $model; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Export/Template/UpdateController.php b/libraries/classes/Controllers/Export/Template/UpdateController.php index eb407c47af..ed5b5ca263 100644 --- a/libraries/classes/Controllers/Export/Template/UpdateController.php +++ b/libraries/classes/Controllers/Export/Template/UpdateController.php @@ -14,11 +14,9 @@ use PhpMyAdmin\Template; final class UpdateController extends AbstractController { - /** @var TemplateModel */ - private $model; + private TemplateModel $model; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/GitInfoController.php b/libraries/classes/Controllers/GitInfoController.php index 2fc4ae8df7..b35f30a026 100644 --- a/libraries/classes/Controllers/GitInfoController.php +++ b/libraries/classes/Controllers/GitInfoController.php @@ -15,8 +15,7 @@ use function strtotime; final class GitInfoController extends AbstractController { - /** @var Config */ - private $config; + private Config $config; public function __construct(ResponseRenderer $response, Template $template, Config $config) { diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 90c1bacb34..335aaab33b 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -37,14 +37,11 @@ use const SODIUM_CRYPTO_SECRETBOX_KEYBYTES; class HomeController extends AbstractController { - /** @var Config */ - private $config; + private Config $config; - /** @var ThemeManager */ - private $themeManager; + private ThemeManager $themeManager; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @var array> diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php index b210e61703..4c3bda7920 100644 --- a/libraries/classes/Controllers/Import/ImportController.php +++ b/libraries/classes/Controllers/Import/ImportController.php @@ -50,14 +50,11 @@ use function trim; final class ImportController extends AbstractController { - /** @var Import */ - private $import; + private Import $import; - /** @var Sql */ - private $sql; + private Sql $sql; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Import/SimulateDmlController.php b/libraries/classes/Controllers/Import/SimulateDmlController.php index ad0bac1f90..9267271b6e 100644 --- a/libraries/classes/Controllers/Import/SimulateDmlController.php +++ b/libraries/classes/Controllers/Import/SimulateDmlController.php @@ -21,8 +21,7 @@ use function explode; final class SimulateDmlController extends AbstractController { - /** @var SimulateDml */ - private $simulateDml; + private SimulateDml $simulateDml; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Import/StatusController.php b/libraries/classes/Controllers/Import/StatusController.php index 1d4fadaa95..7faec2064b 100644 --- a/libraries/classes/Controllers/Import/StatusController.php +++ b/libraries/classes/Controllers/Import/StatusController.php @@ -24,8 +24,7 @@ use function usleep; */ class StatusController { - /** @var Template */ - private $template; + private Template $template; public function __construct(Template $template) { diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php index 4c2fec1796..f51fa3263f 100644 --- a/libraries/classes/Controllers/JavaScriptMessagesController.php +++ b/libraries/classes/Controllers/JavaScriptMessagesController.php @@ -18,7 +18,7 @@ use function time; final class JavaScriptMessagesController { /** @var array */ - private $messages; + private array $messages; public function __construct() { diff --git a/libraries/classes/Controllers/LogoutController.php b/libraries/classes/Controllers/LogoutController.php index b413046dea..83e6865358 100644 --- a/libraries/classes/Controllers/LogoutController.php +++ b/libraries/classes/Controllers/LogoutController.php @@ -10,8 +10,7 @@ use PhpMyAdmin\Plugins\AuthenticationPluginFactory; class LogoutController { - /** @var AuthenticationPluginFactory */ - private $authPluginFactory; + private AuthenticationPluginFactory $authPluginFactory; public function __construct(AuthenticationPluginFactory $authPluginFactory) { diff --git a/libraries/classes/Controllers/NavigationController.php b/libraries/classes/Controllers/NavigationController.php index be660253a3..a53dbae649 100644 --- a/libraries/classes/Controllers/NavigationController.php +++ b/libraries/classes/Controllers/NavigationController.php @@ -22,11 +22,9 @@ use function __; */ class NavigationController extends AbstractController { - /** @var Navigation */ - private $navigation; + private Navigation $navigation; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php b/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php index 90ed608661..ba142ab502 100644 --- a/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php +++ b/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php @@ -15,8 +15,7 @@ use PhpMyAdmin\Url; final class AddNewPrimaryController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/CreateNewColumnController.php b/libraries/classes/Controllers/Normalization/CreateNewColumnController.php index 41e7b9d876..d1b779b578 100644 --- a/libraries/classes/Controllers/Normalization/CreateNewColumnController.php +++ b/libraries/classes/Controllers/Normalization/CreateNewColumnController.php @@ -16,8 +16,7 @@ use function min; final class CreateNewColumnController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/FirstNormalForm/FirstStepController.php b/libraries/classes/Controllers/Normalization/FirstNormalForm/FirstStepController.php index 246d8e6bb7..3bb2b17c9e 100644 --- a/libraries/classes/Controllers/Normalization/FirstNormalForm/FirstStepController.php +++ b/libraries/classes/Controllers/Normalization/FirstNormalForm/FirstStepController.php @@ -14,8 +14,7 @@ use function in_array; final class FirstStepController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/FirstNormalForm/FourthStepController.php b/libraries/classes/Controllers/Normalization/FirstNormalForm/FourthStepController.php index b7e18b9eee..70f347252b 100644 --- a/libraries/classes/Controllers/Normalization/FirstNormalForm/FourthStepController.php +++ b/libraries/classes/Controllers/Normalization/FirstNormalForm/FourthStepController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class FourthStepController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php b/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php index 630f117182..cac99374ff 100644 --- a/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php +++ b/libraries/classes/Controllers/Normalization/FirstNormalForm/SecondStepController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class SecondStepController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/FirstNormalForm/ThirdStepController.php b/libraries/classes/Controllers/Normalization/FirstNormalForm/ThirdStepController.php index 068a154d93..cfd2575f21 100644 --- a/libraries/classes/Controllers/Normalization/FirstNormalForm/ThirdStepController.php +++ b/libraries/classes/Controllers/Normalization/FirstNormalForm/ThirdStepController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class ThirdStepController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/GetColumnsController.php b/libraries/classes/Controllers/Normalization/GetColumnsController.php index f9d6e333b6..5c54fe696a 100644 --- a/libraries/classes/Controllers/Normalization/GetColumnsController.php +++ b/libraries/classes/Controllers/Normalization/GetColumnsController.php @@ -15,8 +15,7 @@ use function _pgettext; final class GetColumnsController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php b/libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php index aebebc0674..9d34f234a8 100644 --- a/libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php +++ b/libraries/classes/Controllers/Normalization/MoveRepeatingGroup.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class MoveRepeatingGroup extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/PartialDependenciesController.php b/libraries/classes/Controllers/Normalization/PartialDependenciesController.php index a847ef6832..4723832285 100644 --- a/libraries/classes/Controllers/Normalization/PartialDependenciesController.php +++ b/libraries/classes/Controllers/Normalization/PartialDependenciesController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class PartialDependenciesController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php b/libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php index e5067b1460..daea7dfcb8 100644 --- a/libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php +++ b/libraries/classes/Controllers/Normalization/SecondNormalForm/CreateNewTablesController.php @@ -14,8 +14,7 @@ use function json_decode; final class CreateNewTablesController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/SecondNormalForm/FirstStepController.php b/libraries/classes/Controllers/Normalization/SecondNormalForm/FirstStepController.php index e0f59b6c90..ede3601e98 100644 --- a/libraries/classes/Controllers/Normalization/SecondNormalForm/FirstStepController.php +++ b/libraries/classes/Controllers/Normalization/SecondNormalForm/FirstStepController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class FirstStepController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php b/libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php index bb304a74a3..1d266d9d40 100644 --- a/libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php +++ b/libraries/classes/Controllers/Normalization/SecondNormalForm/NewTablesController.php @@ -14,8 +14,7 @@ use function json_decode; final class NewTablesController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php b/libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php index 1f1f760eea..337f41fd2f 100644 --- a/libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php +++ b/libraries/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesController.php @@ -14,8 +14,7 @@ use function json_decode; final class CreateNewTablesController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/ThirdNormalForm/FirstStepController.php b/libraries/classes/Controllers/Normalization/ThirdNormalForm/FirstStepController.php index a7d0d1fe56..2bc1ada40e 100644 --- a/libraries/classes/Controllers/Normalization/ThirdNormalForm/FirstStepController.php +++ b/libraries/classes/Controllers/Normalization/ThirdNormalForm/FirstStepController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class FirstStepController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php b/libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php index 591d99f18f..b40eea1862 100644 --- a/libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php +++ b/libraries/classes/Controllers/Normalization/ThirdNormalForm/NewTablesController.php @@ -14,8 +14,7 @@ use function json_decode; final class NewTablesController extends AbstractController { - /** @var Normalization */ - private $normalization; + private Normalization $normalization; public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization) { diff --git a/libraries/classes/Controllers/Preferences/ExportController.php b/libraries/classes/Controllers/Preferences/ExportController.php index b7004bede7..1a47131f37 100644 --- a/libraries/classes/Controllers/Preferences/ExportController.php +++ b/libraries/classes/Controllers/Preferences/ExportController.php @@ -21,14 +21,11 @@ use function ltrim; class ExportController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/FeaturesController.php b/libraries/classes/Controllers/Preferences/FeaturesController.php index 2392e4a880..92f7fb4a09 100644 --- a/libraries/classes/Controllers/Preferences/FeaturesController.php +++ b/libraries/classes/Controllers/Preferences/FeaturesController.php @@ -21,14 +21,11 @@ use function ltrim; class FeaturesController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/ImportController.php b/libraries/classes/Controllers/Preferences/ImportController.php index 0ce5ba899f..4a87eb0bcb 100644 --- a/libraries/classes/Controllers/Preferences/ImportController.php +++ b/libraries/classes/Controllers/Preferences/ImportController.php @@ -21,14 +21,11 @@ use function ltrim; class ImportController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/MainPanelController.php b/libraries/classes/Controllers/Preferences/MainPanelController.php index 73d9d33ee0..819fff02cb 100644 --- a/libraries/classes/Controllers/Preferences/MainPanelController.php +++ b/libraries/classes/Controllers/Preferences/MainPanelController.php @@ -21,14 +21,11 @@ use function ltrim; class MainPanelController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index 2280c97063..b62a2c47c2 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -45,14 +45,11 @@ use const UPLOAD_ERR_OK; */ class ManageController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/NavigationController.php b/libraries/classes/Controllers/Preferences/NavigationController.php index 98c75989cf..f6adca3290 100644 --- a/libraries/classes/Controllers/Preferences/NavigationController.php +++ b/libraries/classes/Controllers/Preferences/NavigationController.php @@ -21,14 +21,11 @@ use function ltrim; class NavigationController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/SqlController.php b/libraries/classes/Controllers/Preferences/SqlController.php index 8d4c029a30..6bd8d16936 100644 --- a/libraries/classes/Controllers/Preferences/SqlController.php +++ b/libraries/classes/Controllers/Preferences/SqlController.php @@ -21,14 +21,11 @@ use function ltrim; class SqlController extends AbstractController { - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index c65c41a428..edb22452be 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -17,8 +17,7 @@ use function count; class TwoFactorController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct(ResponseRenderer $response, Template $template, Relation $relation) { diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index 3c2d2eb566..501083facd 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -22,11 +22,9 @@ use function mb_strlen; */ class SchemaExportController { - /** @var Export */ - private $export; + private Export $export; - /** @var ResponseRenderer */ - private $response; + private ResponseRenderer $response; public function __construct(Export $export, ResponseRenderer $response) { diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index 2b69bbd8a7..5642c47be2 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -23,13 +23,10 @@ class BinlogController extends AbstractController { /** * binary log files - * - * @var array */ - protected $binaryLogs; + protected array $binaryLogs; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/CollationsController.php b/libraries/classes/Controllers/Server/CollationsController.php index 7528be3254..ef1088c94e 100644 --- a/libraries/classes/Controllers/Server/CollationsController.php +++ b/libraries/classes/Controllers/Server/CollationsController.php @@ -20,13 +20,12 @@ use PhpMyAdmin\Url; class CollationsController extends AbstractController { /** @var array */ - private $charsets; + private array $charsets; /** @var array> */ - private $collations; + private array $collations; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param array|null $charsets diff --git a/libraries/classes/Controllers/Server/Databases/CreateController.php b/libraries/classes/Controllers/Server/Databases/CreateController.php index eab580f8ef..adb2daf9e1 100644 --- a/libraries/classes/Controllers/Server/Databases/CreateController.php +++ b/libraries/classes/Controllers/Server/Databases/CreateController.php @@ -24,8 +24,7 @@ use function str_contains; final class CreateController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/Databases/DestroyController.php b/libraries/classes/Controllers/Server/Databases/DestroyController.php index f1ac1e5ef7..285dcb84dc 100644 --- a/libraries/classes/Controllers/Server/Databases/DestroyController.php +++ b/libraries/classes/Controllers/Server/Databases/DestroyController.php @@ -22,14 +22,11 @@ use function is_array; final class DestroyController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index ef22ac3dc2..99add44e90 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -49,8 +49,7 @@ class DatabasesController extends AbstractController /** @var int position in list navigation */ private $position; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/EnginesController.php b/libraries/classes/Controllers/Server/EnginesController.php index 234faa8c23..c00764d71d 100644 --- a/libraries/classes/Controllers/Server/EnginesController.php +++ b/libraries/classes/Controllers/Server/EnginesController.php @@ -17,8 +17,7 @@ use PhpMyAdmin\Url; */ class EnginesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 812c8710bd..38d942eee5 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -20,11 +20,9 @@ use function array_merge; final class ExportController extends AbstractController { - /** @var Options */ - private $export; + private Options $export; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, Options $export, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index 5bae544a1e..cacc8793ed 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -26,8 +26,7 @@ use function is_numeric; final class ImportController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index 988284f0df..45c57f9847 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -22,11 +22,9 @@ use function preg_replace; */ class PluginsController extends AbstractController { - /** @var Plugins */ - private $plugins; + private Plugins $plugins; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Privileges/AccountLockController.php b/libraries/classes/Controllers/Server/Privileges/AccountLockController.php index 650d726a17..952163329f 100644 --- a/libraries/classes/Controllers/Server/Privileges/AccountLockController.php +++ b/libraries/classes/Controllers/Server/Privileges/AccountLockController.php @@ -16,8 +16,7 @@ use function __; final class AccountLockController extends AbstractController { - /** @var AccountLocking */ - private $model; + private AccountLocking $model; public function __construct(ResponseRenderer $response, Template $template, AccountLocking $accountLocking) { diff --git a/libraries/classes/Controllers/Server/Privileges/AccountUnlockController.php b/libraries/classes/Controllers/Server/Privileges/AccountUnlockController.php index 8cf4f89d07..772bb7249f 100644 --- a/libraries/classes/Controllers/Server/Privileges/AccountUnlockController.php +++ b/libraries/classes/Controllers/Server/Privileges/AccountUnlockController.php @@ -16,8 +16,7 @@ use function __; final class AccountUnlockController extends AbstractController { - /** @var AccountLocking */ - private $model; + private AccountLocking $model; public function __construct(ResponseRenderer $response, Template $template, AccountLocking $accountLocking) { diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php index 373b2e3fd6..6722b4d19b 100644 --- a/libraries/classes/Controllers/Server/PrivilegesController.php +++ b/libraries/classes/Controllers/Server/PrivilegesController.php @@ -33,11 +33,9 @@ use function urlencode; */ class PrivilegesController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index 0609e328bf..7a59d040c8 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -23,11 +23,9 @@ use function is_array; */ class ReplicationController extends AbstractController { - /** @var ReplicationGui */ - private $replicationGui; + private ReplicationGui $replicationGui; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/ShowEngineController.php b/libraries/classes/Controllers/Server/ShowEngineController.php index 3aa5c6d421..68289ba11e 100644 --- a/libraries/classes/Controllers/Server/ShowEngineController.php +++ b/libraries/classes/Controllers/Server/ShowEngineController.php @@ -17,8 +17,7 @@ use PhpMyAdmin\Url; */ final class ShowEngineController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/SqlController.php b/libraries/classes/Controllers/Server/SqlController.php index 67a4378b9a..2d7c467ebf 100644 --- a/libraries/classes/Controllers/Server/SqlController.php +++ b/libraries/classes/Controllers/Server/SqlController.php @@ -18,11 +18,9 @@ use PhpMyAdmin\Url; */ class SqlController extends AbstractController { - /** @var SqlQueryForm */ - private $sqlQueryForm; + private SqlQueryForm $sqlQueryForm; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/AbstractController.php b/libraries/classes/Controllers/Server/Status/AbstractController.php index 096e186ff9..dd3455f236 100644 --- a/libraries/classes/Controllers/Server/Status/AbstractController.php +++ b/libraries/classes/Controllers/Server/Status/AbstractController.php @@ -11,8 +11,7 @@ use PhpMyAdmin\Template; abstract class AbstractController extends Controller { - /** @var Data */ - protected $data; + protected Data $data; public function __construct(ResponseRenderer $response, Template $template, Data $data) { diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 8e2d54eddd..b48e7123eb 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -15,8 +15,7 @@ use PhpMyAdmin\Template; */ class AdvisorController extends AbstractController { - /** @var Advisor */ - private $advisor; + private Advisor $advisor; public function __construct(ResponseRenderer $response, Template $template, Data $data, Advisor $advisor) { diff --git a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php index d0df103936..db3345ec0c 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php @@ -15,11 +15,9 @@ use PhpMyAdmin\Url; final class ChartingDataController extends AbstractController { - /** @var Monitor */ - private $monitor; + private Monitor $monitor; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php index f63b094451..52bc7d6edd 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/GeneralLogController.php @@ -15,11 +15,9 @@ use PhpMyAdmin\Url; final class GeneralLogController extends AbstractController { - /** @var Monitor */ - private $monitor; + private Monitor $monitor; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php index 8cfafb97de..02c466b661 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/LogVarsController.php @@ -15,11 +15,9 @@ use PhpMyAdmin\Url; final class LogVarsController extends AbstractController { - /** @var Monitor */ - private $monitor; + private Monitor $monitor; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php index 7d3d114070..18a466a6d3 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/QueryAnalyzerController.php @@ -15,11 +15,9 @@ use PhpMyAdmin\Url; final class QueryAnalyzerController extends AbstractController { - /** @var Monitor */ - private $monitor; + private Monitor $monitor; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php index 6189f4439a..8d159a78de 100644 --- a/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php +++ b/libraries/classes/Controllers/Server/Status/Monitor/SlowLogController.php @@ -15,11 +15,9 @@ use PhpMyAdmin\Url; final class SlowLogController extends AbstractController { - /** @var Monitor */ - private $monitor; + private Monitor $monitor; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/MonitorController.php b/libraries/classes/Controllers/Server/Status/MonitorController.php index ed8d9f785d..c0d795b1e7 100644 --- a/libraries/classes/Controllers/Server/Status/MonitorController.php +++ b/libraries/classes/Controllers/Server/Status/MonitorController.php @@ -17,8 +17,7 @@ use function microtime; class MonitorController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/Status/Processes/KillController.php b/libraries/classes/Controllers/Server/Status/Processes/KillController.php index bfe2a89bce..ee2213eba5 100644 --- a/libraries/classes/Controllers/Server/Status/Processes/KillController.php +++ b/libraries/classes/Controllers/Server/Status/Processes/KillController.php @@ -16,8 +16,7 @@ use function __; final class KillController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php b/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php index 795869c77c..91f09c0ae9 100644 --- a/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php +++ b/libraries/classes/Controllers/Server/Status/Processes/RefreshController.php @@ -13,8 +13,7 @@ use PhpMyAdmin\Template; final class RefreshController extends AbstractController { - /** @var Processes */ - private $processes; + private Processes $processes; public function __construct(ResponseRenderer $response, Template $template, Data $data, Processes $processes) { diff --git a/libraries/classes/Controllers/Server/Status/ProcessesController.php b/libraries/classes/Controllers/Server/Status/ProcessesController.php index 7b71676758..dd61b6fb8e 100644 --- a/libraries/classes/Controllers/Server/Status/ProcessesController.php +++ b/libraries/classes/Controllers/Server/Status/ProcessesController.php @@ -14,11 +14,9 @@ use PhpMyAdmin\Url; class ProcessesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Processes */ - private $processes; + private Processes $processes; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/QueriesController.php b/libraries/classes/Controllers/Server/Status/QueriesController.php index c112557fdb..7866ef4273 100644 --- a/libraries/classes/Controllers/Server/Status/QueriesController.php +++ b/libraries/classes/Controllers/Server/Status/QueriesController.php @@ -22,8 +22,7 @@ use function str_replace; class QueriesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php index db18e3e50e..ba4e2b49c4 100644 --- a/libraries/classes/Controllers/Server/Status/StatusController.php +++ b/libraries/classes/Controllers/Server/Status/StatusController.php @@ -21,11 +21,9 @@ use function implode; */ class StatusController extends AbstractController { - /** @var ReplicationGui */ - private $replicationGui; + private ReplicationGui $replicationGui; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index 3e5819e3b8..30221a646d 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -22,8 +22,7 @@ use function str_contains; class VariablesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, Data $data, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php index b929461c31..c4442b77d6 100644 --- a/libraries/classes/Controllers/Server/UserGroupsController.php +++ b/libraries/classes/Controllers/Server/UserGroupsController.php @@ -20,11 +20,9 @@ use function __; */ class UserGroupsController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/UserGroupsFormController.php b/libraries/classes/Controllers/Server/UserGroupsFormController.php index e8fe3bd640..9dea19864a 100644 --- a/libraries/classes/Controllers/Server/UserGroupsFormController.php +++ b/libraries/classes/Controllers/Server/UserGroupsFormController.php @@ -21,11 +21,9 @@ use function strlen; final class UserGroupsFormController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Server/Variables/GetVariableController.php b/libraries/classes/Controllers/Server/Variables/GetVariableController.php index 1b3c1e0724..634a2e0bbf 100644 --- a/libraries/classes/Controllers/Server/Variables/GetVariableController.php +++ b/libraries/classes/Controllers/Server/Variables/GetVariableController.php @@ -17,8 +17,7 @@ use function implode; final class GetVariableController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/Variables/SetVariableController.php b/libraries/classes/Controllers/Server/Variables/SetVariableController.php index 007c96b129..13aa6ca664 100644 --- a/libraries/classes/Controllers/Server/Variables/SetVariableController.php +++ b/libraries/classes/Controllers/Server/Variables/SetVariableController.php @@ -22,8 +22,7 @@ use function trim; final class SetVariableController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index de7a09183d..eb52c591c7 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -26,8 +26,7 @@ use function trim; */ class VariablesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/Setup/AbstractController.php b/libraries/classes/Controllers/Setup/AbstractController.php index 8bd2535d37..ab18034508 100644 --- a/libraries/classes/Controllers/Setup/AbstractController.php +++ b/libraries/classes/Controllers/Setup/AbstractController.php @@ -13,11 +13,9 @@ use function in_array; abstract class AbstractController { - /** @var ConfigFile */ - protected $config; + protected ConfigFile $config; - /** @var Template */ - protected $template; + protected Template $template; public function __construct(ConfigFile $config, Template $template) { diff --git a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php index a28b2123cd..3164ce0ed1 100644 --- a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php +++ b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php @@ -19,11 +19,9 @@ use function is_string; final class ColumnPreferencesController extends AbstractController { - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php b/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php index bbe9f9b4f8..c5502da6f3 100644 --- a/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php +++ b/libraries/classes/Controllers/Sql/DefaultForeignKeyCheckValueController.php @@ -13,8 +13,7 @@ use PhpMyAdmin\Utils\ForeignKey; final class DefaultForeignKeyCheckValueController extends AbstractController { - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Sql/EnumValuesController.php b/libraries/classes/Controllers/Sql/EnumValuesController.php index a2f242cc27..ab4fe1275e 100644 --- a/libraries/classes/Controllers/Sql/EnumValuesController.php +++ b/libraries/classes/Controllers/Sql/EnumValuesController.php @@ -19,11 +19,9 @@ use const ENT_COMPAT; final class EnumValuesController extends AbstractController { - /** @var Sql */ - private $sql; + private Sql $sql; - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Sql/RelationalValuesController.php b/libraries/classes/Controllers/Sql/RelationalValuesController.php index 19d88e1cd4..59da6038bc 100644 --- a/libraries/classes/Controllers/Sql/RelationalValuesController.php +++ b/libraries/classes/Controllers/Sql/RelationalValuesController.php @@ -15,11 +15,9 @@ use function strval; final class RelationalValuesController extends AbstractController { - /** @var Sql */ - private $sql; + private Sql $sql; - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Sql/SetValuesController.php b/libraries/classes/Controllers/Sql/SetValuesController.php index 8ff77f6204..47fe84a92f 100644 --- a/libraries/classes/Controllers/Sql/SetValuesController.php +++ b/libraries/classes/Controllers/Sql/SetValuesController.php @@ -18,11 +18,9 @@ use const ENT_COMPAT; final class SetValuesController extends AbstractController { - /** @var Sql */ - private $sql; + private Sql $sql; - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Sql/SqlController.php b/libraries/classes/Controllers/Sql/SqlController.php index 9055c9ebe8..3a8aa1c503 100644 --- a/libraries/classes/Controllers/Sql/SqlController.php +++ b/libraries/classes/Controllers/Sql/SqlController.php @@ -28,14 +28,11 @@ use function urlencode; class SqlController extends AbstractController { - /** @var Sql */ - private $sql; + private Sql $sql; - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php index edc9f4d02a..872de28af3 100644 --- a/libraries/classes/Controllers/Table/AddFieldController.php +++ b/libraries/classes/Controllers/Table/AddFieldController.php @@ -33,17 +33,13 @@ use function strlen; */ class AddFieldController extends AbstractController { - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var Config */ - private $config; + private Config $config; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var ColumnsDefinition */ - private $columnsDefinition; + private ColumnsDefinition $columnsDefinition; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index c3d617364c..5f0b6fc63d 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -30,11 +30,9 @@ use function strpos; */ class ChangeController extends AbstractController { - /** @var InsertEdit */ - private $insertEdit; + private InsertEdit $insertEdit; - /** @var Relation */ - private $relation; + private Relation $relation; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ChangeRowsController.php b/libraries/classes/Controllers/Table/ChangeRowsController.php index 427ae52566..698a134a55 100644 --- a/libraries/classes/Controllers/Table/ChangeRowsController.php +++ b/libraries/classes/Controllers/Table/ChangeRowsController.php @@ -15,8 +15,7 @@ use function is_array; final class ChangeRowsController extends AbstractController { - /** @var ChangeController */ - private $changeController; + private ChangeController $changeController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index d1e935a57f..5d57321e37 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -31,8 +31,7 @@ use function strlen; */ class ChartController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/CreateController.php b/libraries/classes/Controllers/Table/CreateController.php index 15cb4a1b82..23e6c6c0f3 100644 --- a/libraries/classes/Controllers/Table/CreateController.php +++ b/libraries/classes/Controllers/Table/CreateController.php @@ -29,17 +29,13 @@ use function strlen; */ class CreateController extends AbstractController { - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var Config */ - private $config; + private Config $config; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var ColumnsDefinition */ - private $columnsDefinition; + private ColumnsDefinition $columnsDefinition; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/DeleteRowsController.php b/libraries/classes/Controllers/Table/DeleteRowsController.php index 83096b2647..bb331bfafd 100644 --- a/libraries/classes/Controllers/Table/DeleteRowsController.php +++ b/libraries/classes/Controllers/Table/DeleteRowsController.php @@ -23,8 +23,7 @@ use function sprintf; final class DeleteRowsController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/DropColumnController.php b/libraries/classes/Controllers/Table/DropColumnController.php index 77f0ace8bb..cb3050cbf1 100644 --- a/libraries/classes/Controllers/Table/DropColumnController.php +++ b/libraries/classes/Controllers/Table/DropColumnController.php @@ -20,14 +20,11 @@ use function count; final class DropColumnController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var FlashMessages */ - private $flash; + private FlashMessages $flash; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 87a7446b48..323656ed6e 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -25,8 +25,7 @@ use function is_array; class ExportController extends AbstractController { - /** @var Options */ - private $export; + private Options $export; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ExportRowsController.php b/libraries/classes/Controllers/Table/ExportRowsController.php index ae4a891234..5631718974 100644 --- a/libraries/classes/Controllers/Table/ExportRowsController.php +++ b/libraries/classes/Controllers/Table/ExportRowsController.php @@ -15,8 +15,7 @@ use function is_array; final class ExportRowsController extends AbstractController { - /** @var ExportController */ - private $exportController; + private ExportController $exportController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 5e65a5a331..39687f3657 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -39,11 +39,9 @@ class FindReplaceController extends AbstractController /** @var array */ private $columnTypes; - /** @var string */ - private $connectionCharSet; + private string $connectionCharSet; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index 1ac95d7d66..a1bfce1364 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -26,8 +26,7 @@ use function sprintf; */ class GetFieldController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index fd496d01a2..a3ccf8ae72 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -28,8 +28,7 @@ final class GisVisualizationController extends AbstractController /** @var GisVisualization */ private $visualization; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php index 67bb6e090b..63c1cd6d93 100644 --- a/libraries/classes/Controllers/Table/ImportController.php +++ b/libraries/classes/Controllers/Table/ImportController.php @@ -27,8 +27,7 @@ use function is_numeric; final class ImportController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php index 8e6cd9787f..68571095ca 100644 --- a/libraries/classes/Controllers/Table/IndexRenameController.php +++ b/libraries/classes/Controllers/Table/IndexRenameController.php @@ -19,11 +19,9 @@ use function is_array; final class IndexRenameController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Indexes */ - private $indexes; + private Indexes $indexes; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 98bb86fe6b..9731bcf4a8 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -26,11 +26,9 @@ use function min; */ class IndexesController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Indexes */ - private $indexes; + private Indexes $indexes; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php index 11b3519d4b..66e429b353 100644 --- a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php +++ b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php @@ -23,11 +23,9 @@ use function count; final class AnalyzeController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Maintenance/CheckController.php b/libraries/classes/Controllers/Table/Maintenance/CheckController.php index f5bd549304..b8cd0e41e5 100644 --- a/libraries/classes/Controllers/Table/Maintenance/CheckController.php +++ b/libraries/classes/Controllers/Table/Maintenance/CheckController.php @@ -23,11 +23,9 @@ use function count; final class CheckController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php index d0d34b9a2c..6bb44b6e78 100644 --- a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php +++ b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php @@ -23,11 +23,9 @@ use function count; final class ChecksumController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php index 85af0f2e67..3e247be2fc 100644 --- a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php +++ b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php @@ -23,11 +23,9 @@ use function count; final class OptimizeController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Maintenance/RepairController.php b/libraries/classes/Controllers/Table/Maintenance/RepairController.php index c3754e9639..ba3730dfb7 100644 --- a/libraries/classes/Controllers/Table/Maintenance/RepairController.php +++ b/libraries/classes/Controllers/Table/Maintenance/RepairController.php @@ -23,11 +23,9 @@ use function count; final class RepairController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; - /** @var Config */ - private $config; + private Config $config; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php index 50eaa78244..0a55867429 100644 --- a/libraries/classes/Controllers/Table/OperationsController.php +++ b/libraries/classes/Controllers/Table/OperationsController.php @@ -38,17 +38,13 @@ use function urldecode; class OperationsController extends AbstractController { - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var CheckUserPrivileges */ - private $checkUserPrivileges; + private CheckUserPrivileges $checkUserPrivileges; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/AnalyzeController.php b/libraries/classes/Controllers/Table/Partition/AnalyzeController.php index e43496c998..7dc9bd715d 100644 --- a/libraries/classes/Controllers/Table/Partition/AnalyzeController.php +++ b/libraries/classes/Controllers/Table/Partition/AnalyzeController.php @@ -21,8 +21,7 @@ use function __; final class AnalyzeController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/CheckController.php b/libraries/classes/Controllers/Table/Partition/CheckController.php index d82e851344..9ae0adff22 100644 --- a/libraries/classes/Controllers/Table/Partition/CheckController.php +++ b/libraries/classes/Controllers/Table/Partition/CheckController.php @@ -21,8 +21,7 @@ use function __; final class CheckController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/DropController.php b/libraries/classes/Controllers/Table/Partition/DropController.php index 2bdb12103d..45cafb68c8 100644 --- a/libraries/classes/Controllers/Table/Partition/DropController.php +++ b/libraries/classes/Controllers/Table/Partition/DropController.php @@ -21,8 +21,7 @@ use function __; final class DropController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/OptimizeController.php b/libraries/classes/Controllers/Table/Partition/OptimizeController.php index a143aed147..95c2082480 100644 --- a/libraries/classes/Controllers/Table/Partition/OptimizeController.php +++ b/libraries/classes/Controllers/Table/Partition/OptimizeController.php @@ -21,8 +21,7 @@ use function __; final class OptimizeController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/RebuildController.php b/libraries/classes/Controllers/Table/Partition/RebuildController.php index aa612cc412..da512e8b6e 100644 --- a/libraries/classes/Controllers/Table/Partition/RebuildController.php +++ b/libraries/classes/Controllers/Table/Partition/RebuildController.php @@ -21,8 +21,7 @@ use function __; final class RebuildController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/RepairController.php b/libraries/classes/Controllers/Table/Partition/RepairController.php index 453ac2bae5..fbc4f34be2 100644 --- a/libraries/classes/Controllers/Table/Partition/RepairController.php +++ b/libraries/classes/Controllers/Table/Partition/RepairController.php @@ -21,8 +21,7 @@ use function __; final class RepairController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Partition/TruncateController.php b/libraries/classes/Controllers/Table/Partition/TruncateController.php index b87f076ba3..0d036c917c 100644 --- a/libraries/classes/Controllers/Table/Partition/TruncateController.php +++ b/libraries/classes/Controllers/Table/Partition/TruncateController.php @@ -21,8 +21,7 @@ use function __; final class TruncateController extends AbstractController { - /** @var Maintenance */ - private $model; + private Maintenance $model; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index d5d4383862..4fec60975b 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -28,11 +28,9 @@ use function mb_strtolower; */ class PrivilegesController extends AbstractController { - /** @var Privileges */ - private $privileges; + private Privileges $privileges; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index e4083db2a4..65dae0b491 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -36,11 +36,9 @@ use function usort; */ final class RelationController extends AbstractController { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index 6dc5a4a511..75134898ff 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -41,17 +41,13 @@ use function sprintf; */ final class ReplaceController extends AbstractController { - /** @var InsertEdit */ - private $insertEdit; + private InsertEdit $insertEdit; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index 568dc45838..a378fc4d7e 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -73,10 +73,8 @@ class SearchController extends AbstractController private $columnNullFlags; /** * Whether a geometry column is present - * - * @var bool */ - private $geomColumnFlag; + private bool $geomColumnFlag; /** * Foreign Keys * @@ -84,14 +82,11 @@ class SearchController extends AbstractController */ private $foreigners; - /** @var Search */ - private $search; + private Search $search; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php index 814a506111..a700dffe5d 100644 --- a/libraries/classes/Controllers/Table/SqlController.php +++ b/libraries/classes/Controllers/Table/SqlController.php @@ -21,8 +21,7 @@ use function htmlspecialchars; */ final class SqlController extends AbstractController { - /** @var SqlQueryForm */ - private $sqlQueryForm; + private SqlQueryForm $sqlQueryForm; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php b/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php index fb1d39a078..97332743da 100644 --- a/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php +++ b/libraries/classes/Controllers/Table/Structure/AbstractIndexController.php @@ -17,11 +17,9 @@ use function is_array; abstract class AbstractIndexController extends AbstractController { - /** @var StructureController */ - protected $structureController; + protected StructureController $structureController; - /** @var Indexes */ - protected $indexes; + protected Indexes $indexes; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/AddKeyController.php b/libraries/classes/Controllers/Table/Structure/AddKeyController.php index 04c58cb0d9..467726a1b7 100644 --- a/libraries/classes/Controllers/Table/Structure/AddKeyController.php +++ b/libraries/classes/Controllers/Table/Structure/AddKeyController.php @@ -13,11 +13,9 @@ use PhpMyAdmin\Template; final class AddKeyController extends AbstractController { - /** @var SqlController */ - private $sqlController; + private SqlController $sqlController; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/BrowseController.php b/libraries/classes/Controllers/Table/Structure/BrowseController.php index 56ffb8b1a5..57802a6879 100644 --- a/libraries/classes/Controllers/Table/Structure/BrowseController.php +++ b/libraries/classes/Controllers/Table/Structure/BrowseController.php @@ -19,8 +19,7 @@ use function sprintf; final class BrowseController extends AbstractController { - /** @var Sql */ - private $sql; + private Sql $sql; public function __construct(ResponseRenderer $response, Template $template, Sql $sql) { diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php index be2949eb76..c907f8b5aa 100644 --- a/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php +++ b/libraries/classes/Controllers/Table/Structure/CentralColumnsAddController.php @@ -17,11 +17,9 @@ use function is_array; final class CentralColumnsAddController extends AbstractController { - /** @var CentralColumns */ - private $centralColumns; + private CentralColumns $centralColumns; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php index b5ea5d8d47..98eef17798 100644 --- a/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php +++ b/libraries/classes/Controllers/Table/Structure/CentralColumnsRemoveController.php @@ -17,11 +17,9 @@ use function is_array; final class CentralColumnsRemoveController extends AbstractController { - /** @var CentralColumns */ - private $centralColumns; + private CentralColumns $centralColumns; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/ChangeController.php b/libraries/classes/Controllers/Table/Structure/ChangeController.php index b9bd0f0a2c..96471966eb 100644 --- a/libraries/classes/Controllers/Table/Structure/ChangeController.php +++ b/libraries/classes/Controllers/Table/Structure/ChangeController.php @@ -19,11 +19,9 @@ use function is_array; final class ChangeController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var ColumnsDefinition */ - private $columnsDefinition; + private ColumnsDefinition $columnsDefinition; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php index e78fc07694..0c41f57d2d 100644 --- a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php +++ b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php @@ -26,11 +26,9 @@ use function str_replace; final class MoveColumnsController extends AbstractController { - /** @var Table The table object */ - private $tableObj; + private Table $tableObj; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/PartitioningController.php b/libraries/classes/Controllers/Table/Structure/PartitioningController.php index 3966f49e6b..471f827ba8 100644 --- a/libraries/classes/Controllers/Table/Structure/PartitioningController.php +++ b/libraries/classes/Controllers/Table/Structure/PartitioningController.php @@ -30,14 +30,11 @@ use function trim; final class PartitioningController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var CreateAddField */ - private $createAddField; + private CreateAddField $createAddField; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/PrimaryController.php b/libraries/classes/Controllers/Table/Structure/PrimaryController.php index 79777e0787..bdd658ddf4 100644 --- a/libraries/classes/Controllers/Table/Structure/PrimaryController.php +++ b/libraries/classes/Controllers/Table/Structure/PrimaryController.php @@ -21,11 +21,9 @@ use function is_array; final class PrimaryController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/Structure/SaveController.php b/libraries/classes/Controllers/Table/Structure/SaveController.php index 63f266eaa9..c0736581a8 100644 --- a/libraries/classes/Controllers/Table/Structure/SaveController.php +++ b/libraries/classes/Controllers/Table/Structure/SaveController.php @@ -31,20 +31,15 @@ use function strlen; final class SaveController extends AbstractController { - /** @var Table The table object */ - private $tableObj; + private Table $tableObj; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var StructureController */ - private $structureController; + private StructureController $structureController; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index df3c6d6887..bed79b3a49 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -41,17 +41,13 @@ use function str_contains; */ class StructureController extends AbstractController { - /** @var Table The table object */ - protected $tableObj; + protected Table $tableObj; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index 2857956803..63818fe8ab 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -31,8 +31,7 @@ use function sprintf; final class TrackingController extends AbstractController { - /** @var Tracking */ - private $tracking; + private Tracking $tracking; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index 8fe75390fe..202a0bf007 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -22,11 +22,9 @@ use function strlen; */ class TriggersController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Triggers */ - private $triggers; + private Triggers $triggers; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index 063b188cb6..3119acd1e4 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -42,11 +42,9 @@ use function strtoupper; */ class ZoomSearchController extends AbstractController { - /** @var Search */ - private $search; + private Search $search; - /** @var Relation */ - private $relation; + private Relation $relation; /** @var array */ private $columnNames; @@ -64,13 +62,12 @@ class ZoomSearchController extends AbstractController private $columnNullFlags; /** @var bool Whether a geometry column is present */ - private $geomColumnFlag; + private bool $geomColumnFlag; /** @var array Foreign keys */ private $foreigners; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php index 5b9755a83d..94b5c1545a 100644 --- a/libraries/classes/Controllers/TableController.php +++ b/libraries/classes/Controllers/TableController.php @@ -12,8 +12,7 @@ use PhpMyAdmin\Template; final class TableController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Controllers/ThemeSetController.php b/libraries/classes/Controllers/ThemeSetController.php index 8edf98bf49..7f1d3dba52 100644 --- a/libraries/classes/Controllers/ThemeSetController.php +++ b/libraries/classes/Controllers/ThemeSetController.php @@ -15,11 +15,9 @@ use function is_string; final class ThemeSetController extends AbstractController { - /** @var ThemeManager */ - private $themeManager; + private ThemeManager $themeManager; - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/ThemesController.php b/libraries/classes/Controllers/ThemesController.php index 3d8f4a7f43..173d54f32e 100644 --- a/libraries/classes/Controllers/ThemesController.php +++ b/libraries/classes/Controllers/ThemesController.php @@ -11,8 +11,7 @@ use PhpMyAdmin\ThemeManager; class ThemesController extends AbstractController { - /** @var ThemeManager */ - private $themeManager; + private ThemeManager $themeManager; public function __construct(ResponseRenderer $response, Template $template, ThemeManager $themeManager) { diff --git a/libraries/classes/Controllers/Transformation/OverviewController.php b/libraries/classes/Controllers/Transformation/OverviewController.php index 4e261d168d..dd1fed0b0f 100644 --- a/libraries/classes/Controllers/Transformation/OverviewController.php +++ b/libraries/classes/Controllers/Transformation/OverviewController.php @@ -17,8 +17,7 @@ use function array_keys; */ class OverviewController extends AbstractController { - /** @var Transformations */ - private $transformations; + private Transformations $transformations; public function __construct(ResponseRenderer $response, Template $template, Transformations $transformations) { diff --git a/libraries/classes/Controllers/Transformation/WrapperController.php b/libraries/classes/Controllers/Transformation/WrapperController.php index b66a22f7aa..266ae91b82 100644 --- a/libraries/classes/Controllers/Transformation/WrapperController.php +++ b/libraries/classes/Controllers/Transformation/WrapperController.php @@ -37,14 +37,11 @@ use function strtolower; */ class WrapperController extends AbstractController { - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index 6ca5039398..23c7df1e6c 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -19,11 +19,9 @@ use function __; */ class UserPasswordController extends AbstractController { - /** @var UserPassword */ - private $userPassword; + private UserPassword $userPassword; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php index ef7c0000c5..ea0aabffce 100644 --- a/libraries/classes/Controllers/VersionCheckController.php +++ b/libraries/classes/Controllers/VersionCheckController.php @@ -19,8 +19,7 @@ use function sprintf; */ class VersionCheckController extends AbstractController { - /** @var VersionInformation */ - private $versionInformation; + private VersionInformation $versionInformation; public function __construct(ResponseRenderer $response, Template $template, VersionInformation $versionInformation) { diff --git a/libraries/classes/Controllers/View/CreateController.php b/libraries/classes/Controllers/View/CreateController.php index b227518971..9768dbdd1c 100644 --- a/libraries/classes/Controllers/View/CreateController.php +++ b/libraries/classes/Controllers/View/CreateController.php @@ -33,8 +33,7 @@ use function substr; */ class CreateController extends AbstractController { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** @todo Move the whole view rebuilding logic to SQL parser */ private const VIEW_SECURITY_OPTIONS = [ diff --git a/libraries/classes/Controllers/View/OperationsController.php b/libraries/classes/Controllers/View/OperationsController.php index cbbc5dde0d..2baadcc48a 100644 --- a/libraries/classes/Controllers/View/OperationsController.php +++ b/libraries/classes/Controllers/View/OperationsController.php @@ -24,11 +24,9 @@ use function is_string; */ class OperationsController extends AbstractController { - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( ResponseRenderer $response, diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 62c0dc14f5..036c37383a 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -22,8 +22,7 @@ use function trim; */ class CreateAddField { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param DatabaseInterface $dbi DatabaseInterface interface diff --git a/libraries/classes/Database/CentralColumns.php b/libraries/classes/Database/CentralColumns.php index b9fab415be..9cddcc1b56 100644 --- a/libraries/classes/Database/CentralColumns.php +++ b/libraries/classes/Database/CentralColumns.php @@ -32,12 +32,7 @@ use function trim; class CentralColumns { - /** - * DatabaseInterface instance - * - * @var DatabaseInterface - */ - private $dbi; + private DatabaseInterface $dbi; /** * Current user @@ -48,10 +43,8 @@ class CentralColumns /** * Number of rows displayed when browsing a result set - * - * @var int */ - private $maxRows; + private int $maxRows; /** * Which editor should be used for CHAR/VARCHAR fields @@ -62,13 +55,10 @@ class CentralColumns /** * Disable use of INFORMATION_SCHEMA - * - * @var bool */ - private $disableIs; + private bool $disableIs; - /** @var Relation */ - private $relation; + private Relation $relation; /** @var Template */ public $template; diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index 7738a04152..d51aeab376 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -26,11 +26,9 @@ use function str_contains; */ class Designer { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; /** @var Template */ public $template; diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index 1a5b8834ea..3610da71f6 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -32,11 +32,9 @@ use function rawurlencode; */ class Common { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param DatabaseInterface $dbi DatabaseInterface object diff --git a/libraries/classes/Database/Designer/DesignerTable.php b/libraries/classes/Database/Designer/DesignerTable.php index 384e740b02..28ce6c9a32 100644 --- a/libraries/classes/Database/Designer/DesignerTable.php +++ b/libraries/classes/Database/Designer/DesignerTable.php @@ -11,17 +11,13 @@ use PhpMyAdmin\Utils\ForeignKey; */ class DesignerTable { - /** @var string */ - private $tableName; + private string $tableName; - /** @var string */ - private $databaseName; + private string $databaseName; - /** @var string */ - private $tableEngine; + private string $tableEngine; - /** @var string|null */ - private $displayField; + private ?string $displayField; /** * Create a new DesignerTable diff --git a/libraries/classes/Database/Events.php b/libraries/classes/Database/Events.php index 8c311a228f..574d212bb4 100644 --- a/libraries/classes/Database/Events.php +++ b/libraries/classes/Database/Events.php @@ -62,11 +62,9 @@ class Events 'MINUTE_SECOND', ]; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Template */ - private $template; + private Template $template; /** @var ResponseRenderer */ private $response; diff --git a/libraries/classes/Database/MultiTableQuery.php b/libraries/classes/Database/MultiTableQuery.php index c2ac6a95ae..d25d4ba59e 100644 --- a/libraries/classes/Database/MultiTableQuery.php +++ b/libraries/classes/Database/MultiTableQuery.php @@ -27,10 +27,8 @@ class MultiTableQuery { /** * DatabaseInterface instance - * - * @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * Database name @@ -51,7 +49,7 @@ class MultiTableQuery * * @var array */ - private $tables; + private array $tables; /** @var Template */ public $template; diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php index 64a1840a8a..dccc1db3ac 100644 --- a/libraries/classes/Database/Routines.php +++ b/libraries/classes/Database/Routines.php @@ -57,11 +57,9 @@ class Routines /** @var array */ private $numericOptions = ['UNSIGNED', 'ZEROFILL', 'UNSIGNED ZEROFILL']; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Template */ - private $template; + private Template $template; /** @var ResponseRenderer */ private $response; diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php index c745882542..38153e9e35 100644 --- a/libraries/classes/Database/Search.php +++ b/libraries/classes/Database/Search.php @@ -40,10 +40,8 @@ class Search /** * Type of search - * - * @var array */ - private $searchTypes; + private array $searchTypes; /** * Already set search type @@ -80,8 +78,7 @@ class Search */ private $criteriaColumnName; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** @var Template */ public $template; diff --git a/libraries/classes/Database/Triggers.php b/libraries/classes/Database/Triggers.php index eb48326b13..eea058a1c3 100644 --- a/libraries/classes/Database/Triggers.php +++ b/libraries/classes/Database/Triggers.php @@ -37,11 +37,9 @@ class Triggers /** @var array */ private $event = ['INSERT', 'UPDATE', 'DELETE']; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Template */ - private $template; + private Template $template; /** @var ResponseRenderer */ private $response; diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 3dceec9c9b..4964372e4a 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -92,8 +92,7 @@ class DatabaseInterface implements DbalInterface */ public const GETVAR_GLOBAL = 2; - /** @var DbiExtension */ - private $extension; + private DbiExtension $extension; /** * Opened database connections. @@ -126,8 +125,7 @@ class DatabaseInterface implements DbalInterface /** @var Types MySQL types data */ public $types; - /** @var Cache */ - private $cache; + private Cache $cache; /** @var float */ public $lastQueryExecutionTime = 0; diff --git a/libraries/classes/Dbal/MysqliResult.php b/libraries/classes/Dbal/MysqliResult.php index a40c711049..8ef1deb00d 100644 --- a/libraries/classes/Dbal/MysqliResult.php +++ b/libraries/classes/Dbal/MysqliResult.php @@ -27,10 +27,8 @@ final class MysqliResult implements ResultInterface { /** * The result identifier produced by the DBiExtension - * - * @var mysqli_result|null $result */ - private $result; + private ?mysqli_result $result; /** * @param mysqli_result|bool $result diff --git a/libraries/classes/Dbal/MysqliStatement.php b/libraries/classes/Dbal/MysqliStatement.php index 840d7a4ca1..2688d6ddaf 100644 --- a/libraries/classes/Dbal/MysqliStatement.php +++ b/libraries/classes/Dbal/MysqliStatement.php @@ -10,8 +10,7 @@ use function count; final class MysqliStatement implements Statement { - /** @var mysqli_stmt */ - private $statement; + private mysqli_stmt $statement; public function __construct(mysqli_stmt $statement) { diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 103dfb6b27..108abc6efe 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -232,14 +232,11 @@ class Results */ public $transformationInfo; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; /** @var Template */ public $template; diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php index 22c0730651..5c46c56948 100644 --- a/libraries/classes/Error.php +++ b/libraries/classes/Error.php @@ -115,10 +115,8 @@ class Error extends Message /** * Holds the backtrace for this error - * - * @var array */ - protected $backtrace = []; + protected array $backtrace = []; /** * Hide location of errors diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index fa8b95ba3f..8e71c5844a 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -56,10 +56,8 @@ class ErrorHandler /** * Initial error reporting state - * - * @var int */ - protected $errorReporting = 0; + protected int $errorReporting = 0; public function __construct() { diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php index c1aa67602e..6c2d63305d 100644 --- a/libraries/classes/ErrorReport.php +++ b/libraries/classes/ErrorReport.php @@ -33,17 +33,13 @@ class ErrorReport */ private $submissionUrl = 'https://reports.phpmyadmin.net/incidents/create'; - /** @var HttpRequest */ - private $httpRequest; + private HttpRequest $httpRequest; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Template */ - public $template; + public Template $template; - /** @var Config */ - private $config; + private Config $config; /** * @param HttpRequest $httpRequest HttpRequest instance diff --git a/libraries/classes/Export/Options.php b/libraries/classes/Export/Options.php index 5ec5252a27..077d677626 100644 --- a/libraries/classes/Export/Options.php +++ b/libraries/classes/Export/Options.php @@ -24,11 +24,9 @@ use function urldecode; final class Options { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var TemplateModel */ - private $templateModel; + private TemplateModel $templateModel; public function __construct(Relation $relation, TemplateModel $templateModel) { diff --git a/libraries/classes/Export/Template.php b/libraries/classes/Export/Template.php index 7de53fb5fe..52649632ad 100644 --- a/libraries/classes/Export/Template.php +++ b/libraries/classes/Export/Template.php @@ -7,20 +7,16 @@ namespace PhpMyAdmin\Export; /** @psalm-immutable */ final class Template { - /** @var int */ - private $id; + private int $id; - /** @var string */ - private $username; + private string $username; - /** @var string */ - private $exportType; + private string $exportType; - /** @var string */ - private $name; + private string $name; /** @var string JSON */ - private $data; + private string $data; private function __construct(int $id, string $username, string $exportType, string $name, string $data) { diff --git a/libraries/classes/Export/TemplateModel.php b/libraries/classes/Export/TemplateModel.php index 70bdccbb8d..92316a4f5d 100644 --- a/libraries/classes/Export/TemplateModel.php +++ b/libraries/classes/Export/TemplateModel.php @@ -14,8 +14,7 @@ use function sprintf; final class TemplateModel { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/File.php b/libraries/classes/File.php index 1069a8be40..8c7089ef3c 100644 --- a/libraries/classes/File.php +++ b/libraries/classes/File.php @@ -81,8 +81,7 @@ class File /** @var string charset of file */ protected $charset = null; - /** @var ZipExtension */ - private $zipExtension; + private ZipExtension $zipExtension; /** * @param bool|string $name file name or false diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index 162995c817..aa06b53cf3 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -27,10 +27,8 @@ class Footer { /** * Scripts instance - * - * @var Scripts */ - private $scripts; + private Scripts $scripts; /** * Whether we are servicing an ajax request. * @@ -40,22 +38,16 @@ class Footer /** * Whether to only close the BODY and HTML tags * or also include scripts, errors and links - * - * @var bool */ - private $isMinimal; + private bool $isMinimal; /** * Whether to display anything - * - * @var bool */ - private $isEnabled; + private bool $isEnabled; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Template */ - private $template; + private Template $template; /** * Creates a new class instance diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php index f06892ee6e..1c59fc66ef 100644 --- a/libraries/classes/Git.php +++ b/libraries/classes/Git.php @@ -51,10 +51,8 @@ class Git { /** * Enable Git information search and process - * - * @var bool */ - private $showGitRevision; + private bool $showGitRevision; /** * Git has been found and the data fetched diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 77e6c4524c..99435809cb 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -32,71 +32,49 @@ class Header { /** * Scripts instance - * - * @var Scripts */ - private $scripts; + private Scripts $scripts; /** * PhpMyAdmin\Console instance - * - * @var Console */ - private $console; + private Console $console; /** * Menu instance - * - * @var Menu */ - private $menu; + private Menu $menu; /** * The page title - * - * @var string */ - private $title; + private string $title; /** * The value for the id attribute for the body tag - * - * @var string */ - private $bodyId; + private string $bodyId; /** * Whether to show the top menu - * - * @var bool */ - private $menuEnabled; + private bool $menuEnabled; /** * Whether to show the warnings - * - * @var bool */ - private $warningsEnabled; + private bool $warningsEnabled; /** * Whether we are servicing an ajax request. - * - * @var bool */ - private $isAjax; + private bool $isAjax; /** * Whether to display anything - * - * @var bool */ - private $isEnabled; + private bool $isEnabled; /** * Whether the HTTP headers (and possibly some HTML) * have already been sent to the browser - * - * @var bool */ - private $headerIsSent; + private bool $headerIsSent; - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; - /** @var Template */ - private $template; + private Template $template; /** @var bool */ private $isTransformationWrapper = false; diff --git a/libraries/classes/Http/Factory/ServerRequestFactory.php b/libraries/classes/Http/Factory/ServerRequestFactory.php index 62d2941ca7..cf685bf3dd 100644 --- a/libraries/classes/Http/Factory/ServerRequestFactory.php +++ b/libraries/classes/Http/Factory/ServerRequestFactory.php @@ -35,11 +35,9 @@ use const PHP_URL_QUERY; class ServerRequestFactory { - /** @var ServerRequestFactoryInterface */ - private $serverRequestFactory; + private ServerRequestFactoryInterface $serverRequestFactory; - /** @var UriFactoryInterface */ - private $uriFactory; + private UriFactoryInterface $uriFactory; public function __construct( ?ServerRequestFactoryInterface $serverRequestFactory = null, diff --git a/libraries/classes/Http/ServerRequest.php b/libraries/classes/Http/ServerRequest.php index 941e37eace..2d9a38610f 100644 --- a/libraries/classes/Http/ServerRequest.php +++ b/libraries/classes/Http/ServerRequest.php @@ -15,8 +15,7 @@ use function property_exists; class ServerRequest implements ServerRequestInterface { - /** @var ServerRequestInterface */ - private $serverRequest; + private ServerRequestInterface $serverRequest; final public function __construct(ServerRequestInterface $serverRequest) { diff --git a/libraries/classes/Import/SimulateDml.php b/libraries/classes/Import/SimulateDml.php index edcab225f6..8cc704ee1f 100644 --- a/libraries/classes/Import/SimulateDml.php +++ b/libraries/classes/Import/SimulateDml.php @@ -19,8 +19,7 @@ use function strtoupper; final class SimulateDml { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 5917da306d..481cf9b250 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -53,20 +53,15 @@ use const PASSWORD_DEFAULT; class InsertEdit { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var FileListing */ - private $fileListing; + private FileListing $fileListing; - /** @var Template */ - private $template; + private Template $template; private const FUNC_OPTIONAL_PARAM = [ 'RAND', diff --git a/libraries/classes/Language.php b/libraries/classes/Language.php index 49cd698b19..869ec6d7b1 100644 --- a/libraries/classes/Language.php +++ b/libraries/classes/Language.php @@ -31,8 +31,7 @@ class Language /** @var string */ protected $native; - /** @var string */ - protected $regex; + protected string $regex; /** @var string */ protected $mysql; diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index 8fffa57268..4ff5fbe5cb 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -27,26 +27,19 @@ class Menu { /** * Database name - * - * @var string */ - private $db; + private string $db; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * Table name - * - * @var string */ - private $table; + private string $table; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Template */ - private $template; + private Template $template; /** * Creates a new instance of Menu diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index a7b700ed47..2a1524bd8b 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -44,8 +44,7 @@ class Navigation /** @var DatabaseInterface */ private $dbi; - /** @var NavigationTree */ - private $tree; + private NavigationTree $tree; /** * @param Template $template Template instance diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index f4641c43af..e70cbda002 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -64,7 +64,7 @@ class NavigationTree private const SPECIAL_NODE_NAMES = ['tables', 'views', 'functions', 'procedures', 'events']; /** @var Node Reference to the root node of the tree */ - private $tree; + private Node $tree; /** * @var array The actual paths to all expanded nodes in the tree * This does not include nodes created after the grouping @@ -125,8 +125,7 @@ class NavigationTree /** @var Template */ private $template; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param Template $template Template instance diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index 416f3681ae..5cc50311b4 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -119,8 +119,7 @@ class Node */ public $pos3 = 0; - /** @var Relation */ - protected $relation; + protected Relation $relation; /** @var string $displayName display name for the navigation tree */ public $displayName; diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index f56a99230a..6c582e7985 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -34,16 +34,12 @@ class Normalization { /** * DatabaseInterface instance - * - * @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; /** @var Template */ public $template; diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index 2a7ef0f9b3..56a70de092 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -31,11 +31,9 @@ use function urldecode; */ class Operations { - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param DatabaseInterface $dbi DatabaseInterface object diff --git a/libraries/classes/OutputBuffering.php b/libraries/classes/OutputBuffering.php index 6d0f979f8d..96d1596fc2 100644 --- a/libraries/classes/OutputBuffering.php +++ b/libraries/classes/OutputBuffering.php @@ -23,8 +23,7 @@ use function sprintf; */ class OutputBuffering { - /** @var int */ - private $mode; + private int $mode; /** @var string */ private $content = ''; diff --git a/libraries/classes/Partitioning/Maintenance.php b/libraries/classes/Partitioning/Maintenance.php index e4d9666d8d..7dc0bec72f 100644 --- a/libraries/classes/Partitioning/Maintenance.php +++ b/libraries/classes/Partitioning/Maintenance.php @@ -13,8 +13,7 @@ use function sprintf; final class Maintenance { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index b1c4179d40..d8e3dab29a 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -52,8 +52,7 @@ abstract class AuthenticationPlugin */ public $password = ''; - /** @var IpAllowDeny */ - protected $ipAllowDeny; + protected IpAllowDeny $ipAllowDeny; /** @var Template */ public $template; diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index d4b3acd9a1..7f1ab50c2a 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -91,11 +91,9 @@ class Pdf extends PdfLib /** @var array */ private $aliases; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; /** * Constructs PDF and configures standard parameters. diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php index d3e6660d25..276266e1e0 100644 --- a/libraries/classes/Plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -25,19 +25,15 @@ abstract class ExportPlugin implements Plugin { /** * Object containing the specific export plugin type properties. - * - * @var ExportPluginProperties */ - protected $properties; + protected ExportPluginProperties $properties; /** @var Relation */ public $relation; - /** @var Export */ - protected $export; + protected Export $export; - /** @var Transformations */ - protected $transformations; + protected Transformations $transformations; final public function __construct(Relation $relation, Export $export, Transformations $transformations) { diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php index 39bc8e16e6..5bd191a7b6 100644 --- a/libraries/classes/Plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -22,13 +22,10 @@ abstract class ImportPlugin implements Plugin { /** * Object containing the import plugin properties. - * - * @var ImportPluginProperties */ - protected $properties; + protected ImportPluginProperties $properties; - /** @var Import */ - protected $import; + protected Import $import; final public function __construct() { diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index 38ca2ea899..985839c540 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -53,8 +53,7 @@ class ExportRelationSchema /** @var bool */ protected $offline = false; - /** @var Relation */ - protected $relation; + protected Relation $relation; /** * @param string $db database name diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php index c81e2d278b..345f65f14e 100644 --- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php @@ -79,8 +79,7 @@ class Pdf extends PdfLib /** @var string */ private $db; - /** @var Relation */ - private $relation; + private Relation $relation; /** * Constructs PDF for schema export. diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index 198192eeb5..edd46ee347 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -96,8 +96,7 @@ class PdfRelationSchema extends ExportRelationSchema /** @var RelationStatsPdf[] */ protected $relations = []; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; /** * @see Schema\Pdf diff --git a/libraries/classes/Plugins/Schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php index 76a957826c..16a3f12a22 100644 --- a/libraries/classes/Plugins/Schema/TableStats.php +++ b/libraries/classes/Plugins/Schema/TableStats.php @@ -71,11 +71,9 @@ abstract class TableStats /** @var bool */ protected $offline; - /** @var Relation */ - protected $relation; + protected Relation $relation; - /** @var Font */ - protected $font; + protected Font $font; /** * @param Pdf\Pdf|Svg\Svg|Eps\Eps|Dia\Dia $diagram schema diagram diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php index 79f17facd2..97f46bfa39 100644 --- a/libraries/classes/Plugins/SchemaPlugin.php +++ b/libraries/classes/Plugins/SchemaPlugin.php @@ -25,10 +25,8 @@ abstract class SchemaPlugin implements Plugin { /** * Object containing the specific schema export plugin type properties. - * - * @var SchemaPluginProperties */ - protected $properties; + protected SchemaPluginProperties $properties; final public function __construct() { diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index 160b440c81..bae1d81c78 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -27,8 +27,7 @@ class Application extends TwoFactorPlugin /** @var string */ public static $id = 'application'; - /** @var Google2FA */ - protected $google2fa; + protected Google2FA $google2fa; /** * Creates object diff --git a/libraries/classes/Plugins/TwoFactor/WebAuthn.php b/libraries/classes/Plugins/TwoFactor/WebAuthn.php index 2fb75b3f49..c13d25c8ab 100644 --- a/libraries/classes/Plugins/TwoFactor/WebAuthn.php +++ b/libraries/classes/Plugins/TwoFactor/WebAuthn.php @@ -38,8 +38,7 @@ class WebAuthn extends TwoFactorPlugin /** @var string */ public static $id = 'WebAuthn'; - /** @var Server */ - private $server; + private Server $server; /** @var ServerRequest|null */ public $serverRequest = null; diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index bae861a542..50a5f35321 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -37,8 +37,7 @@ class TwoFactorPlugin */ public static $showSubmit = true; - /** @var TwoFactor */ - protected $twofactor; + protected TwoFactor $twofactor; /** @var bool */ protected $provided = false; diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index 07360a0ad0..e53e54c70e 100644 --- a/libraries/classes/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -46,10 +46,8 @@ class RecentFavoriteTable /** * Defines type of action, Favorite or Recent table. - * - * @var string */ - private $tableType; + private string $tableType; /** * RecentFavoriteTable instances. @@ -58,8 +56,7 @@ class RecentFavoriteTable */ private static $instances = []; - /** @var Relation */ - private $relation; + private Relation $relation; /** * Creates a new instance of RecentFavoriteTable diff --git a/libraries/classes/Replication.php b/libraries/classes/Replication.php index 60fe11d51c..7a4cfc5917 100644 --- a/libraries/classes/Replication.php +++ b/libraries/classes/Replication.php @@ -17,8 +17,7 @@ use function mb_strtoupper; */ class Replication { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/ReplicationGui.php b/libraries/classes/ReplicationGui.php index 5b1ef0ae67..a258e7e8a8 100644 --- a/libraries/classes/ReplicationGui.php +++ b/libraries/classes/ReplicationGui.php @@ -26,11 +26,9 @@ use function time; */ class ReplicationGui { - /** @var Replication */ - private $replication; + private Replication $replication; - /** @var Template */ - private $template; + private Template $template; /** * @param Replication $replication Replication instance diff --git a/libraries/classes/ReplicationInfo.php b/libraries/classes/ReplicationInfo.php index c3dd3f7b8a..991f7b7cfd 100644 --- a/libraries/classes/ReplicationInfo.php +++ b/libraries/classes/ReplicationInfo.php @@ -70,8 +70,7 @@ final class ReplicationInfo /** @var array */ private $replicaInfo = []; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/ResponseRenderer.php b/libraries/classes/ResponseRenderer.php index 765d3dbbd2..50380bf07f 100644 --- a/libraries/classes/ResponseRenderer.php +++ b/libraries/classes/ResponseRenderer.php @@ -35,16 +35,12 @@ class ResponseRenderer /** * Header instance - * - * @var Header */ - protected $header; + protected Header $header; /** * HTML data to be used in the response - * - * @var string */ - private $HTML; + private string $HTML; /** * An array of JSON key-value pairs * to be sent back for ajax requests @@ -54,10 +50,8 @@ class ResponseRenderer private $JSON; /** * PhpMyAdmin\Footer instance - * - * @var Footer */ - protected $footer; + protected Footer $footer; /** * Whether we are servicing an ajax request. * @@ -66,17 +60,13 @@ class ResponseRenderer protected $isAjax = false; /** * Whether response object is disabled - * - * @var bool */ - protected $isDisabled; + protected bool $isDisabled; /** * Whether there were any errors during the processing of the request * Only used for ajax responses - * - * @var bool */ - protected $isSuccess; + protected bool $isSuccess; /** * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml @@ -155,8 +145,7 @@ class ResponseRenderer 511 => 'Network Authentication Required', ]; - /** @var OutputBuffering */ - private $buffer; + private OutputBuffering $buffer; private function __construct() { diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php index eafeb65be9..9acf37d457 100644 --- a/libraries/classes/Scripts.php +++ b/libraries/classes/Scripts.php @@ -24,13 +24,10 @@ class Scripts private $files; /** * A string of discrete javascript code snippets - * - * @var string */ - private $code; + private string $code; - /** @var Template */ - private $template; + private Template $template; /** * Generates new Scripts objects diff --git a/libraries/classes/Server/Plugin.php b/libraries/classes/Server/Plugin.php index de96413a76..b40fbaeed4 100644 --- a/libraries/classes/Server/Plugin.php +++ b/libraries/classes/Server/Plugin.php @@ -12,44 +12,31 @@ namespace PhpMyAdmin\Server; */ final class Plugin { - /** @var string */ - private $name; + private string $name; - /** @var string|null */ - private $version; + private ?string $version; - /** @var string */ - private $status; + private string $status; - /** @var string */ - private $type; + private string $type; - /** @var string|null */ - private $typeVersion; + private ?string $typeVersion; - /** @var string|null */ - private $library; + private ?string $library; - /** @var string|null */ - private $libraryVersion; + private ?string $libraryVersion; - /** @var string|null */ - private $author; + private ?string $author; - /** @var string|null */ - private $description; + private ?string $description; - /** @var string */ - private $license; + private string $license; - /** @var string|null */ - private $loadOption; + private ?string $loadOption; - /** @var string|null */ - private $maturity; + private ?string $maturity; - /** @var string|null */ - private $authVersion; + private ?string $authVersion; /** * @param string $name Name of the plugin diff --git a/libraries/classes/Server/Plugins.php b/libraries/classes/Server/Plugins.php index 920e177d8a..7651668dda 100644 --- a/libraries/classes/Server/Plugins.php +++ b/libraries/classes/Server/Plugins.php @@ -10,8 +10,7 @@ use function __; class Plugins { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param DatabaseInterface $dbi DatabaseInterface instance diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 204c664383..a3a81daba7 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -63,8 +63,7 @@ class Privileges /** @var Template */ public $template; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; /** @var DatabaseInterface */ public $dbi; @@ -72,8 +71,7 @@ class Privileges /** @var Relation */ public $relation; - /** @var Plugins */ - private $plugins; + private Plugins $plugins; /** * @param Template $template Template object diff --git a/libraries/classes/Server/Privileges/AccountLocking.php b/libraries/classes/Server/Privileges/AccountLocking.php index f6f307faba..d366af7725 100644 --- a/libraries/classes/Server/Privileges/AccountLocking.php +++ b/libraries/classes/Server/Privileges/AccountLocking.php @@ -13,8 +13,7 @@ use function sprintf; final class AccountLocking { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php index e0d7fd1d31..3242097984 100644 --- a/libraries/classes/Server/Status/Data.php +++ b/libraries/classes/Server/Status/Data.php @@ -58,11 +58,9 @@ class Data /** @var bool */ public $dataLoaded; - /** @var ReplicationInfo */ - private $replicationInfo; + private ReplicationInfo $replicationInfo; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function getReplicationInfo(): ReplicationInfo { diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php index 55e476a83c..6384b8b4ee 100644 --- a/libraries/classes/Server/Status/Processes.php +++ b/libraries/classes/Server/Status/Processes.php @@ -17,8 +17,7 @@ use function ucfirst; final class Processes { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index ee4fb08385..06ac6958cd 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -45,23 +45,17 @@ use function ucwords; */ class Sql { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var RelationCleanup */ - private $relationCleanup; + private RelationCleanup $relationCleanup; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; - /** @var Operations */ - private $operations; + private Operations $operations; - /** @var Template */ - private $template; + private Template $template; public function __construct( DatabaseInterface $dbi, diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php index b4055a99aa..43dee6fbc1 100644 --- a/libraries/classes/SqlQueryForm.php +++ b/libraries/classes/SqlQueryForm.php @@ -28,11 +28,9 @@ use function strlen; */ class SqlQueryForm { - /** @var Template */ - private $template; + private Template $template; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; /** * @param Template $template Template object diff --git a/libraries/classes/SystemDatabase.php b/libraries/classes/SystemDatabase.php index 5adefbcb9a..1235359fc4 100644 --- a/libraries/classes/SystemDatabase.php +++ b/libraries/classes/SystemDatabase.php @@ -12,11 +12,9 @@ use function sprintf; class SystemDatabase { - /** @var DatabaseInterface */ - protected $dbi; + protected DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; /** * Get instance of SystemDatabase diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index ac4ad43336..041409daae 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -95,11 +95,9 @@ class Table implements Stringable /** @var string database name */ protected $dbName = ''; - /** @var DatabaseInterface */ - protected $dbi; + protected DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; /** * @param string $tableName table name diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php index eaee803aa5..07143359f4 100644 --- a/libraries/classes/Table/ColumnsDefinition.php +++ b/libraries/classes/Table/ColumnsDefinition.php @@ -36,14 +36,11 @@ use function trim; */ final class ColumnsDefinition { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; - /** @var Relation */ - private $relation; + private Relation $relation; - /** @var Transformations */ - private $transformations; + private Transformations $transformations; public function __construct(DatabaseInterface $dbi, Relation $relation, Transformations $transformations) { diff --git a/libraries/classes/Table/Indexes.php b/libraries/classes/Table/Indexes.php index 50e8cb389e..f91091dd02 100644 --- a/libraries/classes/Table/Indexes.php +++ b/libraries/classes/Table/Indexes.php @@ -21,14 +21,11 @@ use function __; final class Indexes { - /** @var ResponseRenderer */ - protected $response; + protected ResponseRenderer $response; - /** @var Template */ - protected $template; + protected Template $template; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi) { diff --git a/libraries/classes/Table/Maintenance.php b/libraries/classes/Table/Maintenance.php index 97c3423e91..74a5e1c9f4 100644 --- a/libraries/classes/Table/Maintenance.php +++ b/libraries/classes/Table/Maintenance.php @@ -18,8 +18,7 @@ use function sprintf; final class Maintenance { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/Table/Search.php b/libraries/classes/Table/Search.php index 042509e9cc..36eaaf191d 100644 --- a/libraries/classes/Table/Search.php +++ b/libraries/classes/Table/Search.php @@ -23,8 +23,7 @@ use function trim; final class Search { - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index 4648e6c512..b2e58b2097 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -33,10 +33,10 @@ class ThemeManager private static $instance; /** @var string file-system path to the theme folder */ - private $themesPath; + private string $themesPath; /** @var string path to theme folder as an URL */ - private $themesPathUrl; + private string $themesPathUrl; /** @var array available themes */ public $themes = []; diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index 1ffc76e6b6..72cedbc40e 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -36,17 +36,13 @@ use const SORT_ASC; */ class Tracking { - /** @var SqlQueryForm */ - private $sqlQueryForm; + private SqlQueryForm $sqlQueryForm; - /** @var Template */ - public $template; + public Template $template; - /** @var Relation */ - protected $relation; + protected Relation $relation; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( SqlQueryForm $sqlQueryForm, diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php index f449f3057c..940fe3d2fa 100644 --- a/libraries/classes/TwoFactor.php +++ b/libraries/classes/TwoFactor.php @@ -39,17 +39,14 @@ class TwoFactor */ public $config; - /** @var bool */ - protected $writable; + protected bool $writable; /** @var TwoFactorPlugin */ protected $backend; - /** @var array */ - protected $available; + protected array $available; - /** @var UserPreferences */ - private $userPreferences; + private UserPreferences $userPreferences; /** * Creates new TwoFactor object diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php index 8ced74ac7f..d89ac44fb3 100644 --- a/libraries/classes/UserPassword.php +++ b/libraries/classes/UserPassword.php @@ -17,14 +17,11 @@ use function strlen; */ class UserPassword { - /** @var Privileges */ - private $serverPrivileges; + private Privileges $serverPrivileges; - /** @var AuthenticationPluginFactory */ - private $authPluginFactory; + private AuthenticationPluginFactory $authPluginFactory; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct( Privileges $serverPrivileges, diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index 1d659507ba..d727b67e08 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -31,14 +31,12 @@ use function urlencode; */ class UserPreferences { - /** @var Relation */ - private $relation; + private Relation $relation; /** @var Template */ public $template; - /** @var DatabaseInterface */ - private $dbi; + private DatabaseInterface $dbi; public function __construct(DatabaseInterface $dbi) { diff --git a/libraries/classes/WebAuthn/WebauthnLibServer.php b/libraries/classes/WebAuthn/WebauthnLibServer.php index 410a7f2c0c..2fbe424499 100644 --- a/libraries/classes/WebAuthn/WebauthnLibServer.php +++ b/libraries/classes/WebAuthn/WebauthnLibServer.php @@ -29,8 +29,7 @@ use const SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING; final class WebauthnLibServer implements Server { - /** @var TwoFactor */ - private $twofactor; + private TwoFactor $twofactor; public function __construct(TwoFactor $twofactor) { @@ -203,8 +202,7 @@ final class WebauthnLibServer implements Server private function createPublicKeyCredentialSourceRepository(): PublicKeyCredentialSourceRepository { return new class ($this->twofactor) implements PublicKeyCredentialSourceRepository { - /** @var TwoFactor */ - private $twoFactor; + private TwoFactor $twoFactor; public function __construct(TwoFactor $twoFactor) { diff --git a/libraries/classes/ZipExtension.php b/libraries/classes/ZipExtension.php index 474001813d..0e6866695b 100644 --- a/libraries/classes/ZipExtension.php +++ b/libraries/classes/ZipExtension.php @@ -32,8 +32,7 @@ use function substr; */ class ZipExtension { - /** @var ZipArchive|null */ - private $zip; + private ?ZipArchive $zip; public function __construct(?ZipArchive $zip = null) {