Move VersionInformation to constructor in VersionCheckController

MauricioFauth · MauricioFauth · commit acba6ed40f69 · 2022-03-31T17:58:37.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php
@@ -5,6 +5,8 @@
 namespace PhpMyAdmin\Controllers;
 
 use PhpMyAdmin\Core;
+use PhpMyAdmin\ResponseRenderer;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\VersionInformation;
 
 use function json_encode;
@@ -14,6 +16,15 @@
  */
 class VersionCheckController extends AbstractController
 {
+    /** @var VersionInformation */
+    private $versionInformation;
+
+    public function __construct(ResponseRenderer $response, Template $template, VersionInformation $versionInformation)
+    {
+        parent::__construct($response, $template);
+        $this->versionInformation = $versionInformation;
+    }
+
     public function __invoke(): void
     {
         $_GET['ajax_request'] = 'true';
@@ -24,16 +35,15 @@ public function __invoke(): void
         // Always send the correct headers
         Core::headerJSON();
 
-        $versionInformation = new VersionInformation();
-        $versionDetails = $versionInformation->getLatestVersion();
+        $versionDetails = $this->versionInformation->getLatestVersion();
 
         if (empty($versionDetails)) {
             echo json_encode([]);
 
             return;
         }
 
-        $latestCompatible = $versionInformation->getLatestCompatibleVersion($versionDetails->releases);
+        $latestCompatible = $this->versionInformation->getLatestCompatibleVersion($versionDetails->releases);
         $version = '';
         $date = '';
         if ($latestCompatible != null) {
diff --git a/libraries/services.php b/libraries/services.php
@@ -239,6 +239,9 @@
         'user_preferences' => [
             'class' => PhpMyAdmin\UserPreferences::class,
         ],
+        'version_information' => [
+            'class' => PhpMyAdmin\VersionInformation::class,
+        ],
         PhpMyAdmin\DatabaseInterface::class => 'dbi',
         PhpMyAdmin\FlashMessages::class => 'flash',
         PhpMyAdmin\ResponseRenderer::class => 'response',
diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php
@@ -1569,6 +1569,7 @@
             'arguments' => [
                 '$response' => '@response',
                 '$template' => '@template',
+                '$versionInformation' => '@version_information',
             ],
         ],
         View\CreateController::class => [
diff --git a/test/classes/Controllers/VersionCheckControllerTest.php b/test/classes/Controllers/VersionCheckControllerTest.php
@@ -8,6 +8,7 @@
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
+use PhpMyAdmin\VersionInformation;
 
 use function json_encode;
 use function time;
@@ -47,7 +48,7 @@ public function testInvoke(): void
             'timestamp' => time(),
         ];
 
-        (new VersionCheckController(new ResponseRenderer(), new Template()))();
+        (new VersionCheckController(new ResponseRenderer(), new Template(), new VersionInformation()))();
 
         $output = $this->getActualOutputForAssertion();
         $this->assertTrue(isset($_GET['ajax_request']));
