Extract Console dependencies from constructor

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

4 files changed, 9 insertions, 16 deletions

diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php
index e25a260f07..c02a2b64b0 100644
--- a/libraries/classes/Console.php
+++ b/libraries/classes/Console.php
@@ -24,14 +24,14 @@ class Console
      *
      * @var bool
      */
-    private $isEnabled;
+    private $isEnabled = true;
 
     /**
      * Whether we are servicing an ajax request.
      *
      * @var bool
      */
-    private $isAjax;
+    private $isAjax = false;
 
     /** @var Relation */
     private $relation;
@@ -39,14 +39,10 @@ class Console
     /** @var Template */
     public $template;
 
-    /**
-     * Creates a new class instance
-     */
-    public function __construct()
+    public function __construct(Relation $relation, Template $template)
     {
-        $this->isEnabled = true;
-        $this->relation = new Relation($GLOBALS['dbi']);
-        $this->template = new Template();
+        $this->relation = $relation;
+        $this->template = $template;
     }
 
     /**
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index c9217a4dea..e23146b458 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -111,7 +111,7 @@ class Header
         $this->isAjax = false;
         $this->bodyId = '';
         $this->title = '';
-        $this->console = new Console();
+        $this->console = new Console(new Relation($GLOBALS['dbi']), $this->template);
         $this->menu = new Menu($GLOBALS['dbi'], $GLOBALS['db'] ?? '', $GLOBALS['table'] ?? '');
         $this->menuEnabled = true;
         $this->warningsEnabled = true;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 43f54debce..5cf4c590a0 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -975,11 +975,6 @@
       <code>(string) $groupName</code>
     </RedundantCastGivenDocblockType>
   </file>
-  <file src="libraries/classes/Console.php">
-    <PropertyNotSetInConstructor occurrences="1">
-      <code>$isAjax</code>
-    </PropertyNotSetInConstructor>
-  </file>
   <file src="libraries/classes/Controllers/AbstractController.php">
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$params</code>
diff --git a/test/classes/ConsoleTest.php b/test/classes/ConsoleTest.php
index 243f00846b..bcc9d35257 100644
--- a/test/classes/ConsoleTest.php
+++ b/test/classes/ConsoleTest.php
@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin\Tests;
 
+use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\Console;
+use PhpMyAdmin\Template;
 
 /**
  * @covers \PhpMyAdmin\Console
@@ -14,7 +16,7 @@ class ConsoleTest extends AbstractTestCase
     public function testGetScripts(): void
     {
         $GLOBALS['dbi'] = $this->createDatabaseInterface();
-        $console = new Console();
+        $console = new Console(new Relation($GLOBALS['dbi']), new Template());
         $this->assertEquals(['console.js'], $console->getScripts());
     }
 }