From 6283caaabff0ba94193c06d7adb65eeed1cbde5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 20 Jan 2020 16:04:09 -0300 Subject: [PATCH] Use one line for comments with a single line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Bookmark.php | 4 +- libraries/classes/BrowseForeigners.php | 4 +- libraries/classes/CentralColumns.php | 8 +-- libraries/classes/Charsets.php | 8 +-- libraries/classes/CheckUserPrivileges.php | 4 +- libraries/classes/Config.php | 36 ++++--------- libraries/classes/Config/FormDisplay.php | 4 +- .../classes/Config/FormDisplayTemplate.php | 12 ++--- .../classes/Config/Forms/BaseFormList.php | 8 +-- .../Config/Forms/Page/PageFormList.php | 8 +-- .../Config/Forms/Setup/SetupFormList.php | 8 +-- .../Config/Forms/User/UserFormList.php | 8 +-- libraries/classes/Config/PageSettings.php | 4 +- .../classes/Config/ServerConfigChecks.php | 4 +- libraries/classes/Console.php | 8 +-- .../Controllers/AbstractController.php | 12 ++--- .../classes/Controllers/AjaxController.php | 4 +- .../BrowseForeignersController.php | 8 +-- .../Database/AbstractController.php | 4 +- .../Database/CentralColumnsController.php | 4 +- .../Database/DataDictionaryController.php | 8 +-- .../Database/StructureController.php | 32 +++--------- .../classes/Controllers/HomeController.php | 8 +-- .../Server/CollationsController.php | 8 +-- .../Server/DatabasesController.php | 24 +++------ .../Controllers/Server/PluginsController.php | 4 +- .../Server/Status/AbstractController.php | 4 +- .../Server/Status/AdvisorController.php | 4 +- .../Server/Status/MonitorController.php | 4 +- .../Controllers/Setup/AbstractController.php | 8 +-- .../Controllers/Table/AbstractController.php | 8 +-- .../Table/FindReplaceController.php | 12 ++--- .../Table/GisVisualizationController.php | 4 +- .../Controllers/Table/RelationController.php | 4 +- .../Controllers/Table/SearchController.php | 4 +- .../Controllers/Table/StructureController.php | 20 ++----- .../TransformationOverviewController.php | 4 +- .../Controllers/UserPasswordController.php | 4 +- libraries/classes/CreateAddField.php | 4 +- libraries/classes/Database/Designer.php | 12 ++--- .../classes/Database/Designer/Common.php | 8 +-- .../classes/Database/MultiTableQuery.php | 4 +- libraries/classes/Database/Qbe.php | 12 ++--- libraries/classes/Database/Search.php | 8 +-- libraries/classes/DatabaseInterface.php | 44 ++++------------ libraries/classes/Dbal/DbiMysqli.php | 4 +- libraries/classes/Display/Export.php | 8 +-- libraries/classes/Display/GitRevision.php | 12 ++--- libraries/classes/Display/Results.php | 12 ++--- libraries/classes/ErrorReport.php | 12 ++--- libraries/classes/Export.php | 4 +- libraries/classes/File.php | 24 +++------ libraries/classes/Footer.php | 8 +-- libraries/classes/Gis/GisVisualization.php | 12 ++--- libraries/classes/Header.php | 8 +-- libraries/classes/Index.php | 16 ++---- libraries/classes/IndexColumn.php | 8 +-- libraries/classes/InsertEdit.php | 16 ++---- libraries/classes/InternalRelations.php | 8 +-- libraries/classes/LanguageManager.php | 4 +- libraries/classes/ListAbstract.php | 4 +- libraries/classes/Menu.php | 4 +- libraries/classes/MultSubmits.php | 12 ++--- libraries/classes/Navigation/Navigation.php | 16 ++---- .../classes/Navigation/NavigationTree.php | 12 ++--- libraries/classes/Navigation/Nodes/Node.php | 28 +++------- libraries/classes/Normalization.php | 12 ++--- libraries/classes/Operations.php | 8 +-- libraries/classes/OutputBuffering.php | 4 +- libraries/classes/Partition.php | 8 +-- .../classes/Plugins/AuthenticationPlugin.php | 8 +-- .../classes/Plugins/Export/Helpers/Pdf.php | 8 +-- libraries/classes/Plugins/ExportPlugin.php | 12 ++--- .../classes/Plugins/Import/ImportShp.php | 4 +- libraries/classes/Plugins/ImportPlugin.php | 4 +- .../Plugins/Schema/Dia/DiaRelationSchema.php | 4 +- .../Plugins/Schema/Eps/EpsRelationSchema.php | 4 +- .../Plugins/Schema/ExportRelationSchema.php | 4 +- libraries/classes/Plugins/Schema/Pdf/Pdf.php | 4 +- .../Plugins/Schema/Pdf/PdfRelationSchema.php | 12 ++--- .../Plugins/Schema/Svg/SvgRelationSchema.php | 4 +- .../classes/Plugins/Schema/TableStats.php | 8 +-- .../classes/Plugins/TwoFactor/Application.php | 4 +- .../classes/Plugins/TwoFactor/Invalid.php | 4 +- libraries/classes/Plugins/TwoFactor/Key.php | 4 +- .../classes/Plugins/TwoFactor/Simple.php | 4 +- libraries/classes/Plugins/TwoFactorPlugin.php | 20 ++----- libraries/classes/RecentFavoriteTable.php | 4 +- libraries/classes/Relation.php | 8 +-- libraries/classes/RelationCleanup.php | 8 +-- libraries/classes/ReplicationGui.php | 8 +-- libraries/classes/Rte/Events.php | 24 +++------ libraries/classes/Rte/Export.php | 8 +-- libraries/classes/Rte/Footer.php | 8 +-- libraries/classes/Rte/General.php | 4 +- libraries/classes/Rte/Routines.php | 24 +++------ libraries/classes/Rte/RteList.php | 12 ++--- libraries/classes/Rte/Triggers.php | 24 +++------ libraries/classes/SavedSearches.php | 4 +- libraries/classes/Scripts.php | 4 +- libraries/classes/Server/Plugin.php | 52 +++++-------------- libraries/classes/Server/Plugins.php | 4 +- libraries/classes/Server/Privileges.php | 16 ++---- libraries/classes/Server/Status/Monitor.php | 4 +- libraries/classes/Sql.php | 20 ++----- libraries/classes/SqlQueryForm.php | 4 +- libraries/classes/StorageEngine.php | 16 ++---- libraries/classes/SubPartition.php | 40 ++++---------- libraries/classes/SystemDatabase.php | 8 +-- libraries/classes/Table.php | 36 ++++--------- libraries/classes/Theme.php | 4 +- libraries/classes/ThemeManager.php | 24 +++------ libraries/classes/Tracking.php | 12 ++--- libraries/classes/TwoFactor.php | 24 +++------ libraries/classes/Types.php | 4 +- libraries/classes/UserPassword.php | 4 +- libraries/classes/UserPreferences.php | 8 +-- libraries/classes/ZipExtension.php | 4 +- test/classes/CheckUserPrivilegesTest.php | 4 +- .../Config/FormDisplayTemplateTest.php | 8 +-- test/classes/Config/FormDisplayTest.php | 4 +- test/classes/Config/FormTest.php | 4 +- .../classes/Config/ServerConfigChecksTest.php | 4 +- test/classes/ConfigTest.php | 8 +-- .../Database/StructureControllerTest.php | 16 ++---- .../Server/Status/MonitorControllerTest.php | 4 +- .../Server/Status/ProcessesControllerTest.php | 4 +- .../Server/Status/QueriesControllerTest.php | 4 +- .../Server/Status/VariablesControllerTest.php | 4 +- .../Table/RelationControllerTest.php | 8 +-- .../Table/SearchControllerTest.php | 8 +-- .../Table/StructureControllerTest.php | 8 +-- test/classes/CreateAddFieldTest.php | 4 +- test/classes/Database/Designer/CommonTest.php | 4 +- test/classes/Database/DesignerTest.php | 4 +- test/classes/Database/QbeTest.php | 4 +- test/classes/Database/SearchTest.php | 4 +- test/classes/DatabaseInterfaceTest.php | 4 +- test/classes/Dbal/DbiMysqliTest.php | 4 +- test/classes/Display/ResultsTest.php | 4 +- test/classes/Engines/BdbTest.php | 4 +- test/classes/Engines/BinlogTest.php | 4 +- test/classes/Engines/InnodbTest.php | 4 +- test/classes/Engines/MemoryTest.php | 4 +- test/classes/Engines/MrgMyisamTest.php | 4 +- test/classes/Engines/MyisamTest.php | 4 +- test/classes/Engines/NdbclusterTest.php | 4 +- test/classes/Engines/PbxtTest.php | 4 +- test/classes/ErrorHandlerTest.php | 4 +- test/classes/ErrorReportTest.php | 4 +- test/classes/ExportTest.php | 4 +- test/classes/FileListingTest.php | 4 +- test/classes/FontTest.php | 4 +- test/classes/FooterTest.php | 8 +-- test/classes/GetCheckboxTest.php | 4 +- .../classes/Gis/GisGeometryCollectionTest.php | 4 +- test/classes/Gis/GisGeometryTest.php | 4 +- test/classes/ImportTest.php | 4 +- test/classes/IpAllowDenyTest.php | 4 +- test/classes/LanguageTest.php | 4 +- test/classes/Navigation/NavigationTest.php | 4 +- .../classes/Navigation/NavigationTreeTest.php | 4 +- test/classes/OperationsTest.php | 4 +- .../Plugins/Auth/AuthenticationCookieTest.php | 4 +- .../Plugins/Auth/AuthenticationHttpTest.php | 4 +- .../Plugins/Export/ExportCodegenTest.php | 4 +- test/classes/Plugins/Import/ImportLdiTest.php | 4 +- .../Plugins/Import/ImportMediawikiTest.php | 4 +- test/classes/Plugins/Import/ImportOdsTest.php | 4 +- test/classes/Plugins/Import/ImportSqlTest.php | 4 +- test/classes/Plugins/Import/ImportXmlTest.php | 4 +- .../Plugins/Schema/DiaRelationSchemaTest.php | 4 +- .../Plugins/Schema/EpsRelationSchemaTest.php | 4 +- .../Schema/ExportRelationSchemaTest.php | 4 +- .../Plugins/Schema/PdfRelationSchemaTest.php | 4 +- .../Plugins/Schema/SvgRelationSchemaTest.php | 4 +- test/classes/PmaTestCase.php | 8 +-- test/classes/RelationCleanupTest.php | 8 +-- test/classes/RelationTest.php | 4 +- test/classes/Rte/EventsTest.php | 4 +- test/classes/Rte/RoutinesTest.php | 4 +- test/classes/Rte/TriggersTest.php | 4 +- test/classes/ScriptsTest.php | 4 +- test/classes/Server/PluginsTest.php | 4 +- test/classes/Server/PrivilegesTest.php | 4 +- test/classes/SqlQueryFormTest.php | 4 +- test/classes/SqlTest.php | 4 +- test/classes/StorageEngineTest.php | 4 +- test/classes/Stubs/DbiDummy.php | 4 +- test/classes/TemplateTest.php | 4 +- test/classes/ThemeTest.php | 8 +-- test/classes/TrackingTest.php | 4 +- test/classes/TransformationsTest.php | 4 +- test/classes/TypesTest.php | 4 +- test/classes/UserPreferencesTest.php | 4 +- test/classes/Utils/HttpRequestTest.php | 4 +- test/classes/ZipExtensionTest.php | 4 +- test/selenium/TestBase.php | 4 +- 198 files changed, 396 insertions(+), 1188 deletions(-) diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index 2cf1df51c2..c8ce18a575 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -46,9 +46,7 @@ class Bookmark */ private $_query; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index 7b2f82c446..155c90ccf8 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -26,9 +26,7 @@ class BrowseForeigners /** @var string */ private $themeImage; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php index 755323f180..1540c7073e 100644 --- a/libraries/classes/CentralColumns.php +++ b/libraries/classes/CentralColumns.php @@ -55,14 +55,10 @@ class CentralColumns */ private $disableIs; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php index 706981aefe..e2af7b3123 100644 --- a/libraries/classes/Charsets.php +++ b/libraries/classes/Charsets.php @@ -56,14 +56,10 @@ class Charsets */ private static $serverCharset = null; - /** - * @var array - */ + /** @var array */ private static $charsets = []; - /** - * @var array> - */ + /** @var array> */ private static $collations = []; /** diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php index be9e502877..16654e9081 100644 --- a/libraries/classes/CheckUserPrivileges.php +++ b/libraries/classes/CheckUserPrivileges.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Util; */ class CheckUserPrivileges { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index a848282dff..539f76207a 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -24,51 +24,33 @@ use PhpMyAdmin\Utils\HttpRequest; */ class Config { - /** - * @var string default config source - */ + /** @var string default config source */ public $default_source = ROOT_PATH . 'libraries/config.default.php'; - /** - * @var array default configuration settings - */ + /** @var array default configuration settings */ public $default = []; - /** - * @var array configuration settings, without user preferences applied - */ + /** @var array configuration settings, without user preferences applied */ public $base_settings = []; - /** - * @var array configuration settings - */ + /** @var array configuration settings */ public $settings = []; - /** - * @var string config source - */ + /** @var string config source */ public $source = ''; - /** - * @var int source modification time - */ + /** @var int source modification time */ public $source_mtime = 0; public $default_source_mtime = 0; public $set_mtime = 0; - /** - * @var boolean - */ + /** @var boolean */ public $error_config_file = false; - /** - * @var boolean - */ + /** @var boolean */ public $error_config_default_file = false; - /** - * @var array - */ + /** @var array */ public $default_server = []; /** diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index b77f141158..bba5b663c3 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -94,9 +94,7 @@ class FormDisplay */ private $_userprefsDisallow; - /** - * @var FormDisplayTemplate - */ + /** @var FormDisplayTemplate */ private $formDisplayTemplate; /** diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index b3e579f3d9..d6cfd2e414 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -20,19 +20,13 @@ use PhpMyAdmin\Template; */ class FormDisplayTemplate { - /** - * @var int - */ + /** @var int */ public $group; - /** - * @var Config - */ + /** @var Config */ protected $config; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Config/Forms/BaseFormList.php b/libraries/classes/Config/Forms/BaseFormList.php index 202f86fa16..e66a28e29b 100644 --- a/libraries/classes/Config/Forms/BaseFormList.php +++ b/libraries/classes/Config/Forms/BaseFormList.php @@ -20,14 +20,10 @@ class BaseFormList */ protected static $all = []; - /** - * @var string - */ + /** @var string */ protected static $ns = 'PhpMyAdmin\\Config\\Forms\\'; - /** - * @var array - */ + /** @var array */ private $_forms; /** diff --git a/libraries/classes/Config/Forms/Page/PageFormList.php b/libraries/classes/Config/Forms/Page/PageFormList.php index a06851a96d..f81151896e 100644 --- a/libraries/classes/Config/Forms/Page/PageFormList.php +++ b/libraries/classes/Config/Forms/Page/PageFormList.php @@ -15,9 +15,7 @@ use PhpMyAdmin\Config\Forms\BaseFormList; */ class PageFormList extends BaseFormList { - /** - * @var array - */ + /** @var array */ protected static $all = [ 'Browse', 'DbStructure', @@ -28,8 +26,6 @@ class PageFormList extends BaseFormList 'Sql', 'TableStructure', ]; - /** - * @var string - */ + /** @var string */ protected static $ns = '\\PhpMyAdmin\\Config\\Forms\\Page\\'; } diff --git a/libraries/classes/Config/Forms/Setup/SetupFormList.php b/libraries/classes/Config/Forms/Setup/SetupFormList.php index 86d83047da..6c3b3f71e3 100644 --- a/libraries/classes/Config/Forms/Setup/SetupFormList.php +++ b/libraries/classes/Config/Forms/Setup/SetupFormList.php @@ -15,9 +15,7 @@ use PhpMyAdmin\Config\Forms\BaseFormList; */ class SetupFormList extends BaseFormList { - /** - * @var array - */ + /** @var array */ protected static $all = [ 'Config', 'Export', @@ -28,8 +26,6 @@ class SetupFormList extends BaseFormList 'Servers', 'Sql', ]; - /** - * @var string - */ + /** @var string */ protected static $ns = '\\PhpMyAdmin\\Config\\Forms\\Setup\\'; } diff --git a/libraries/classes/Config/Forms/User/UserFormList.php b/libraries/classes/Config/Forms/User/UserFormList.php index 66f087e544..156559fe1e 100644 --- a/libraries/classes/Config/Forms/User/UserFormList.php +++ b/libraries/classes/Config/Forms/User/UserFormList.php @@ -15,9 +15,7 @@ use PhpMyAdmin\Config\Forms\BaseFormList; */ class UserFormList extends BaseFormList { - /** - * @var array - */ + /** @var array */ protected static $all = [ 'Features', 'Sql', @@ -26,8 +24,6 @@ class UserFormList extends BaseFormList 'Export', 'Import', ]; - /** - * @var string - */ + /** @var string */ protected static $ns = '\\PhpMyAdmin\\Config\\Forms\\User\\'; } diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php index 3466f88aab..7935310d9e 100644 --- a/libraries/classes/Config/PageSettings.php +++ b/libraries/classes/Config/PageSettings.php @@ -51,9 +51,7 @@ class PageSettings */ private $_HTML = ''; - /** - * @var UserPreferences - */ + /** @var UserPreferences */ private $userPreferences; /** diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php index dc8a761569..e82e848fc1 100644 --- a/libraries/classes/Config/ServerConfigChecks.php +++ b/libraries/classes/Config/ServerConfigChecks.php @@ -26,9 +26,7 @@ use PhpMyAdmin\Util; */ class ServerConfigChecks { - /** - * @var ConfigFile configurations being checked - */ + /** @var ConfigFile configurations being checked */ protected $cfg; /** diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index 9692154609..c01d7546cf 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -35,14 +35,10 @@ class Console */ private $_isAjax; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Controllers/AbstractController.php b/libraries/classes/Controllers/AbstractController.php index 15ca9a325a..0b4221f010 100644 --- a/libraries/classes/Controllers/AbstractController.php +++ b/libraries/classes/Controllers/AbstractController.php @@ -19,19 +19,13 @@ use PhpMyAdmin\Template; */ abstract class AbstractController { - /** - * @var Response - */ + /** @var Response */ protected $response; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ protected $dbi; - /** - * @var Template - */ + /** @var Template */ protected $template; /** diff --git a/libraries/classes/Controllers/AjaxController.php b/libraries/classes/Controllers/AjaxController.php index 8304dd29ac..d10a54296f 100644 --- a/libraries/classes/Controllers/AjaxController.php +++ b/libraries/classes/Controllers/AjaxController.php @@ -21,9 +21,7 @@ use PhpMyAdmin\Template; */ class AjaxController extends AbstractController { - /** - * @var Config - */ + /** @var Config */ private $config; /** diff --git a/libraries/classes/Controllers/BrowseForeignersController.php b/libraries/classes/Controllers/BrowseForeignersController.php index 97312f86fd..8112f37323 100644 --- a/libraries/classes/Controllers/BrowseForeignersController.php +++ b/libraries/classes/Controllers/BrowseForeignersController.php @@ -21,14 +21,10 @@ use PhpMyAdmin\Template; */ class BrowseForeignersController extends AbstractController { - /** - * @var BrowseForeigners - */ + /** @var BrowseForeigners */ private $browseForeigners; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Controllers/Database/AbstractController.php b/libraries/classes/Controllers/Database/AbstractController.php index 49ec289726..b2b5f982bd 100644 --- a/libraries/classes/Controllers/Database/AbstractController.php +++ b/libraries/classes/Controllers/Database/AbstractController.php @@ -20,9 +20,7 @@ use PhpMyAdmin\Template; */ abstract class AbstractController extends Controller { - /** - * @var string - */ + /** @var string */ protected $db; /** diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 1c13096699..6381069958 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -20,9 +20,7 @@ use PhpMyAdmin\Template; */ class CentralColumnsController extends AbstractController { - /** - * @var CentralColumns - */ + /** @var CentralColumns */ private $centralColumns; /** diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index a634b839f3..f48e3e4275 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -21,14 +21,10 @@ use PhpMyAdmin\Util; */ class DataDictionaryController extends AbstractController { - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; /** diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index a95e76cbfd..aa3016c739 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -34,44 +34,28 @@ use PhpMyAdmin\Util; */ class StructureController extends AbstractController { - /** - * @var int Number of tables - */ + /** @var int Number of tables */ protected $numTables; - /** - * @var int Current position in the list - */ + /** @var int Current position in the list */ protected $position; - /** - * @var bool DB is information_schema - */ + /** @var bool DB is information_schema */ protected $dbIsSystemSchema; - /** - * @var int Number of tables - */ + /** @var int Number of tables */ protected $totalNumTables; - /** - * @var array Tables in the database - */ + /** @var array Tables in the database */ protected $tables; - /** - * @var bool whether stats show or not - */ + /** @var bool whether stats show or not */ protected $isShowStats; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Replication - */ + /** @var Replication */ private $replication; /** diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index a42da3009f..fa4d8aada7 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -34,14 +34,10 @@ use PhpMyAdmin\Util; */ class HomeController extends AbstractController { - /** - * @var Config - */ + /** @var Config */ private $config; - /** - * @var ThemeManager - */ + /** @var ThemeManager */ private $themeManager; /** diff --git a/libraries/classes/Controllers/Server/CollationsController.php b/libraries/classes/Controllers/Server/CollationsController.php index 2c43a84ccd..6e217302ea 100644 --- a/libraries/classes/Controllers/Server/CollationsController.php +++ b/libraries/classes/Controllers/Server/CollationsController.php @@ -24,14 +24,10 @@ use PhpMyAdmin\Template; */ class CollationsController extends AbstractController { - /** - * @var array|null - */ + /** @var array|null */ private $charsets; - /** - * @var array|null - */ + /** @var array|null */ private $collations; /** diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index 9a06142256..6270558de7 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -30,34 +30,22 @@ use PhpMyAdmin\Util; */ class DatabasesController extends AbstractController { - /** - * @var array array of database details - */ + /** @var array array of database details */ private $databases = []; - /** - * @var int number of databases - */ + /** @var int number of databases */ private $databaseCount = 0; - /** - * @var string sort by column - */ + /** @var string sort by column */ private $sortBy; - /** - * @var string sort order of databases - */ + /** @var string sort order of databases */ private $sortOrder; - /** - * @var boolean whether to show database statistics - */ + /** @var boolean whether to show database statistics */ private $hasStatistics; - /** - * @var int position in list navigation - */ + /** @var int position in list navigation */ private $position; /** diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index 89f75a19a9..7547f73724 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -23,9 +23,7 @@ use PhpMyAdmin\Template; */ class PluginsController extends AbstractController { - /** - * @var Plugins - */ + /** @var Plugins */ private $plugins; /** diff --git a/libraries/classes/Controllers/Server/Status/AbstractController.php b/libraries/classes/Controllers/Server/Status/AbstractController.php index 1807705acd..c9aa90d356 100644 --- a/libraries/classes/Controllers/Server/Status/AbstractController.php +++ b/libraries/classes/Controllers/Server/Status/AbstractController.php @@ -21,9 +21,7 @@ use PhpMyAdmin\Template; */ abstract class AbstractController extends Controller { - /** - * @var Data - */ + /** @var Data */ protected $data; /** diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php index 2ae2edd596..732d113d9f 100644 --- a/libraries/classes/Controllers/Server/Status/AdvisorController.php +++ b/libraries/classes/Controllers/Server/Status/AdvisorController.php @@ -21,9 +21,7 @@ use PhpMyAdmin\Template; */ class AdvisorController extends AbstractController { - /** - * @var Advisor - */ + /** @var Advisor */ private $advisor; /** diff --git a/libraries/classes/Controllers/Server/Status/MonitorController.php b/libraries/classes/Controllers/Server/Status/MonitorController.php index 2687d9b514..216a3bc232 100644 --- a/libraries/classes/Controllers/Server/Status/MonitorController.php +++ b/libraries/classes/Controllers/Server/Status/MonitorController.php @@ -21,9 +21,7 @@ use PhpMyAdmin\Template; */ class MonitorController extends AbstractController { - /** - * @var Monitor - */ + /** @var Monitor */ private $monitor; /** diff --git a/libraries/classes/Controllers/Setup/AbstractController.php b/libraries/classes/Controllers/Setup/AbstractController.php index d7db6649ce..1d2e40b311 100644 --- a/libraries/classes/Controllers/Setup/AbstractController.php +++ b/libraries/classes/Controllers/Setup/AbstractController.php @@ -18,14 +18,10 @@ use PhpMyAdmin\Template; */ abstract class AbstractController { - /** - * @var ConfigFile - */ + /** @var ConfigFile */ protected $config; - /** - * @var Template - */ + /** @var Template */ protected $template; /** diff --git a/libraries/classes/Controllers/Table/AbstractController.php b/libraries/classes/Controllers/Table/AbstractController.php index 1f231cc36b..b21f228e8e 100644 --- a/libraries/classes/Controllers/Table/AbstractController.php +++ b/libraries/classes/Controllers/Table/AbstractController.php @@ -20,14 +20,10 @@ use PhpMyAdmin\Template; */ abstract class AbstractController extends Controller { - /** - * @var string - */ + /** @var string */ protected $db; - /** - * @var string - */ + /** @var string */ protected $table; /** diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index b78fa177d2..a4d2409275 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -22,19 +22,13 @@ use PhpMyAdmin\Util; */ class FindReplaceController extends AbstractController { - /** - * @var array - */ + /** @var array */ private $_columnNames; - /** - * @var array - */ + /** @var array */ private $_columnTypes; - /** - * @var string - */ + /** @var string */ private $_connectionCharSet; /** diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index 48906689cd..5828971025 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -20,9 +20,7 @@ use PhpMyAdmin\Util; */ final class GisVisualizationController extends AbstractController { - /** - * @var GisVisualization - */ + /** @var GisVisualization */ protected $visualization; public function index(): void diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index cec6fc2595..86c0568136 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -26,9 +26,7 @@ use function mb_strtoupper; */ final class RelationController extends AbstractController { - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index 804909f732..56f8a2ed4c 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -72,9 +72,7 @@ class SearchController extends AbstractController /** @var Search */ private $search; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index 53cb82988c..2f62d486e2 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -45,29 +45,19 @@ use stdClass; */ class StructureController extends AbstractController { - /** - * @var Table The table object - */ + /** @var Table The table object */ protected $table_obj; - /** - * @var string The URL query string - */ + /** @var string The URL query string */ protected $_url_query; - /** - * @var CreateAddField - */ + /** @var CreateAddField */ private $createAddField; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; /** diff --git a/libraries/classes/Controllers/TransformationOverviewController.php b/libraries/classes/Controllers/TransformationOverviewController.php index 6558b127a1..e422de63a1 100644 --- a/libraries/classes/Controllers/TransformationOverviewController.php +++ b/libraries/classes/Controllers/TransformationOverviewController.php @@ -20,9 +20,7 @@ use PhpMyAdmin\Transformations; */ class TransformationOverviewController extends AbstractController { - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; /** diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index 0e030ee9a4..ee0ef38f8a 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -20,9 +20,7 @@ use PhpMyAdmin\UserPassword; */ class UserPasswordController extends AbstractController { - /** - * @var UserPassword - */ + /** @var UserPassword */ private $userPassword; /** diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 9a5ba8ee71..8871acc22b 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -17,9 +17,7 @@ use PhpMyAdmin\Html\Generator; */ class CreateAddField { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index a654956708..f889ffbd6c 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -25,19 +25,13 @@ use stdClass; */ class Designer { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index 4547753006..d5faf0339f 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -23,14 +23,10 @@ use function rawurlencode; */ class Common { - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Database/MultiTableQuery.php b/libraries/classes/Database/MultiTableQuery.php index 51959cd37f..21f79a9222 100644 --- a/libraries/classes/Database/MultiTableQuery.php +++ b/libraries/classes/Database/MultiTableQuery.php @@ -53,9 +53,7 @@ class MultiTableQuery */ private $tables; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index 39db5e3778..00908c637f 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -216,19 +216,13 @@ class Qbe */ private $_currentSearch = null; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ public $dbi; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php index 455fb7d84f..fcdf309a60 100644 --- a/libraries/classes/Database/Search.php +++ b/libraries/classes/Database/Search.php @@ -85,14 +85,10 @@ class Search */ private $criteriaColumnName; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 1a1af06078..96b68418fd 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -56,9 +56,7 @@ class DatabaseInterface implements DbalInterface */ public const CONNECT_AUXILIARY = 0x102; - /** - * @var DbiExtension - */ + /** @var DbiExtension */ private $_extension; /** @@ -68,50 +66,30 @@ class DatabaseInterface implements DbalInterface */ private $_links; - /** - * @var array Table data cache - */ + /** @var array Table data cache */ private $_table_cache; - /** - * @var array Current user and host cache - */ + /** @var array Current user and host cache */ private $_current_user; - /** - * @var null|string lower_case_table_names value cache - */ + /** @var null|string lower_case_table_names value cache */ private $_lower_case_table_names = null; - /** - * @var boolean Whether connection is MariaDB - */ + /** @var boolean Whether connection is MariaDB */ private $_is_mariadb = false; - /** - * @var boolean Whether connection is Percona - */ + /** @var boolean Whether connection is Percona */ private $_is_percona = false; - /** - * @var integer Server version as number - */ + /** @var integer Server version as number */ private $_version_int = 55000; - /** - * @var string Server version - */ + /** @var string Server version */ private $_version_str = '5.50.0'; - /** - * @var string Server version comment - */ + /** @var string Server version comment */ private $_version_comment = ''; - /** - * @var Types MySQL types data - */ + /** @var Types MySQL types data */ public $types; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index dbd55611df..c2c931016e 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -22,9 +22,7 @@ use function mysqli_init; */ class DbiMysqli implements DbiExtension { - /** - * @var array - */ + /** @var array */ private static $pma_mysqli_flag_names = [ MYSQLI_NUM_FLAG => 'num', MYSQLI_PART_KEY_FLAG => 'part_key', diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php index d258fa01b7..90f4c8e5db 100644 --- a/libraries/classes/Display/Export.php +++ b/libraries/classes/Display/Export.php @@ -33,14 +33,10 @@ use Twig_Error_Syntax; */ class Export { - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ public $template; public function __construct() diff --git a/libraries/classes/Display/GitRevision.php b/libraries/classes/Display/GitRevision.php index b9771da508..ab9b4c6a4b 100644 --- a/libraries/classes/Display/GitRevision.php +++ b/libraries/classes/Display/GitRevision.php @@ -21,19 +21,13 @@ use PhpMyAdmin\Util; */ class GitRevision { - /** - * @var Response - */ + /** @var Response */ private $response; - /** - * @var Config - */ + /** @var Config */ private $config; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 5a6d4a9194..9c32dc77f2 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -193,19 +193,13 @@ class Results */ public $transformation_info; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php index 022a75f56a..3cca37cce9 100644 --- a/libraries/classes/ErrorReport.php +++ b/libraries/classes/ErrorReport.php @@ -25,19 +25,13 @@ class ErrorReport */ private $submissionUrl = 'https://reports.phpmyadmin.net/incidents/create'; - /** - * @var HttpRequest - */ + /** @var HttpRequest */ private $httpRequest; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index 6104a8a7cb..8ed6e8a734 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -21,9 +21,7 @@ use PhpMyAdmin\Plugins\SchemaPlugin; */ class Export { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/File.php b/libraries/classes/File.php index ccf8304b05..ac4b4b2347 100644 --- a/libraries/classes/File.php +++ b/libraries/classes/File.php @@ -52,34 +52,22 @@ class File */ protected $_compression = null; - /** - * @var integer - */ + /** @var integer */ protected $_offset = 0; - /** - * @var integer size of chunk to read with every step - */ + /** @var integer size of chunk to read with every step */ protected $_chunk_size = 32768; - /** - * @var resource|null file handle - */ + /** @var resource|null file handle */ protected $_handle = null; - /** - * @var boolean whether to decompress content before returning - */ + /** @var boolean whether to decompress content before returning */ protected $_decompress = false; - /** - * @var string charset of file - */ + /** @var string charset of file */ protected $_charset = null; - /** - * @var ZipExtension - */ + /** @var ZipExtension */ private $zipExtension; /** diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index f8b285fbbc..dcd2196d4f 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -47,14 +47,10 @@ class Footer */ private $_isEnabled; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php index 717abae3af..7a46304f89 100644 --- a/libraries/classes/Gis/GisVisualization.php +++ b/libraries/classes/Gis/GisVisualization.php @@ -20,14 +20,10 @@ use TCPDF; */ class GisVisualization { - /** - * @var array Raw data for the visualization - */ + /** @var array Raw data for the visualization */ private $_data; private $_modified_sql; - /** - * @var array Set of default settings values are here. - */ + /** @var array Set of default settings values are here. */ private $_settings = [ // Array of colors to be used for GIS visualizations. 'colors' => [ @@ -54,9 +50,7 @@ class GisVisualization // The height of the GIS visualization. 'height' => 450, ]; - /** - * @var array Options that the user has specified. - */ + /** @var array Options that the user has specified. */ private $_userSpecifiedSettings = null; /** diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 7371b4ffc6..8c75ebf22c 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -105,14 +105,10 @@ class Header */ private $_headerIsSent; - /** - * @var UserPreferences - */ + /** @var UserPreferences */ private $userPreferences; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index 9f243306f5..adf82166c5 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -32,19 +32,13 @@ class Index */ private static $_registry = []; - /** - * @var string The name of the schema - */ + /** @var string The name of the schema */ private $_schema = ''; - /** - * @var string The name of the table - */ + /** @var string The name of the table */ private $_table = ''; - /** - * @var string The name of the index - */ + /** @var string The name of the index */ private $_name = ''; /** @@ -83,9 +77,7 @@ class Index */ private $_comment = ''; - /** - * @var integer 0 if the index cannot contain duplicates, 1 if it can. - */ + /** @var integer 0 if the index cannot contain duplicates, 1 if it can. */ private $_non_unique = 0; /** diff --git a/libraries/classes/IndexColumn.php b/libraries/classes/IndexColumn.php index 3ae7ac25da..3680800ec6 100644 --- a/libraries/classes/IndexColumn.php +++ b/libraries/classes/IndexColumn.php @@ -15,14 +15,10 @@ namespace PhpMyAdmin; */ class IndexColumn { - /** - * @var string The column name - */ + /** @var string The column name */ private $_name = ''; - /** - * @var integer The column sequence number in the index, starting with 1. - */ + /** @var integer The column sequence number in the index, starting with 1. */ private $_seq_in_index = 1; /** diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 0b63b1ea2a..552d2a92f9 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -26,24 +26,16 @@ class InsertEdit */ private $dbi; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; - /** - * @var FileListing - */ + /** @var FileListing */ private $fileListing; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/InternalRelations.php b/libraries/classes/InternalRelations.php index 7afc4a3519..097b745b79 100644 --- a/libraries/classes/InternalRelations.php +++ b/libraries/classes/InternalRelations.php @@ -15,9 +15,7 @@ namespace PhpMyAdmin; */ class InternalRelations { - /** - * @var array - */ + /** @var array */ private static $informationSchema = [ 'CHARACTER_SETS' => [ 'DEFAULT_COLLATE_NAME' => [ @@ -330,9 +328,7 @@ class InternalRelations ], ]; - /** - * @var array - */ + /** @var array */ private static $mysql = [ 'columns_priv' => [ 'Db' => [ diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php index 3bf324be6e..35b91ff3f8 100644 --- a/libraries/classes/LanguageManager.php +++ b/libraries/classes/LanguageManager.php @@ -671,9 +671,7 @@ class LanguageManager private $_lang_failed_cookie; private $_lang_failed_request; - /** - * @var LanguageManager - */ + /** @var LanguageManager */ private static $instance; /** diff --git a/libraries/classes/ListAbstract.php b/libraries/classes/ListAbstract.php index 4850a91c24..65e050d346 100644 --- a/libraries/classes/ListAbstract.php +++ b/libraries/classes/ListAbstract.php @@ -20,9 +20,7 @@ use ArrayObject; */ abstract class ListAbstract extends ArrayObject { - /** - * @var mixed empty item - */ + /** @var mixed empty item */ protected $item_empty = ''; /** diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index f002aa7590..faff74163c 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -30,9 +30,7 @@ class Menu */ private $_table; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** @var Template */ diff --git a/libraries/classes/MultSubmits.php b/libraries/classes/MultSubmits.php index 19cb7d9b19..942a1cd2b8 100644 --- a/libraries/classes/MultSubmits.php +++ b/libraries/classes/MultSubmits.php @@ -18,19 +18,13 @@ use PhpMyAdmin\Html\Forms\Fields\FKCheckbox; */ class MultSubmits { - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; - /** - * @var RelationCleanup - */ + /** @var RelationCleanup */ private $relationCleanup; - /** - * @var Operations - */ + /** @var Operations */ private $operations; public function __construct() diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index e7a07f79e2..477218830e 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -26,24 +26,16 @@ use PhpMyAdmin\Util; */ class Navigation { - /** - * @var Template - */ + /** @var Template */ private $template; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; - /** - * @var NavigationTree - */ + /** @var NavigationTree */ private $tree; /** diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index 7c623f7e68..7814cab68a 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -28,9 +28,7 @@ use PhpMyAdmin\Url; */ class NavigationTree { - /** - * @var Node Reference to the root node of the tree - */ + /** @var Node Reference to the root node of the tree */ private $tree; /** * @var array The actual paths to all expanded nodes in the tree @@ -89,14 +87,10 @@ class NavigationTree */ private $largeGroupWarning = false; - /** - * @var Template - */ + /** @var Template */ private $template; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index 4670d3b783..6797b0894e 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -38,9 +38,7 @@ class Node * This will never change after being assigned */ public $realName = ''; - /** - * @var int May be one of CONTAINER or OBJECT - */ + /** @var int May be one of CONTAINER or OBJECT */ public $type = self::OBJECT; /** * @var bool Whether this object has been created while grouping nodes @@ -72,26 +70,18 @@ class Node * Only relevant if the node is of type CONTAINER */ public $separatorDepth = 1; - /** - * @var string|array An IMG tag, used when rendering the node, an array for NodeTabl - */ + /** @var string|array An IMG tag, used when rendering the node, an array for NodeTabl */ public $icon; /** * @var array An array of A tags, used when rendering the node * The indexes in the array may be 'icon' and 'text' */ public $links; - /** - * @var string HTML title - */ + /** @var string HTML title */ public $title; - /** - * @var string Extra CSS classes for the node - */ + /** @var string Extra CSS classes for the node */ public $classes = ''; - /** - * @var bool Whether this node is a link for creating new objects - */ + /** @var bool Whether this node is a link for creating new objects */ public $isNew = false; /** * @var int The position for the pagination of @@ -104,14 +94,10 @@ class Node */ public $pos3 = 0; - /** - * @var Relation - */ + /** @var Relation */ protected $relation; - /** - * @var string $displayName display name for the navigation tree - */ + /** @var string $displayName display name for the navigation tree */ public $displayName; /** diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index b347e2158b..f578f384e3 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -26,19 +26,13 @@ class Normalization */ private $dbi; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index f7e9bba35f..12a1091668 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -24,14 +24,10 @@ use PhpMyAdmin\Plugins\Export\ExportSql; */ class Operations { - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/OutputBuffering.php b/libraries/classes/OutputBuffering.php index 49d412bc1e..46a17d478a 100644 --- a/libraries/classes/OutputBuffering.php +++ b/libraries/classes/OutputBuffering.php @@ -19,9 +19,7 @@ class OutputBuffering private $_mode; private $_content; - /** - * @var bool - */ + /** @var bool */ private $_on; /** diff --git a/libraries/classes/Partition.php b/libraries/classes/Partition.php index a41cdf2bad..599be8b2c5 100644 --- a/libraries/classes/Partition.php +++ b/libraries/classes/Partition.php @@ -17,13 +17,9 @@ use PhpMyAdmin\SubPartition; */ class Partition extends SubPartition { - /** - * @var string partition description - */ + /** @var string partition description */ protected $description; - /** - * @var SubPartition[] sub partitions - */ + /** @var SubPartition[] sub partitions */ protected $subPartitions = []; /** diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php index 8abd1ba29b..36268860f5 100644 --- a/libraries/classes/Plugins/AuthenticationPlugin.php +++ b/libraries/classes/Plugins/AuthenticationPlugin.php @@ -41,14 +41,10 @@ abstract class AuthenticationPlugin */ public $password = ''; - /** - * @var IpAllowDeny - */ + /** @var IpAllowDeny */ protected $ipAllowDeny; - /** - * @var Template - */ + /** @var Template */ public $template; public function __construct() diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index 13511b7aa8..f6b13dc854 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -47,14 +47,10 @@ class Pdf extends PdfLib private $currentTable; private $aliases; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; /** diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php index d916ea98c2..5cbbfc3256 100644 --- a/libraries/classes/Plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -31,19 +31,13 @@ abstract class ExportPlugin */ protected $properties; - /** - * @var Relation - */ + /** @var Relation */ public $relation; - /** - * @var Export - */ + /** @var Export */ protected $export; - /** - * @var Transformations - */ + /** @var Transformations */ protected $transformations; public function __construct() diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php index 8b13d61685..a9493cf3f5 100644 --- a/libraries/classes/Plugins/Import/ImportShp.php +++ b/libraries/classes/Plugins/Import/ImportShp.php @@ -29,9 +29,7 @@ use PhpMyAdmin\ZipExtension; */ class ImportShp extends ImportPlugin { - /** - * @var ZipExtension - */ + /** @var ZipExtension */ private $zipExtension; public function __construct() diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php index a5c59b74a1..bba135a8ef 100644 --- a/libraries/classes/Plugins/ImportPlugin.php +++ b/libraries/classes/Plugins/ImportPlugin.php @@ -26,9 +26,7 @@ abstract class ImportPlugin */ protected $properties; - /** - * @var Import - */ + /** @var Import */ protected $import; public function __construct() diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php index a5e5836b2f..0d26e6cec5 100644 --- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php @@ -31,9 +31,7 @@ use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; */ class DiaRelationSchema extends ExportRelationSchema { - /** - * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] - */ + /** @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] */ private $_tables = []; /** @var RelationStatsDia[] Relations */ private $_relations = []; diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php index b153fae6a8..557aff8d9a 100644 --- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php @@ -29,9 +29,7 @@ use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; */ class EpsRelationSchema extends ExportRelationSchema { - /** - * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] - */ + /** @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] */ private $_tables = []; /** @var RelationStatsEps[] Relations */ diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index 04f7751a25..cd5e96cd8a 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -34,9 +34,7 @@ class ExportRelationSchema protected $pageNumber; protected $offline; - /** - * @var Relation - */ + /** @var Relation */ protected $relation; /** diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php index 4040b36d2a..9e59c920be 100644 --- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php @@ -58,9 +58,7 @@ class Pdf extends PdfLib private $_withDoc; private $_db; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php index df51d40794..3467cb1730 100644 --- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php @@ -51,9 +51,7 @@ class PdfRelationSchema extends ExportRelationSchema private $_withDoc; private $_tableOrder; - /** - * @var TableStatsPdf[] - */ + /** @var TableStatsPdf[] */ private $_tables = []; private $_ff = PdfLib::PMA_PDF_FONT; private $_xMax = 0; @@ -67,14 +65,10 @@ class PdfRelationSchema extends ExportRelationSchema private $_rightMargin = 10; private $_tablewidth; - /** - * @var RelationStatsPdf[] - */ + /** @var RelationStatsPdf[] */ protected $relations = []; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; /** diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php index 54b1dfec3f..eda83d7c00 100644 --- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php +++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php @@ -32,9 +32,7 @@ use PhpMyAdmin\Plugins\Schema\Svg\TableStatsSvg; */ class SvgRelationSchema extends ExportRelationSchema { - /** - * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] - */ + /** @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[] */ private $_tables = []; /** @var RelationStatsSvg[] Relations */ private $_relations = []; diff --git a/libraries/classes/Plugins/Schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php index f4a5e57930..c11a491878 100644 --- a/libraries/classes/Plugins/Schema/TableStats.php +++ b/libraries/classes/Plugins/Schema/TableStats.php @@ -41,14 +41,10 @@ abstract class TableStats public $heightCell = 0; protected $offline; - /** - * @var Relation - */ + /** @var Relation */ protected $relation; - /** - * @var Font - */ + /** @var Font */ protected $font; /** diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index e5da1379c7..152a9d4b91 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -25,9 +25,7 @@ use PragmaRX\Google2FAQRCode\Google2FA; */ class Application extends TwoFactorPlugin { - /** - * @var string - */ + /** @var string */ public static $id = 'application'; protected $_google2fa; diff --git a/libraries/classes/Plugins/TwoFactor/Invalid.php b/libraries/classes/Plugins/TwoFactor/Invalid.php index 208da88b00..1006e88f0d 100644 --- a/libraries/classes/Plugins/TwoFactor/Invalid.php +++ b/libraries/classes/Plugins/TwoFactor/Invalid.php @@ -17,9 +17,7 @@ use PhpMyAdmin\Plugins\TwoFactorPlugin; */ class Invalid extends TwoFactorPlugin { - /** - * @var string - */ + /** @var string */ public static $id = 'invalid'; public static $showSubmit = false; diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php index af5370e285..d64c6920de 100644 --- a/libraries/classes/Plugins/TwoFactor/Key.php +++ b/libraries/classes/Plugins/TwoFactor/Key.php @@ -28,9 +28,7 @@ use Twig_Error_Syntax; */ class Key extends TwoFactorPlugin { - /** - * @var string - */ + /** @var string */ public static $id = 'key'; /** diff --git a/libraries/classes/Plugins/TwoFactor/Simple.php b/libraries/classes/Plugins/TwoFactor/Simple.php index 18919bf5b7..8c00a9ab11 100644 --- a/libraries/classes/Plugins/TwoFactor/Simple.php +++ b/libraries/classes/Plugins/TwoFactor/Simple.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Plugins\TwoFactorPlugin; */ class Simple extends TwoFactorPlugin { - /** - * @var string - */ + /** @var string */ public static $id = 'simple'; /** diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index cd86b3f3d3..cb6fff6265 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -25,9 +25,7 @@ use PhpMyAdmin\TwoFactor; */ class TwoFactorPlugin { - /** - * @var string - */ + /** @var string */ public static $id = ''; /** @@ -35,24 +33,16 @@ class TwoFactorPlugin */ public static $showSubmit = true; - /** - * @var TwoFactor - */ + /** @var TwoFactor */ protected $_twofactor; - /** - * @var boolean - */ + /** @var boolean */ protected $_provided; - /** - * @var string - */ + /** @var string */ protected $_message; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index 51759b760e..98bbc51cd4 100644 --- a/libraries/classes/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -43,9 +43,7 @@ class RecentFavoriteTable */ private static $_instances = []; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index ec46ea063f..38d6d20e14 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -20,14 +20,10 @@ use PhpMyAdmin\SqlParser\Utils\Table as TableUtils; */ class Relation { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ public $dbi; - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/libraries/classes/RelationCleanup.php b/libraries/classes/RelationCleanup.php index 9b6135b167..4a7231afda 100644 --- a/libraries/classes/RelationCleanup.php +++ b/libraries/classes/RelationCleanup.php @@ -19,14 +19,10 @@ use PhpMyAdmin\Util; */ class RelationCleanup { - /** - * @var Relation - */ + /** @var Relation */ public $relation; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ public $dbi; /** diff --git a/libraries/classes/ReplicationGui.php b/libraries/classes/ReplicationGui.php index fa301f1215..c65e306eeb 100644 --- a/libraries/classes/ReplicationGui.php +++ b/libraries/classes/ReplicationGui.php @@ -15,14 +15,10 @@ namespace PhpMyAdmin; */ class ReplicationGui { - /** - * @var Replication - */ + /** @var Replication */ private $replication; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/libraries/classes/Rte/Events.php b/libraries/classes/Rte/Events.php index 3e1ca70f9d..221bec0333 100644 --- a/libraries/classes/Rte/Events.php +++ b/libraries/classes/Rte/Events.php @@ -22,34 +22,22 @@ use PhpMyAdmin\Util; */ class Events { - /** - * @var Export - */ + /** @var Export */ private $export; - /** - * @var Footer - */ + /** @var Footer */ private $footer; - /** - * @var General - */ + /** @var General */ private $general; - /** - * @var RteList - */ + /** @var RteList */ private $rteList; - /** - * @var Words - */ + /** @var Words */ private $words; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Rte/Export.php b/libraries/classes/Rte/Export.php index fecc10e4ab..995b0042b5 100644 --- a/libraries/classes/Rte/Export.php +++ b/libraries/classes/Rte/Export.php @@ -20,14 +20,10 @@ use PhpMyAdmin\Util; */ class Export { - /** - * @var Words - */ + /** @var Words */ private $words; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Rte/Footer.php b/libraries/classes/Rte/Footer.php index 1f5aa8a168..b430c8311b 100644 --- a/libraries/classes/Rte/Footer.php +++ b/libraries/classes/Rte/Footer.php @@ -21,14 +21,10 @@ use PhpMyAdmin\Util; */ class Footer { - /** - * @var Words - */ + /** @var Words */ private $words; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Rte/General.php b/libraries/classes/Rte/General.php index 10a97cbadf..e191c28f40 100644 --- a/libraries/classes/Rte/General.php +++ b/libraries/classes/Rte/General.php @@ -20,9 +20,7 @@ use PhpMyAdmin\Util; */ class General { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php index b582404ecc..9641083d9e 100644 --- a/libraries/classes/Rte/Routines.php +++ b/libraries/classes/Rte/Routines.php @@ -30,34 +30,22 @@ use PhpMyAdmin\Util; */ class Routines { - /** - * @var Export - */ + /** @var Export */ private $export; - /** - * @var Footer - */ + /** @var Footer */ private $footer; - /** - * @var General - */ + /** @var General */ private $general; - /** - * @var RteList - */ + /** @var RteList */ private $rteList; - /** - * @var Words - */ + /** @var Words */ private $words; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Rte/RteList.php b/libraries/classes/Rte/RteList.php index b9b44c9df2..58f12077aa 100644 --- a/libraries/classes/Rte/RteList.php +++ b/libraries/classes/Rte/RteList.php @@ -26,19 +26,13 @@ use PhpMyAdmin\Util; */ class RteList { - /** - * @var Words - */ + /** @var Words */ private $words; - /** - * @var Template - */ + /** @var Template */ public $template; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Rte/Triggers.php b/libraries/classes/Rte/Triggers.php index 5bbc574747..029de16433 100644 --- a/libraries/classes/Rte/Triggers.php +++ b/libraries/classes/Rte/Triggers.php @@ -22,34 +22,22 @@ use PhpMyAdmin\Util; */ class Triggers { - /** - * @var Export - */ + /** @var Export */ private $export; - /** - * @var Footer - */ + /** @var Footer */ private $footer; - /** - * @var General - */ + /** @var General */ private $general; - /** - * @var RteList - */ + /** @var RteList */ private $rteList; - /** - * @var Words - */ + /** @var Words */ private $words; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php index 1471a64974..20bb739003 100644 --- a/libraries/classes/SavedSearches.php +++ b/libraries/classes/SavedSearches.php @@ -57,9 +57,7 @@ class SavedSearches */ private $_criterias = null; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php index 80aca6079b..d29300b116 100644 --- a/libraries/classes/Scripts.php +++ b/libraries/classes/Scripts.php @@ -32,9 +32,7 @@ class Scripts */ private $_code; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/libraries/classes/Server/Plugin.php b/libraries/classes/Server/Plugin.php index d15d596a70..575a6c3cf0 100644 --- a/libraries/classes/Server/Plugin.php +++ b/libraries/classes/Server/Plugin.php @@ -15,69 +15,43 @@ namespace PhpMyAdmin\Server; */ final class Plugin { - /** - * @var string - */ + /** @var string */ private $name; - /** - * @var string|null - */ + /** @var string|null */ private $version; - /** - * @var string - */ + /** @var string */ private $status; - /** - * @var string - */ + /** @var string */ private $type; - /** - * @var string|null - */ + /** @var string|null */ private $typeVersion; - /** - * @var string|null - */ + /** @var string|null */ private $library; - /** - * @var string|null - */ + /** @var string|null */ private $libraryVersion; - /** - * @var string|null - */ + /** @var string|null */ private $author; - /** - * @var string|null - */ + /** @var string|null */ private $description; - /** - * @var string - */ + /** @var string */ private $license; - /** - * @var string|null - */ + /** @var string|null */ private $loadOption; - /** - * @var string|null - */ + /** @var string|null */ private $maturity; - /** - * @var string|null - */ + /** @var string|null */ private $authVersion; /** diff --git a/libraries/classes/Server/Plugins.php b/libraries/classes/Server/Plugins.php index 71d48ac0a6..ff716118b2 100644 --- a/libraries/classes/Server/Plugins.php +++ b/libraries/classes/Server/Plugins.php @@ -13,9 +13,7 @@ use PhpMyAdmin\DatabaseInterface; */ class Plugins { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 83c24fb7ac..8c81d80e9f 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -29,24 +29,16 @@ use PhpMyAdmin\Util; */ class Privileges { - /** - * @var Template - */ + /** @var Template */ public $template; - /** - * @var RelationCleanup - */ + /** @var RelationCleanup */ private $relationCleanup; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ public $dbi; - /** - * @var Relation - */ + /** @var Relation */ public $relation; /** diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php index 8cbc0163fe..212f9ed214 100644 --- a/libraries/classes/Server/Status/Monitor.php +++ b/libraries/classes/Server/Status/Monitor.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Util; */ class Monitor { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; /** diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index a31a04f178..2870480aa2 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -37,29 +37,19 @@ use PhpMyAdmin\Util; */ class Sql { - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var RelationCleanup - */ + /** @var RelationCleanup */ private $relationCleanup; - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; - /** - * @var Operations - */ + /** @var Operations */ private $operations; - /** - * @var Template - */ + /** @var Template */ private $template; public function __construct() diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php index 23ab25dff1..ac235a24dc 100644 --- a/libraries/classes/SqlQueryForm.php +++ b/libraries/classes/SqlQueryForm.php @@ -22,9 +22,7 @@ use PhpMyAdmin\Html\MySQLDocumentation; */ class SqlQueryForm { - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php index 38993bd576..5f1bd3f368 100644 --- a/libraries/classes/StorageEngine.php +++ b/libraries/classes/StorageEngine.php @@ -43,25 +43,17 @@ define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN', 3); // 'ON' or 'OFF' */ class StorageEngine { - /** - * @var string engine name - */ + /** @var string engine name */ public $engine = 'dummy'; - /** - * @var string engine title/description - */ + /** @var string engine title/description */ public $title = 'PMA Dummy Engine Class'; - /** - * @var string engine lang description - */ + /** @var string engine lang description */ public $comment = 'If you read this text inside phpMyAdmin, something went wrong...'; - /** - * @var integer engine supported by current server - */ + /** @var integer engine supported by current server */ public $support = PMA_ENGINE_SUPPORT_NO; /** diff --git a/libraries/classes/SubPartition.php b/libraries/classes/SubPartition.php index 0660780417..729219ca7e 100644 --- a/libraries/classes/SubPartition.php +++ b/libraries/classes/SubPartition.php @@ -15,45 +15,25 @@ namespace PhpMyAdmin; */ class SubPartition { - /** - * @var string the database - */ + /** @var string the database */ protected $db; - /** - * @var string the table - */ + /** @var string the table */ protected $table; - /** - * @var string partition name - */ + /** @var string partition name */ protected $name; - /** - * @var integer ordinal - */ + /** @var integer ordinal */ protected $ordinal; - /** - * @var string partition method - */ + /** @var string partition method */ protected $method; - /** - * @var string partition expression - */ + /** @var string partition expression */ protected $expression; - /** - * @var integer no of table rows in the partition - */ + /** @var integer no of table rows in the partition */ protected $rows; - /** - * @var integer data length - */ + /** @var integer data length */ protected $dataLength; - /** - * @var integer index length - */ + /** @var integer index length */ protected $indexLength; - /** - * @var string partition comment - */ + /** @var string partition comment */ protected $comment; /** diff --git a/libraries/classes/SystemDatabase.php b/libraries/classes/SystemDatabase.php index 5f8ac6b809..64665df759 100644 --- a/libraries/classes/SystemDatabase.php +++ b/libraries/classes/SystemDatabase.php @@ -18,14 +18,10 @@ use PhpMyAdmin\Util; */ class SystemDatabase { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ protected $dbi; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 7a72d9a19b..35a45baec9 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -41,49 +41,31 @@ class Table public const PROP_COLUMN_ORDER = 'col_order'; public const PROP_COLUMN_VISIB = 'col_visib'; - /** - * @var string engine (innodb, myisam, bdb, ...) - */ + /** @var string engine (innodb, myisam, bdb, ...) */ public $engine = ''; - /** - * @var string type (view, base table, system view) - */ + /** @var string type (view, base table, system view) */ public $type = ''; - /** - * @var array UI preferences - */ + /** @var array UI preferences */ public $uiprefs; - /** - * @var array errors occurred - */ + /** @var array errors occurred */ public $errors = []; - /** - * @var array messages - */ + /** @var array messages */ public $messages = []; - /** - * @var string table name - */ + /** @var string table name */ protected $_name = ''; - /** - * @var string database name - */ + /** @var string database name */ protected $_db_name = ''; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ protected $_dbi; - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php index 51a0dd423c..2cbaff565d 100644 --- a/libraries/classes/Theme.php +++ b/libraries/classes/Theme.php @@ -83,9 +83,7 @@ class Theme 'icons', ]; - /** - * @var Template - */ + /** @var Template */ public $template; public function __construct() diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index c5e07c3c11..e9be3aa239 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -30,34 +30,22 @@ class ThemeManager */ private $_themes_path = './themes/'; - /** - * @var array available themes - */ + /** @var array available themes */ public $themes = []; - /** - * @var string cookie name - */ + /** @var string cookie name */ public $cookie_name = 'pma_theme'; - /** - * @var boolean - */ + /** @var boolean */ public $per_server = false; - /** - * @var string name of active theme - */ + /** @var string name of active theme */ public $active_theme = ''; - /** - * @var Theme Theme active theme - */ + /** @var Theme Theme active theme */ public $theme = null; - /** - * @var string - */ + /** @var string */ public $theme_default; /** diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index aebc0cec7d..1e58490887 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -17,19 +17,13 @@ use PhpMyAdmin\Html\Generator; */ class Tracking { - /** - * @var SqlQueryForm - */ + /** @var SqlQueryForm */ private $sqlQueryForm; - /** - * @var Template - */ + /** @var Template */ public $template; - /** - * @var Relation - */ + /** @var Relation */ protected $relation; /** diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php index 9929e35b88..a505d8315b 100644 --- a/libraries/classes/TwoFactor.php +++ b/libraries/classes/TwoFactor.php @@ -24,34 +24,22 @@ use Samyoul\U2F\U2FServer\U2FServer; */ class TwoFactor { - /** - * @var string - */ + /** @var string */ public $user; - /** - * @var array - */ + /** @var array */ public $config; - /** - * @var boolean - */ + /** @var boolean */ protected $_writable; - /** - * @var TwoFactorPlugin - */ + /** @var TwoFactorPlugin */ protected $_backend; - /** - * @var array - */ + /** @var array */ protected $_available; - /** - * @var UserPreferences - */ + /** @var UserPreferences */ private $userPreferences; /** diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php index 60e0ef79ca..cb23131d75 100644 --- a/libraries/classes/Types.php +++ b/libraries/classes/Types.php @@ -17,9 +17,7 @@ use PhpMyAdmin\DatabaseInterface; */ class Types { - /** - * @var DatabaseInterface Database interface - */ + /** @var DatabaseInterface Database interface */ private $_dbi; /** diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php index 367e0a3e9d..6c3d53c096 100644 --- a/libraries/classes/UserPassword.php +++ b/libraries/classes/UserPassword.php @@ -24,9 +24,7 @@ use PhpMyAdmin\Util; */ class UserPassword { - /** - * @var Privileges - */ + /** @var Privileges */ private $serverPrivileges; /** diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index 924d5995cf..eabbfc90d3 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -24,14 +24,10 @@ use PhpMyAdmin\Util; */ class UserPreferences { - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Template - */ + /** @var Template */ public $template; public function __construct() diff --git a/libraries/classes/ZipExtension.php b/libraries/classes/ZipExtension.php index fb7b3980d3..6726222b2d 100644 --- a/libraries/classes/ZipExtension.php +++ b/libraries/classes/ZipExtension.php @@ -17,9 +17,7 @@ use ZipArchive; */ class ZipExtension { - /** - * @var ZipArchive - */ + /** @var ZipArchive */ private $zip; public function __construct() diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php index 20cd3ce71e..0891686ca0 100644 --- a/test/classes/CheckUserPrivilegesTest.php +++ b/test/classes/CheckUserPrivilegesTest.php @@ -18,9 +18,7 @@ use PHPUnit\Framework\TestCase; */ class CheckUserPrivilegesTest extends TestCase { - /** - * @var CheckUserPrivileges - */ + /** @var CheckUserPrivileges */ private $checkUserPrivileges; /** diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php index 9999596d85..47332a5671 100644 --- a/test/classes/Config/FormDisplayTemplateTest.php +++ b/test/classes/Config/FormDisplayTemplateTest.php @@ -19,14 +19,10 @@ use PHPUnit\Framework\TestCase; */ class FormDisplayTemplateTest extends TestCase { - /** - * @var FormDisplayTemplate - */ + /** @var FormDisplayTemplate */ protected $formDisplayTemplate; - /** - * @var Config - */ + /** @var Config */ protected $config; /** diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php index 5786097dbd..f6205ee185 100644 --- a/test/classes/Config/FormDisplayTest.php +++ b/test/classes/Config/FormDisplayTest.php @@ -23,9 +23,7 @@ use ReflectionProperty; */ class FormDisplayTest extends PmaTestCase { - /** - * @var FormDisplay - */ + /** @var FormDisplay */ protected $object; /** diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php index 342029f6fa..b73298c3c5 100644 --- a/test/classes/Config/FormTest.php +++ b/test/classes/Config/FormTest.php @@ -22,9 +22,7 @@ use ReflectionProperty; */ class FormTest extends PmaTestCase { - /** - * @var Form - */ + /** @var Form */ protected $object; /** diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php index 817b035544..7af5f9b665 100644 --- a/test/classes/Config/ServerConfigChecksTest.php +++ b/test/classes/Config/ServerConfigChecksTest.php @@ -22,9 +22,7 @@ use ReflectionProperty; */ class ServerConfigChecksTest extends PmaTestCase { - /** - * @var string - */ + /** @var string */ private $sessionID; /** diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 84c2cbaa28..99fd71f7ac 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -25,14 +25,10 @@ class ConfigTest extends PmaTestCase */ protected $backupGlobals = false; - /** - * @var Config - */ + /** @var Config */ protected $object; - /** - * @var Config to test file permission - */ + /** @var Config to test file permission */ protected $permTestObj; /** diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php index f6bf253eb4..a1c1521834 100644 --- a/test/classes/Controllers/Database/StructureControllerTest.php +++ b/test/classes/Controllers/Database/StructureControllerTest.php @@ -30,24 +30,16 @@ use ReflectionClass; */ class StructureControllerTest extends PmaTestCase { - /** - * @var \PhpMyAdmin\Tests\Stubs\Response - */ + /** @var \PhpMyAdmin\Tests\Stubs\Response */ private $response; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var Replication - */ + /** @var Replication */ private $replication; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/test/classes/Controllers/Server/Status/MonitorControllerTest.php b/test/classes/Controllers/Server/Status/MonitorControllerTest.php index 7d5773b4cb..8649035df1 100644 --- a/test/classes/Controllers/Server/Status/MonitorControllerTest.php +++ b/test/classes/Controllers/Server/Status/MonitorControllerTest.php @@ -22,9 +22,7 @@ use PHPUnit\Framework\TestCase; */ class MonitorControllerTest extends TestCase { - /** - * @var Data - */ + /** @var Data */ private $data; protected function setUp(): void diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php index f59ed1047e..02b6430d1d 100644 --- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php +++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php @@ -22,9 +22,7 @@ use PHPUnit\Framework\TestCase; */ class ProcessesControllerTest extends TestCase { - /** - * @var Data - */ + /** @var Data */ private $data; protected function setUp(): void diff --git a/test/classes/Controllers/Server/Status/QueriesControllerTest.php b/test/classes/Controllers/Server/Status/QueriesControllerTest.php index fa118c3f4e..d4b2c4c635 100644 --- a/test/classes/Controllers/Server/Status/QueriesControllerTest.php +++ b/test/classes/Controllers/Server/Status/QueriesControllerTest.php @@ -22,9 +22,7 @@ use PHPUnit\Framework\TestCase; */ class QueriesControllerTest extends TestCase { - /** - * @var Data - */ + /** @var Data */ private $data; protected function setUp(): void diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php index dad22a88c8..4de20ef39d 100644 --- a/test/classes/Controllers/Server/Status/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/Status/VariablesControllerTest.php @@ -21,9 +21,7 @@ use PHPUnit\Framework\TestCase; */ class VariablesControllerTest extends TestCase { - /** - * @var Data - */ + /** @var Data */ private $data; protected function setUp(): void diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php index 44cbd437c2..19d990eaf4 100644 --- a/test/classes/Controllers/Table/RelationControllerTest.php +++ b/test/classes/Controllers/Table/RelationControllerTest.php @@ -22,14 +22,10 @@ use stdClass; */ class RelationControllerTest extends PmaTestCase { - /** - * @var \PhpMyAdmin\Tests\Stubs\Response - */ + /** @var \PhpMyAdmin\Tests\Stubs\Response */ private $_response; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php index 684ac2c582..3cd6dacd52 100644 --- a/test/classes/Controllers/Table/SearchControllerTest.php +++ b/test/classes/Controllers/Table/SearchControllerTest.php @@ -24,14 +24,10 @@ use stdClass; */ class SearchControllerTest extends PmaTestCase { - /** - * @var ResponseStub - */ + /** @var ResponseStub */ private $_response; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/test/classes/Controllers/Table/StructureControllerTest.php b/test/classes/Controllers/Table/StructureControllerTest.php index cb180a2c27..8dba8d6b82 100644 --- a/test/classes/Controllers/Table/StructureControllerTest.php +++ b/test/classes/Controllers/Table/StructureControllerTest.php @@ -28,14 +28,10 @@ use ReflectionClass; */ class StructureControllerTest extends PmaTestCase { - /** - * @var ResponseStub - */ + /** @var ResponseStub */ private $_response; - /** - * @var Template - */ + /** @var Template */ private $template; /** diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php index 0c01d29cd2..e8a2bc5970 100644 --- a/test/classes/CreateAddFieldTest.php +++ b/test/classes/CreateAddFieldTest.php @@ -18,9 +18,7 @@ use PHPUnit\Framework\TestCase; */ class CreateAddFieldTest extends TestCase { - /** - * @var CreateAddField - */ + /** @var CreateAddField */ private $createAddField; /** diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php index a6518dfd9c..f273742b29 100644 --- a/test/classes/Database/Designer/CommonTest.php +++ b/test/classes/Database/Designer/CommonTest.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\TestCase; */ class CommonTest extends TestCase { - /** - * @var Common - */ + /** @var Common */ private $designerCommon; /** diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index 75754a7137..b2435a7fbd 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -22,9 +22,7 @@ use ReflectionMethod; */ class DesignerTest extends TestCase { - /** - * @var Designer - */ + /** @var Designer */ private $designer; /** diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php index dd3aae1bea..a3200ffff1 100644 --- a/test/classes/Database/QbeTest.php +++ b/test/classes/Database/QbeTest.php @@ -22,9 +22,7 @@ use ReflectionClass; */ class QbeTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index 3ee8422340..544fdf8209 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -20,9 +20,7 @@ use ReflectionClass; */ class SearchTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index 4c570e6c1f..b851885039 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -21,9 +21,7 @@ use stdClass; */ class DatabaseInterfaceTest extends PmaTestCase { - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $_dbi; /** diff --git a/test/classes/Dbal/DbiMysqliTest.php b/test/classes/Dbal/DbiMysqliTest.php index bc88550131..e76fd8cb23 100644 --- a/test/classes/Dbal/DbiMysqliTest.php +++ b/test/classes/Dbal/DbiMysqliTest.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\TestCase; */ class DbiMysqliTest extends TestCase { - /** - * @var DbiMysqli - */ + /** @var DbiMysqli */ protected $object; /** diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php index fba4d81d0f..146fddbc49 100644 --- a/test/classes/Display/ResultsTest.php +++ b/test/classes/Display/ResultsTest.php @@ -26,9 +26,7 @@ use stdClass; */ class ResultsTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php index 7191828188..2e49baf667 100644 --- a/test/classes/Engines/BdbTest.php +++ b/test/classes/Engines/BdbTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class BdbTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/BinlogTest.php b/test/classes/Engines/BinlogTest.php index c28288e29c..ad0792813b 100644 --- a/test/classes/Engines/BinlogTest.php +++ b/test/classes/Engines/BinlogTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class BinlogTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php index a9bc7b638f..52075f43d1 100644 --- a/test/classes/Engines/InnodbTest.php +++ b/test/classes/Engines/InnodbTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class InnodbTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php index 9f209d340a..40083e33f1 100644 --- a/test/classes/Engines/MemoryTest.php +++ b/test/classes/Engines/MemoryTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class MemoryTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/MrgMyisamTest.php b/test/classes/Engines/MrgMyisamTest.php index d69413b8d5..f05f748e75 100644 --- a/test/classes/Engines/MrgMyisamTest.php +++ b/test/classes/Engines/MrgMyisamTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class MrgMyisamTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php index c517c2645f..4ab9871b7d 100644 --- a/test/classes/Engines/MyisamTest.php +++ b/test/classes/Engines/MyisamTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class MyisamTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php index 2b11f3e026..d9fd9ab5cb 100644 --- a/test/classes/Engines/NdbclusterTest.php +++ b/test/classes/Engines/NdbclusterTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class NdbclusterTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php index 972a452c85..620942c1db 100644 --- a/test/classes/Engines/PbxtTest.php +++ b/test/classes/Engines/PbxtTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class PbxtTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php index 76fde670c5..74057ad424 100644 --- a/test/classes/ErrorHandlerTest.php +++ b/test/classes/ErrorHandlerTest.php @@ -19,9 +19,7 @@ use ReflectionClass; */ class ErrorHandlerTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php index b03829af3a..e6420593a0 100644 --- a/test/classes/ErrorReportTest.php +++ b/test/classes/ErrorReportTest.php @@ -25,9 +25,7 @@ use ReflectionClass; */ class ErrorReportTest extends TestCase { - /** - * @var ErrorReport $errorReport - */ + /** @var ErrorReport $errorReport */ private $errorReport; protected function setUp(): void diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php index f39be55262..636b0ec46d 100644 --- a/test/classes/ExportTest.php +++ b/test/classes/ExportTest.php @@ -21,9 +21,7 @@ use PHPUnit\Framework\TestCase; */ class ExportTest extends TestCase { - /** - * @var Export - */ + /** @var Export */ private $export; /** diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php index e89066a3ec..237f8c2de1 100644 --- a/test/classes/FileListingTest.php +++ b/test/classes/FileListingTest.php @@ -15,9 +15,7 @@ use PHPUnit\Framework\TestCase; */ class FileListingTest extends TestCase { - /** - * @var FileListing $fileListing - */ + /** @var FileListing $fileListing */ private $fileListing; protected function setUp(): void diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php index f70f01f84c..e2d384fa94 100644 --- a/test/classes/FontTest.php +++ b/test/classes/FontTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class FontTest extends PmaTestCase { - /** - * @var Font - */ + /** @var Font */ private $font; /** diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index 7c413a5a23..03d47ba30b 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -21,14 +21,10 @@ use ReflectionClass; */ class FooterTest extends PmaTestCase { - /** - * @var array store private attributes of PhpMyAdmin\Footer - */ + /** @var array store private attributes of PhpMyAdmin\Footer */ public $privates = []; - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/GetCheckboxTest.php b/test/classes/GetCheckboxTest.php index d20ee3968b..cc3112d011 100644 --- a/test/classes/GetCheckboxTest.php +++ b/test/classes/GetCheckboxTest.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\TestCase; */ class GetCheckboxTest extends TestCase { - /** - * @var Template - */ + /** @var Template */ public $template; /** diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php index 0b751d1a4a..e0d1932123 100644 --- a/test/classes/Gis/GisGeometryCollectionTest.php +++ b/test/classes/Gis/GisGeometryCollectionTest.php @@ -19,9 +19,7 @@ use TCPDF; */ class GisGeometryCollectionTest extends TestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php index ba659ca6d5..c5cdbc40ba 100644 --- a/test/classes/Gis/GisGeometryTest.php +++ b/test/classes/Gis/GisGeometryTest.php @@ -18,9 +18,7 @@ use ReflectionClass; */ class GisGeometryTest extends TestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index f5640ff250..4990224e3a 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -21,9 +21,7 @@ use PHPUnit\Framework\TestCase; */ class ImportTest extends TestCase { - /** - * @var Import $import - */ + /** @var Import $import */ private $import; /** diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php index 782385d9c4..4b4c784e57 100644 --- a/test/classes/IpAllowDenyTest.php +++ b/test/classes/IpAllowDenyTest.php @@ -21,9 +21,7 @@ use PHPUnit\Framework\TestCase; */ class IpAllowDenyTest extends TestCase { - /** - * @var IpAllowDeny - */ + /** @var IpAllowDeny */ private $ipAllowDeny; /** diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index 1db9a2b3b9..623b68c18f 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class LanguageTest extends PmaTestCase { - /** - * @var LanguageManager - */ + /** @var LanguageManager */ private $manager; /** diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php index 52522e1d72..d64d33ca11 100644 --- a/test/classes/Navigation/NavigationTest.php +++ b/test/classes/Navigation/NavigationTest.php @@ -21,9 +21,7 @@ use PhpMyAdmin\Url; */ class NavigationTest extends PmaTestCase { - /** - * @var Navigation - */ + /** @var Navigation */ protected $object; /** diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php index 3419b64b39..4b73b15fc6 100644 --- a/test/classes/Navigation/NavigationTreeTest.php +++ b/test/classes/Navigation/NavigationTreeTest.php @@ -20,9 +20,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class NavigationTreeTest extends PmaTestCase { - /** - * @var NavigationTree - */ + /** @var NavigationTree */ protected $object; /** diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php index 77c44d435a..9275b8a0e9 100644 --- a/test/classes/OperationsTest.php +++ b/test/classes/OperationsTest.php @@ -20,9 +20,7 @@ use ReflectionMethod; */ class OperationsTest extends TestCase { - /** - * @var Operations - */ + /** @var Operations */ private $operations; /** diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index 2bdca480bc..fef819cca1 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -24,9 +24,7 @@ use ReflectionMethod; */ class AuthenticationCookieTest extends PmaTestCase { - /** - * @var AuthenticationCookie - */ + /** @var AuthenticationCookie */ protected $object; /** diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php index 5046f96ed5..5c99f03476 100644 --- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class AuthenticationHttpTest extends PmaTestCase { - /** - * @var AuthenticationHttp - */ + /** @var AuthenticationHttp */ protected $object; /** diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php index d48e4c6768..2e087f8956 100644 --- a/test/classes/Plugins/Export/ExportCodegenTest.php +++ b/test/classes/Plugins/Export/ExportCodegenTest.php @@ -22,9 +22,7 @@ use ReflectionProperty; */ class ExportCodegenTest extends PmaTestCase { - /** - * @var ExportCodegen - */ + /** @var ExportCodegen */ protected $object; /** diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php index b683f5c327..8169a7c505 100644 --- a/test/classes/Plugins/Import/ImportLdiTest.php +++ b/test/classes/Plugins/Import/ImportLdiTest.php @@ -21,9 +21,7 @@ use PHPUnit\Framework\MockObject\MockObject; */ class ImportLdiTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php index 3e5c729552..567da7d536 100644 --- a/test/classes/Plugins/Import/ImportMediawikiTest.php +++ b/test/classes/Plugins/Import/ImportMediawikiTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class ImportMediawikiTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php index f512bd1a6d..1089cb901c 100644 --- a/test/classes/Plugins/Import/ImportOdsTest.php +++ b/test/classes/Plugins/Import/ImportOdsTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class ImportOdsTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Import/ImportSqlTest.php b/test/classes/Plugins/Import/ImportSqlTest.php index 63500ee036..f5ce426e54 100644 --- a/test/classes/Plugins/Import/ImportSqlTest.php +++ b/test/classes/Plugins/Import/ImportSqlTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class ImportSqlTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php index aab3ef9492..6a8bd5b565 100644 --- a/test/classes/Plugins/Import/ImportXmlTest.php +++ b/test/classes/Plugins/Import/ImportXmlTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class ImportXmlTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php index 6c972d6049..d59bd9f713 100644 --- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class DiaRelationSchemaTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php index 52841e3f85..d2649b3bfc 100644 --- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class EpsRelationSchemaTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php index 381ddd6fb0..f4ce0a58ce 100644 --- a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class ExportRelationSchemaTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php index 9425e6cde7..b98715dcc7 100644 --- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class PdfRelationSchemaTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php index 24955b3114..7142b0816c 100644 --- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php @@ -19,9 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class SvgRelationSchemaTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/PmaTestCase.php b/test/classes/PmaTestCase.php index 9ddcaf8f06..69fb1bd460 100644 --- a/test/classes/PmaTestCase.php +++ b/test/classes/PmaTestCase.php @@ -20,14 +20,10 @@ use ReflectionProperty; */ class PmaTestCase extends TestCase { - /** - * @var Response|null - */ + /** @var Response|null */ protected $restoreInstance = null; - /** - * @var ReflectionProperty|null - */ + /** @var ReflectionProperty|null */ protected $attrInstance = null; /** diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php index 5ea85e421b..59ebde1e97 100644 --- a/test/classes/RelationCleanupTest.php +++ b/test/classes/RelationCleanupTest.php @@ -22,14 +22,10 @@ use PHPUnit\Framework\TestCase; */ class RelationCleanupTest extends TestCase { - /** - * @var Relation|MockObject - */ + /** @var Relation|MockObject */ private $relation; - /** - * @var RelationCleanup - */ + /** @var RelationCleanup */ private $relationCleanup; /** diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index f5ca5f287f..aa1b235213 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -19,9 +19,7 @@ use PHPUnit\Framework\TestCase; */ class RelationTest extends TestCase { - /** - * @var Relation - */ + /** @var Relation */ private $relation; /** diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php index 5a5dcf6506..352563be89 100644 --- a/test/classes/Rte/EventsTest.php +++ b/test/classes/Rte/EventsTest.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\TestCase; */ class EventsTest extends TestCase { - /** - * @var Events - */ + /** @var Events */ private $events; /** diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index 0ec58e683c..dd9d3250d1 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -22,9 +22,7 @@ use PHPUnit\Framework\TestCase; */ class RoutinesTest extends TestCase { - /** - * @var Routines - */ + /** @var Routines */ private $routines; /** diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php index 3375b11127..b82f710b69 100644 --- a/test/classes/Rte/TriggersTest.php +++ b/test/classes/Rte/TriggersTest.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\TestCase; */ class TriggersTest extends TestCase { - /** - * @var Triggers - */ + /** @var Triggers */ private $triggers; /** diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php index c0ac6c29e3..ebd6093208 100644 --- a/test/classes/ScriptsTest.php +++ b/test/classes/ScriptsTest.php @@ -19,9 +19,7 @@ use ReflectionProperty; */ class ScriptsTest extends PmaTestCase { - /** - * @var Scripts - */ + /** @var Scripts */ protected $object; /** diff --git a/test/classes/Server/PluginsTest.php b/test/classes/Server/PluginsTest.php index 81a9e3365f..458890c0de 100644 --- a/test/classes/Server/PluginsTest.php +++ b/test/classes/Server/PluginsTest.php @@ -15,9 +15,7 @@ use PHPUnit\Framework\TestCase; */ class PluginsTest extends TestCase { - /** - * @var Plugins - */ + /** @var Plugins */ private $plugins; public function testGetAll(): void diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index 091de53409..b490f31e2b 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -30,9 +30,7 @@ use stdClass; */ class PrivilegesTest extends TestCase { - /** - * @var Privileges $serverPrivileges - */ + /** @var Privileges $serverPrivileges */ private $serverPrivileges; /** diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index 5af6630af7..1c91a578c3 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -25,9 +25,7 @@ use PHPUnit\Framework\TestCase; */ class SqlQueryFormTest extends TestCase { - /** - * @var SqlQueryForm - */ + /** @var SqlQueryForm */ private $sqlQueryForm; /** diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 382e037427..db14c006e0 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -20,9 +20,7 @@ use stdClass; */ class SqlTest extends TestCase { - /** - * @var Sql - */ + /** @var Sql */ private $sql; /** diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php index 6300ad6093..33716c1c66 100644 --- a/test/classes/StorageEngineTest.php +++ b/test/classes/StorageEngineTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class StorageEngineTest extends PmaTestCase { - /** - * @access protected - */ + /** @access protected */ protected $object; /** diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index 5859003123..c5a5914563 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -27,9 +27,7 @@ use PhpMyAdmin\Dbal\DbiExtension; */ class DbiDummy implements DbiExtension { - /** - * @var array - */ + /** @var array */ private $_queries = []; /** diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php index 6f05e756ea..a1fb5f09b9 100644 --- a/test/classes/TemplateTest.php +++ b/test/classes/TemplateTest.php @@ -19,9 +19,7 @@ use Twig\Error\LoaderError; */ class TemplateTest extends PmaTestCase { - /** - * @var Template - */ + /** @var Template */ protected $template; /** diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index b3552ff06d..f11bab2569 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -19,14 +19,10 @@ use PhpMyAdmin\Theme; */ class ThemeTest extends PmaTestCase { - /** - * @var Theme - */ + /** @var Theme */ protected $object; - /** - * @var Theme backup for session theme - */ + /** @var Theme backup for session theme */ protected $backup; /** diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index d83d104612..051817d8df 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -23,9 +23,7 @@ use PHPUnit\Framework\TestCase; */ class TrackingTest extends TestCase { - /** - * @var Tracking $tracking - */ + /** @var Tracking $tracking */ private $tracking; /** diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index ae91670185..b2447e5aa6 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -18,9 +18,7 @@ use PHPUnit\Framework\TestCase; */ class TransformationsTest extends TestCase { - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; /** diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php index 884c7d69cb..ab7fdc2ac5 100644 --- a/test/classes/TypesTest.php +++ b/test/classes/TypesTest.php @@ -18,9 +18,7 @@ use PhpMyAdmin\Types; */ class TypesTest extends PmaTestCase { - /** - * @var Types - */ + /** @var Types */ protected $object; /** diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php index 499cb9c8fb..d0f2ca9473 100644 --- a/test/classes/UserPreferencesTest.php +++ b/test/classes/UserPreferencesTest.php @@ -22,9 +22,7 @@ use PhpMyAdmin\UserPreferences; */ class UserPreferencesTest extends PmaTestCase { - /** - * @var UserPreferences - */ + /** @var UserPreferences */ private $userPreferences; /** diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php index f9b8c88c3a..0362a7ae4b 100644 --- a/test/classes/Utils/HttpRequestTest.php +++ b/test/classes/Utils/HttpRequestTest.php @@ -17,9 +17,7 @@ use ReflectionClass; */ class HttpRequestTest extends PmaTestCase { - /** - * @var HttpRequest - */ + /** @var HttpRequest */ private $httpRequest; protected function setUp(): void diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php index e66c0b1014..d60d7ec5ca 100644 --- a/test/classes/ZipExtensionTest.php +++ b/test/classes/ZipExtensionTest.php @@ -19,9 +19,7 @@ use ZipArchive; */ class ZipExtensionTest extends PmaTestCase { - /** - * @var ZipExtension - */ + /** @var ZipExtension */ private $zipExtension; protected function setUp(): void diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php index 17a006abba..be5858c233 100644 --- a/test/selenium/TestBase.php +++ b/test/selenium/TestBase.php @@ -36,9 +36,7 @@ use Throwable; */ abstract class TestBase extends TestCase { - /** - * @var RemoteWebDriver - */ + /** @var RemoteWebDriver */ protected $webDriver; /**