Extract Console dependencies from constructor

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

2 files changed, 6 insertions, 10 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;