Create server status abstract controller

Create PhpMyAdmin\Controllers\Server\Status\Controller abstract controller. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Feb 19, 2019 · c9a3145 · c9a3145
1 parent 5368c15
commit c9a3145
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 34 deletions.
diff --git a/libraries/classes/Controllers/Server/Status/AdvisorController.php b/libraries/classes/Controllers/Server/Status/AdvisorController.php
@@ -10,8 +10,6 @@
 namespace PhpMyAdmin\Controllers\Server\Status;
 
 use PhpMyAdmin\Advisor;
-use PhpMyAdmin\Controllers\Controller;
-use PhpMyAdmin\Server\Status\Data;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 /**
@@ -26,22 +24,17 @@ class AdvisorController extends Controller
      */
     private $advisor;
 
-    /**
-     * @var Data
-     */
-    private $data;
-
     /**
      * AdvisorController constructor.
      *
-     * @param \PhpMyAdmin\Response          $response Response object
-     * @param \PhpMyAdmin\DatabaseInterface $dbi      DatabaseInterface object
+     * @param \PhpMyAdmin\Response           $response Response object
+     * @param \PhpMyAdmin\DatabaseInterface  $dbi      DatabaseInterface object
+     * @param \PhpMyAdmin\Server\Status\Data $data     Data object
      */
-    public function __construct($response, $dbi)
+    public function __construct($response, $dbi, $data)
     {
-        parent::__construct($response, $dbi);
+        parent::__construct($response, $dbi, $data);
         $this->advisor = new Advisor($this->dbi, new ExpressionLanguage());
-        $this->data = new Data();
     }
 
     /**

diff --git a/libraries/classes/Controllers/Server/Status/Controller.php b/libraries/classes/Controllers/Server/Status/Controller.php
@@ -0,0 +1,37 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Holds the PhpMyAdmin\Controllers\Server\Status\Controller
+ *
+ * @package PhpMyAdmin\Controllers
+ */
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Controllers\Server\Status;
+
+use PhpMyAdmin\Controllers\Controller as BaseController;
+use PhpMyAdmin\Server\Status\Data;
+
+/**
+ * Abstract class Controller
+ * @package PhpMyAdmin\Controllers\Server\Status
+ */
+abstract class Controller extends BaseController
+{
+    /**
+     * @var Data
+     */
+    protected $data;
+
+    /**
+     * Controller constructor.
+     * @param \PhpMyAdmin\Response          $response Response object
+     * @param \PhpMyAdmin\DatabaseInterface $dbi      DatabaseInterface object
+     * @param Data                          $data     Data object
+     */
+    public function __construct($response, $dbi, $data)
+    {
+        parent::__construct($response, $dbi);
+        $this->data = $data;
+    }
+}
diff --git a/libraries/classes/Controllers/Server/Status/StatusController.php b/libraries/classes/Controllers/Server/Status/StatusController.php
@@ -9,9 +9,7 @@
 
 namespace PhpMyAdmin\Controllers\Server\Status;
 
-use PhpMyAdmin\Controllers\Controller;
 use PhpMyAdmin\ReplicationGui;
-use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Util;
 
 /**
@@ -20,24 +18,6 @@
  */
 class StatusController extends Controller
 {
-    /**
-     * @var Data
-     */
-    private $data;
-
-    /**
-     * StatusController constructor.
-     *
-     * @param \PhpMyAdmin\Response          $response Response object
-     * @param \PhpMyAdmin\DatabaseInterface $dbi      DatabaseInterface object
-     * @param Data                          $data     Data object
-     */
-    public function __construct($response, $dbi, $data)
-    {
-        parent::__construct($response, $dbi);
-        $this->data = $data;
-    }
-
     /**
      * @return string
      */

diff --git a/server_status_advisor.php b/server_status_advisor.php
@@ -9,6 +9,7 @@
 
 use PhpMyAdmin\Controllers\Server\Status\AdvisorController;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Server\Status\Data;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -23,7 +24,8 @@
 
 $controller = new AdvisorController(
     $response,
-    $GLOBALS['dbi']
+    $GLOBALS['dbi'],
+    new Data()
 );
 
 $response->addHTML($controller->index());
diff --git a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
@@ -13,6 +13,7 @@
 use PhpMyAdmin\Controllers\Server\Status\AdvisorController;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Server\Status\Data;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -100,7 +101,8 @@ public function testIndex(): void
     {
         $controller = new AdvisorController(
             Response::getInstance(),
-            $GLOBALS['dbi']
+            $GLOBALS['dbi'],
+            new Data()
         );
 
         $html = $controller->index();