Merge pull request #18861 from kamil-tekiela/Final-controllers

MauricioFauth · web-flow · commit e642378f416d · 2023-12-22T19:28:07.000-03:00
Make some controllers final
diff --git a/src/Controllers/Console/Bookmark/RefreshController.php b/src/Controllers/Console/Bookmark/RefreshController.php
@@ -13,8 +13,8 @@
 final class RefreshController extends AbstractController
 {
     public function __construct(
-        protected ResponseRenderer $response,
-        protected Template $template,
+        ResponseRenderer $response,
+        Template $template,
         private Console $console,
     ) {
         parent::__construct($response, $template);
diff --git a/src/Controllers/Database/StructureController.php b/src/Controllers/Database/StructureController.php
@@ -56,25 +56,25 @@
 /**
  * Handles database structure logic
  */
-class StructureController extends AbstractController
+final class StructureController extends AbstractController
 {
     /** @var int Number of tables */
-    protected int $numTables = 0;
+    private int $numTables = 0;
 
     /** @var int Current position in the list */
-    protected int $position = 0;
+    private int $position = 0;
 
     /** @var bool DB is information_schema */
-    protected bool $dbIsSystemSchema = false;
+    private bool $dbIsSystemSchema = false;
 
     /** @var int Number of tables */
-    protected int $totalNumTables = 0;
+    private int $totalNumTables = 0;
 
     /** @var mixed[] Tables in the database */
-    protected array $tables = [];
+    private array $tables = [];
 
     /** @var bool whether stats show or not */
-    protected bool $isShowStats = false;
+    private bool $isShowStats = false;
 
     private ReplicationInfo $replicationInfo;
 
@@ -215,7 +215,7 @@ public function __invoke(ServerRequest $request): void
     }
 
     /** @param mixed[] $replicaInfo */
-    protected function displayTableList(array $replicaInfo): string
+    private function displayTableList(array $replicaInfo): string
     {
         $html = '';
 
@@ -530,7 +530,7 @@ protected function displayTableList(array $replicaInfo): string
      *
      * @return string HTML for tracking icon
      */
-    protected function getTrackingIcon(string $table, TrackedTable|null $trackedTable): string
+    private function getTrackingIcon(string $table, TrackedTable|null $trackedTable): string
     {
         $trackingIcon = '';
         if (Tracker::isActive() && $trackedTable !== null) {
@@ -552,7 +552,7 @@ protected function getTrackingIcon(string $table, TrackedTable|null $trackedTabl
      *
      * @return mixed[]
      */
-    protected function isRowCountApproximated(
+    private function isRowCountApproximated(
         array $currentTable,
         bool $tableIsView,
     ): array {
@@ -597,7 +597,7 @@ protected function isRowCountApproximated(
      *
      * @return mixed[]
      */
-    protected function getReplicationStatus(array $replicaInfo, string $table): array
+    private function getReplicationStatus(array $replicaInfo, string $table): array
     {
         $do = $ignored = false;
         if ($replicaInfo['status']) {
@@ -627,7 +627,7 @@ protected function getReplicationStatus(array $replicaInfo, string $table): arra
      * @param mixed[] $db       DB to look into
      * @param string  $truename Table name
      */
-    protected function hasTable(array $db, string $truename): bool
+    private function hasTable(array $db, string $truename): bool
     {
         foreach ($db as $dbTable) {
             if (
@@ -656,7 +656,7 @@ protected function hasTable(array $db, string $truename): bool
      *
      * @return mixed[]
      */
-    protected function getStuffForEngineTypeTable(
+    private function getStuffForEngineTypeTable(
         array $currentTable,
         int $sumSize,
         int $overheadSize,
@@ -776,7 +776,7 @@ protected function getStuffForEngineTypeTable(
      *
      * @return mixed[]
      */
-    protected function getValuesForAriaTable(
+    private function getValuesForAriaTable(
         array $currentTable,
         int $sumSize,
         int $overheadSize,
@@ -814,7 +814,7 @@ protected function getValuesForAriaTable(
      *
      * @return mixed[]
      */
-    protected function getValuesForInnodbTable(
+    private function getValuesForInnodbTable(
         array $currentTable,
         int $sumSize,
     ): array {
@@ -852,7 +852,7 @@ protected function getValuesForInnodbTable(
      *
      * @return mixed[]
      */
-    protected function getValuesForMroongaTable(
+    private function getValuesForMroongaTable(
         array $currentTable,
         int $sumSize,
     ): array {
diff --git a/src/Controllers/Server/BinlogController.php b/src/Controllers/Server/BinlogController.php
@@ -20,14 +20,14 @@
 /**
  * Handles viewing binary logs
  */
-class BinlogController extends AbstractController
+final class BinlogController extends AbstractController
 {
     /**
      * binary log files
      *
      * @var mixed[]
      */
-    protected array $binaryLogs;
+    private array $binaryLogs;
 
     public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
     {
diff --git a/src/Controllers/Table/DeleteConfirmController.php b/src/Controllers/Table/DeleteConfirmController.php
@@ -24,8 +24,8 @@
 final class DeleteConfirmController extends AbstractController
 {
     public function __construct(
-        protected ResponseRenderer $response,
-        protected Template $template,
+        ResponseRenderer $response,
+        Template $template,
         private readonly DbTableExists $dbTableExists,
     ) {
         parent::__construct($response, $template);
diff --git a/src/Controllers/Table/DropColumnConfirmationController.php b/src/Controllers/Table/DropColumnConfirmationController.php
@@ -21,8 +21,8 @@
 final class DropColumnConfirmationController extends AbstractController
 {
     public function __construct(
-        protected ResponseRenderer $response,
-        protected Template $template,
+        ResponseRenderer $response,
+        Template $template,
         private readonly DbTableExists $dbTableExists,
     ) {
         parent::__construct($response, $template);

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,14 @@`
`20`	`20`	`/**`
`21`	`21`	`* Handles viewing binary logs`
`22`	`22`	`*/`
`23`		`-class BinlogController extends AbstractController`
	`23`	`+final class BinlogController extends AbstractController`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`	`26`	`* binary log files`
`27`	`27`	`*`
`28`	`28`	`* @var mixed[]`
`29`	`29`	`*/`
`30`		`- protected array $binaryLogs;`
	`30`	`+ private array $binaryLogs;`
`31`	`31`
`32`	`32`	`public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)`
`33`	`33`	`{`