Merge pull request #18081 from kamil-tekiela/rector-property-type
Convert var annotations to typed properties
This commit is contained in:
Maurício Meneghini Fauth
GitHub
commit
e5de6ef1bd
@ -31,8 +31,7 @@ use function vsprintf;
|
||||
*/
|
||||
class Advisor
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var array */
|
||||
private $variables;
|
||||
@ -54,8 +53,7 @@ class Advisor
|
||||
'errors' => [],
|
||||
];
|
||||
|
||||
/** @var ExpressionLanguage */
|
||||
private $expression;
|
||||
private ExpressionLanguage $expression;
|
||||
|
||||
/**
|
||||
* @param DatabaseInterface $dbi DatabaseInterface object
|
||||
|
||||
@ -56,11 +56,9 @@ class Bookmark
|
||||
*/
|
||||
private $query;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(DatabaseInterface $dbi, Relation $relation)
|
||||
{
|
||||
|
||||
@ -22,14 +22,10 @@ use function mb_substr;
|
||||
*/
|
||||
class BrowseForeigners
|
||||
{
|
||||
/** @var int */
|
||||
private $limitChars;
|
||||
/** @var int */
|
||||
private $maxRows;
|
||||
/** @var int */
|
||||
private $repeatCells;
|
||||
/** @var bool */
|
||||
private $showAll;
|
||||
private int $limitChars;
|
||||
private int $maxRows;
|
||||
private int $repeatCells;
|
||||
private bool $showAll;
|
||||
|
||||
/** @var Template */
|
||||
public $template;
|
||||
|
||||
@ -14,31 +14,23 @@ final class Charset
|
||||
{
|
||||
/**
|
||||
* The character set name
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $name;
|
||||
private string $name;
|
||||
|
||||
/**
|
||||
* A description of the character set
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $description;
|
||||
private string $description;
|
||||
|
||||
/**
|
||||
* The default collation for the character set
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $defaultCollation;
|
||||
private string $defaultCollation;
|
||||
|
||||
/**
|
||||
* The maximum number of bytes required to store one character
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $maxLength;
|
||||
private int $maxLength;
|
||||
|
||||
/**
|
||||
* @param string $name Charset name
|
||||
|
||||
@ -20,59 +20,43 @@ final class Collation
|
||||
{
|
||||
/**
|
||||
* The collation name
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $name;
|
||||
private string $name;
|
||||
|
||||
/**
|
||||
* A description of the collation
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $description;
|
||||
private string $description;
|
||||
|
||||
/**
|
||||
* The name of the character set with which the collation is associated
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $charset;
|
||||
private string $charset;
|
||||
|
||||
/**
|
||||
* The collation ID
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $id;
|
||||
private int $id;
|
||||
|
||||
/**
|
||||
* Whether the collation is the default for its character set
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $isDefault;
|
||||
private bool $isDefault;
|
||||
|
||||
/**
|
||||
* Whether the character set is compiled into the server
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $isCompiled;
|
||||
private bool $isCompiled;
|
||||
|
||||
/**
|
||||
* Used for determining the memory used to sort strings in this collation
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $sortLength;
|
||||
private int $sortLength;
|
||||
|
||||
/**
|
||||
* The collation pad attribute
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $padAttribute;
|
||||
private string $padAttribute;
|
||||
|
||||
/**
|
||||
* @param string $name Collation name
|
||||
|
||||
@ -21,8 +21,7 @@ use function str_contains;
|
||||
*/
|
||||
class CheckUserPrivileges
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/**
|
||||
* @param DatabaseInterface $dbi DatabaseInterface object
|
||||
|
||||
@ -26,10 +26,8 @@ class ConfigFile
|
||||
* Stores default phpMyAdmin config
|
||||
*
|
||||
* @see Settings
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $defaultCfg;
|
||||
private array $defaultCfg;
|
||||
|
||||
/**
|
||||
* Stores allowed values for non-standard fields
|
||||
@ -47,10 +45,8 @@ class ConfigFile
|
||||
|
||||
/**
|
||||
* Whether we are currently working in PMA Setup context
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $isInSetup;
|
||||
private bool $isInSetup;
|
||||
|
||||
/**
|
||||
* Keys which will be always written to config file
|
||||
@ -77,10 +73,8 @@ class ConfigFile
|
||||
/**
|
||||
* Instance id (key in $_SESSION array, separate for each server -
|
||||
* ConfigFile{server id})
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $id;
|
||||
private string $id;
|
||||
|
||||
/**
|
||||
* @param array|null $baseConfig base configuration read from
|
||||
|
||||
@ -68,10 +68,8 @@ class Form
|
||||
|
||||
/**
|
||||
* ConfigFile instance
|
||||
*
|
||||
* @var ConfigFile
|
||||
*/
|
||||
private $configFile;
|
||||
private ConfigFile $configFile;
|
||||
|
||||
/**
|
||||
* A counter for the number of groups
|
||||
|
||||
@ -48,10 +48,8 @@ class FormDisplay
|
||||
{
|
||||
/**
|
||||
* ConfigFile instance
|
||||
*
|
||||
* @var ConfigFile
|
||||
*/
|
||||
private $configFile;
|
||||
private ConfigFile $configFile;
|
||||
|
||||
/**
|
||||
* Form list
|
||||
@ -105,8 +103,7 @@ class FormDisplay
|
||||
*/
|
||||
private $userprefsDisallow;
|
||||
|
||||
/** @var FormDisplayTemplate */
|
||||
private $formDisplayTemplate;
|
||||
private FormDisplayTemplate $formDisplayTemplate;
|
||||
|
||||
/**
|
||||
* @param ConfigFile $cf Config file instance
|
||||
|
||||
@ -23,8 +23,7 @@ class FormDisplayTemplate
|
||||
/** @var int */
|
||||
public $group;
|
||||
|
||||
/** @var Config */
|
||||
protected $config;
|
||||
protected Config $config;
|
||||
|
||||
/** @var Template */
|
||||
public $template;
|
||||
|
||||
@ -43,13 +43,10 @@ class PageSettings
|
||||
|
||||
/**
|
||||
* Contains HTML of settings
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $HTML = '';
|
||||
private string $HTML = '';
|
||||
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/**
|
||||
* @param string $formGroupName The name of config form group to display
|
||||
|
||||
@ -31,7 +31,7 @@ use const SODIUM_CRYPTO_SECRETBOX_KEYBYTES;
|
||||
class ServerConfigChecks
|
||||
{
|
||||
/** @var ConfigFile configurations being checked */
|
||||
protected $cfg;
|
||||
protected ConfigFile $cfg;
|
||||
|
||||
/**
|
||||
* @param ConfigFile $cfg Configuration
|
||||
|
||||
@ -33,8 +33,7 @@ class Console
|
||||
*/
|
||||
private $isAjax = false;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Template */
|
||||
public $template;
|
||||
|
||||
@ -18,11 +18,9 @@ use function defined;
|
||||
|
||||
abstract class AbstractController
|
||||
{
|
||||
/** @var ResponseRenderer */
|
||||
protected $response;
|
||||
protected ResponseRenderer $response;
|
||||
|
||||
/** @var Template */
|
||||
protected $template;
|
||||
protected Template $template;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template)
|
||||
{
|
||||
|
||||
@ -15,11 +15,9 @@ use PhpMyAdmin\Template;
|
||||
*/
|
||||
class BrowseForeignersController extends AbstractController
|
||||
{
|
||||
/** @var BrowseForeigners */
|
||||
private $browseForeigners;
|
||||
private BrowseForeigners $browseForeigners;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,8 +17,7 @@ use const SQL_DIR;
|
||||
*/
|
||||
class CheckRelationsController extends AbstractController
|
||||
{
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Relation $relation)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Url;
|
||||
|
||||
final class CollationConnectionController extends AbstractController
|
||||
{
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Config $config)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class ColumnController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -13,8 +13,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class GetConfigController extends AbstractController
|
||||
{
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Config $config)
|
||||
{
|
||||
|
||||
@ -15,8 +15,7 @@ use function json_decode;
|
||||
|
||||
final class SetConfigController extends AbstractController
|
||||
{
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Config $config)
|
||||
{
|
||||
|
||||
@ -16,8 +16,7 @@ use function is_string;
|
||||
|
||||
final class AddController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class PopulateColumnsController extends AbstractController
|
||||
{
|
||||
/** @var CentralColumns */
|
||||
private $centralColumns;
|
||||
private CentralColumns $centralColumns;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -22,8 +22,7 @@ use function sprintf;
|
||||
|
||||
class CentralColumnsController extends AbstractController
|
||||
{
|
||||
/** @var CentralColumns */
|
||||
private $centralColumns;
|
||||
private CentralColumns $centralColumns;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -19,14 +19,11 @@ use function str_replace;
|
||||
|
||||
class DataDictionaryController extends AbstractController
|
||||
{
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Transformations */
|
||||
private $transformations;
|
||||
private Transformations $transformations;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -20,11 +20,9 @@ use function sprintf;
|
||||
|
||||
class DesignerController extends AbstractController
|
||||
{
|
||||
/** @var Designer */
|
||||
private $databaseDesigner;
|
||||
private Designer $databaseDesigner;
|
||||
|
||||
/** @var DesignerCommon */
|
||||
private $designerCommon;
|
||||
private DesignerCommon $designerCommon;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,11 +17,9 @@ use function strlen;
|
||||
|
||||
final class EventsController extends AbstractController
|
||||
{
|
||||
/** @var Events */
|
||||
private $events;
|
||||
private Events $events;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -22,11 +22,9 @@ use function is_array;
|
||||
|
||||
final class ExportController extends AbstractController
|
||||
{
|
||||
/** @var Export */
|
||||
private $export;
|
||||
private Export $export;
|
||||
|
||||
/** @var Options */
|
||||
private $exportOptions;
|
||||
private Options $exportOptions;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -26,8 +26,7 @@ use function is_numeric;
|
||||
|
||||
final class ImportController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -15,8 +15,7 @@ use function rtrim;
|
||||
|
||||
final class TablesController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -16,8 +16,7 @@ use PhpMyAdmin\Template;
|
||||
*/
|
||||
class MultiTableQueryController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -18,11 +18,9 @@ use function __;
|
||||
|
||||
final class CollationController extends AbstractController
|
||||
{
|
||||
/** @var Operations */
|
||||
private $operations;
|
||||
private Operations $operations;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -32,20 +32,15 @@ use function strlen;
|
||||
*/
|
||||
class OperationsController extends AbstractController
|
||||
{
|
||||
/** @var Operations */
|
||||
private $operations;
|
||||
private Operations $operations;
|
||||
|
||||
/** @var CheckUserPrivileges */
|
||||
private $checkUserPrivileges;
|
||||
private CheckUserPrivileges $checkUserPrivileges;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var RelationCleanup */
|
||||
private $relationCleanup;
|
||||
private RelationCleanup $relationCleanup;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -27,11 +27,9 @@ use function mb_strtolower;
|
||||
*/
|
||||
class PrivilegesController extends AbstractController
|
||||
{
|
||||
/** @var Privileges */
|
||||
private $privileges;
|
||||
private Privileges $privileges;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -25,11 +25,9 @@ use function stripos;
|
||||
|
||||
class QueryByExampleController extends AbstractController
|
||||
{
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -23,14 +23,11 @@ use function strlen;
|
||||
*/
|
||||
class RoutinesController extends AbstractController
|
||||
{
|
||||
/** @var CheckUserPrivileges */
|
||||
private $checkUserPrivileges;
|
||||
private CheckUserPrivileges $checkUserPrivileges;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var Routines */
|
||||
private $routines;
|
||||
private Routines $routines;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -19,8 +19,7 @@ use function __;
|
||||
|
||||
class SearchController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -15,8 +15,7 @@ use PhpMyAdmin\Template;
|
||||
*/
|
||||
class SqlAutoCompleteController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -20,8 +20,7 @@ use function htmlspecialchars;
|
||||
*/
|
||||
class SqlController extends AbstractController
|
||||
{
|
||||
/** @var SqlQueryForm */
|
||||
private $sqlQueryForm;
|
||||
private SqlQueryForm $sqlQueryForm;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, SqlQueryForm $sqlQueryForm)
|
||||
{
|
||||
|
||||
@ -17,11 +17,9 @@ use function count;
|
||||
|
||||
final class AddPrefixTableController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,11 +17,9 @@ use function __;
|
||||
|
||||
final class AddController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,11 +17,9 @@ use function __;
|
||||
|
||||
final class MakeConsistentController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,11 +17,9 @@ use function __;
|
||||
|
||||
final class RemoveController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,11 +17,9 @@ use function count;
|
||||
|
||||
final class CopyTableController extends AbstractController
|
||||
{
|
||||
/** @var Operations */
|
||||
private $operations;
|
||||
private Operations $operations;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -18,8 +18,7 @@ use function mb_substr;
|
||||
|
||||
final class CopyTableWithPrefixController extends AbstractController
|
||||
{
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -18,8 +18,7 @@ use function in_array;
|
||||
|
||||
final class DropFormController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -21,14 +21,11 @@ use function in_array;
|
||||
|
||||
final class DropTableController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var RelationCleanup */
|
||||
private $relationCleanup;
|
||||
private RelationCleanup $relationCleanup;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -25,23 +25,17 @@ use function count;
|
||||
|
||||
final class EmptyTableController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var RelationCleanup */
|
||||
private $relationCleanup;
|
||||
private RelationCleanup $relationCleanup;
|
||||
|
||||
/** @var Operations */
|
||||
private $operations;
|
||||
private Operations $operations;
|
||||
|
||||
/** @var FlashMessages */
|
||||
private $flash;
|
||||
private FlashMessages $flash;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -22,8 +22,7 @@ use function sha1;
|
||||
|
||||
final class FavoriteTableController extends AbstractController
|
||||
{
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Relation $relation)
|
||||
{
|
||||
|
||||
@ -19,8 +19,7 @@ use function json_encode;
|
||||
*/
|
||||
final class RealRowCountController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -19,11 +19,9 @@ use function mb_substr;
|
||||
|
||||
final class ReplacePrefixController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var StructureController */
|
||||
private $structureController;
|
||||
private StructureController $structureController;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -15,8 +15,7 @@ use function __;
|
||||
|
||||
final class ShowCreateController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -66,17 +66,13 @@ class StructureController extends AbstractController
|
||||
/** @var bool whether stats show or not */
|
||||
protected $isShowStats;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Replication */
|
||||
private $replication;
|
||||
private Replication $replication;
|
||||
|
||||
/** @var ReplicationInfo */
|
||||
private $replicationInfo;
|
||||
private ReplicationInfo $replicationInfo;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -28,11 +28,9 @@ use function sprintf;
|
||||
*/
|
||||
class TrackingController extends AbstractController
|
||||
{
|
||||
/** @var Tracking */
|
||||
private $tracking;
|
||||
private Tracking $tracking;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -22,11 +22,9 @@ use function strlen;
|
||||
*/
|
||||
class TriggersController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var Triggers */
|
||||
private $triggers;
|
||||
private Triggers $triggers;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -28,14 +28,11 @@ use function time;
|
||||
*/
|
||||
class ErrorReportController extends AbstractController
|
||||
{
|
||||
/** @var ErrorReport */
|
||||
private $errorReport;
|
||||
private ErrorReport $errorReport;
|
||||
|
||||
/** @var ErrorHandler */
|
||||
private $errorHandler;
|
||||
private ErrorHandler $errorHandler;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -38,8 +38,7 @@ use function time;
|
||||
|
||||
final class ExportController extends AbstractController
|
||||
{
|
||||
/** @var Export */
|
||||
private $export;
|
||||
private Export $export;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Export $export)
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@ use function __;
|
||||
|
||||
final class TablesController extends AbstractController
|
||||
{
|
||||
/** @var ExportController */
|
||||
private $exportController;
|
||||
private ExportController $exportController;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, ExportController $exportController)
|
||||
{
|
||||
|
||||
@ -16,11 +16,9 @@ use function is_array;
|
||||
|
||||
final class CreateController extends AbstractController
|
||||
{
|
||||
/** @var TemplateModel */
|
||||
private $model;
|
||||
private TemplateModel $model;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -13,11 +13,9 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class DeleteController extends AbstractController
|
||||
{
|
||||
/** @var TemplateModel */
|
||||
private $model;
|
||||
private TemplateModel $model;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -14,11 +14,9 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class LoadController extends AbstractController
|
||||
{
|
||||
/** @var TemplateModel */
|
||||
private $model;
|
||||
private TemplateModel $model;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -14,11 +14,9 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class UpdateController extends AbstractController
|
||||
{
|
||||
/** @var TemplateModel */
|
||||
private $model;
|
||||
private TemplateModel $model;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -15,8 +15,7 @@ use function strtotime;
|
||||
|
||||
final class GitInfoController extends AbstractController
|
||||
{
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Config $config)
|
||||
{
|
||||
|
||||
@ -37,14 +37,11 @@ use const SODIUM_CRYPTO_SECRETBOX_KEYBYTES;
|
||||
|
||||
class HomeController extends AbstractController
|
||||
{
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
/** @var ThemeManager */
|
||||
private $themeManager;
|
||||
private ThemeManager $themeManager;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/**
|
||||
* @var array<int, array<string, string>>
|
||||
|
||||
@ -50,14 +50,11 @@ use function trim;
|
||||
|
||||
final class ImportController extends AbstractController
|
||||
{
|
||||
/** @var Import */
|
||||
private $import;
|
||||
private Import $import;
|
||||
|
||||
/** @var Sql */
|
||||
private $sql;
|
||||
private Sql $sql;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -21,8 +21,7 @@ use function explode;
|
||||
|
||||
final class SimulateDmlController extends AbstractController
|
||||
{
|
||||
/** @var SimulateDml */
|
||||
private $simulateDml;
|
||||
private SimulateDml $simulateDml;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -24,8 +24,7 @@ use function usleep;
|
||||
*/
|
||||
class StatusController
|
||||
{
|
||||
/** @var Template */
|
||||
private $template;
|
||||
private Template $template;
|
||||
|
||||
public function __construct(Template $template)
|
||||
{
|
||||
|
||||
@ -18,7 +18,7 @@ use function time;
|
||||
final class JavaScriptMessagesController
|
||||
{
|
||||
/** @var array<string, string> */
|
||||
private $messages;
|
||||
private array $messages;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
|
||||
@ -10,8 +10,7 @@ use PhpMyAdmin\Plugins\AuthenticationPluginFactory;
|
||||
|
||||
class LogoutController
|
||||
{
|
||||
/** @var AuthenticationPluginFactory */
|
||||
private $authPluginFactory;
|
||||
private AuthenticationPluginFactory $authPluginFactory;
|
||||
|
||||
public function __construct(AuthenticationPluginFactory $authPluginFactory)
|
||||
{
|
||||
|
||||
@ -22,11 +22,9 @@ use function __;
|
||||
*/
|
||||
class NavigationController extends AbstractController
|
||||
{
|
||||
/** @var Navigation */
|
||||
private $navigation;
|
||||
private Navigation $navigation;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -15,8 +15,7 @@ use PhpMyAdmin\Url;
|
||||
|
||||
final class AddNewPrimaryController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -16,8 +16,7 @@ use function min;
|
||||
|
||||
final class CreateNewColumnController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@ use function in_array;
|
||||
|
||||
final class FirstStepController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class FourthStepController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class SecondStepController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class ThirdStepController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -15,8 +15,7 @@ use function _pgettext;
|
||||
|
||||
final class GetColumnsController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class MoveRepeatingGroup extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class PartialDependenciesController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@ use function json_decode;
|
||||
|
||||
final class CreateNewTablesController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class FirstStepController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@ use function json_decode;
|
||||
|
||||
final class NewTablesController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@ use function json_decode;
|
||||
|
||||
final class CreateNewTablesController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -12,8 +12,7 @@ use PhpMyAdmin\Template;
|
||||
|
||||
final class FirstStepController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@ use function json_decode;
|
||||
|
||||
final class NewTablesController extends AbstractController
|
||||
{
|
||||
/** @var Normalization */
|
||||
private $normalization;
|
||||
private Normalization $normalization;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Normalization $normalization)
|
||||
{
|
||||
|
||||
@ -21,14 +21,11 @@ use function ltrim;
|
||||
|
||||
class ExportController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -21,14 +21,11 @@ use function ltrim;
|
||||
|
||||
class FeaturesController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -21,14 +21,11 @@ use function ltrim;
|
||||
|
||||
class ImportController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -21,14 +21,11 @@ use function ltrim;
|
||||
|
||||
class MainPanelController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -45,14 +45,11 @@ use const UPLOAD_ERR_OK;
|
||||
*/
|
||||
class ManageController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -21,14 +21,11 @@ use function ltrim;
|
||||
|
||||
class NavigationController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -21,14 +21,11 @@ use function ltrim;
|
||||
|
||||
class SqlController extends AbstractController
|
||||
{
|
||||
/** @var UserPreferences */
|
||||
private $userPreferences;
|
||||
private UserPreferences $userPreferences;
|
||||
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
/** @var Config */
|
||||
private $config;
|
||||
private Config $config;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,8 +17,7 @@ use function count;
|
||||
|
||||
class TwoFactorController extends AbstractController
|
||||
{
|
||||
/** @var Relation */
|
||||
private $relation;
|
||||
private Relation $relation;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Relation $relation)
|
||||
{
|
||||
|
||||
@ -22,11 +22,9 @@ use function mb_strlen;
|
||||
*/
|
||||
class SchemaExportController
|
||||
{
|
||||
/** @var Export */
|
||||
private $export;
|
||||
private Export $export;
|
||||
|
||||
/** @var ResponseRenderer */
|
||||
private $response;
|
||||
private ResponseRenderer $response;
|
||||
|
||||
public function __construct(Export $export, ResponseRenderer $response)
|
||||
{
|
||||
|
||||
@ -23,13 +23,10 @@ class BinlogController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* binary log files
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $binaryLogs;
|
||||
protected array $binaryLogs;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -20,13 +20,12 @@ use PhpMyAdmin\Url;
|
||||
class CollationsController extends AbstractController
|
||||
{
|
||||
/** @var array<string, Charset> */
|
||||
private $charsets;
|
||||
private array $charsets;
|
||||
|
||||
/** @var array<string, array<string, Collation>> */
|
||||
private $collations;
|
||||
private array $collations;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/**
|
||||
* @param array<string, Charset>|null $charsets
|
||||
|
||||
@ -24,8 +24,7 @@ use function str_contains;
|
||||
|
||||
final class CreateController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -22,14 +22,11 @@ use function is_array;
|
||||
|
||||
final class DestroyController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
/** @var Transformations */
|
||||
private $transformations;
|
||||
private Transformations $transformations;
|
||||
|
||||
/** @var RelationCleanup */
|
||||
private $relationCleanup;
|
||||
private RelationCleanup $relationCleanup;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -49,8 +49,7 @@ class DatabasesController extends AbstractController
|
||||
/** @var int position in list navigation */
|
||||
private $position;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(
|
||||
ResponseRenderer $response,
|
||||
|
||||
@ -17,8 +17,7 @@ use PhpMyAdmin\Url;
|
||||
*/
|
||||
class EnginesController extends AbstractController
|
||||
{
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
@ -20,11 +20,9 @@ use function array_merge;
|
||||
|
||||
final class ExportController extends AbstractController
|
||||
{
|
||||
/** @var Options */
|
||||
private $export;
|
||||
private Options $export;
|
||||
|
||||
/** @var DatabaseInterface */
|
||||
private $dbi;
|
||||
private DatabaseInterface $dbi;
|
||||
|
||||
public function __construct(ResponseRenderer $response, Template $template, Options $export, DatabaseInterface $dbi)
|
||||
{
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user
