From f96c41f1ab9667ef9bcfff1d067758fa69042c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 14 Jun 2019 16:10:05 -0300
Subject: [PATCH] Move Template dependency as a parameter in LanguageManager
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 .../classes/Controllers/HomeController.php    |  2 +-
 libraries/classes/LanguageManager.php         | 22 +++++--------------
 .../Plugins/Auth/AuthenticationCookie.php     |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php
index b23506da0c..27d76cf5ef 100644
--- a/libraries/classes/Controllers/HomeController.php
+++ b/libraries/classes/Controllers/HomeController.php
@@ -143,7 +143,7 @@ class HomeController extends AbstractController
 
         $languageSelector = '';
         if (empty($cfg['Lang']) && $languageManager->hasChoice()) {
-            $languageSelector = $languageManager->getSelectorDisplay();
+            $languageSelector = $languageManager->getSelectorDisplay($this->template);
         }
 
         $themeSelection = '';
diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php
index 623762e5da..22966ca782 100644
--- a/libraries/classes/LanguageManager.php
+++ b/libraries/classes/LanguageManager.php
@@ -671,19 +671,6 @@ class LanguageManager
      */
     private static $instance;
 
-    /**
-     * @var Template
-     */
-    public $template;
-
-    /**
-     * LanguageManager constructor.
-     */
-    public function __construct()
-    {
-        $this->template = new Template();
-    }
-
     /**
      * Returns LanguageManager singleton
      *
@@ -945,14 +932,15 @@ class LanguageManager
     /**
      * Returns HTML code for the language selector
      *
-     * @param boolean $use_fieldset whether to use fieldset for selection
-     * @param boolean $show_doc     whether to show documentation links
+     * @param Template $template     Template instance
+     * @param boolean  $use_fieldset whether to use fieldset for selection
+     * @param boolean  $show_doc     whether to show documentation links
      *
      * @return string
      *
      * @access  public
      */
-    public function getSelectorDisplay($use_fieldset = false, $show_doc = true)
+    public function getSelectorDisplay(Template $template, $use_fieldset = false, $show_doc = true)
     {
         $_form_params = [
             'db' => $GLOBALS['db'],
@@ -970,7 +958,7 @@ class LanguageManager
 
         $available_languages = $this->sortedLanguages();
 
-        return $this->template->render('select_lang', [
+        return $template->render('select_lang', [
             'language_title' => $language_title,
             'use_fieldset' => $use_fieldset,
             'available_languages' => $available_languages,
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 199d4bed9c..8c03f6f1ad 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -175,7 +175,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         if (empty($GLOBALS['cfg']['Lang']) && $language_manager->hasChoice()) {
             echo "<div class='hide js-show'>";
             // use fieldset, don't show doc link
-            echo $language_manager->getSelectorDisplay(true, false);
+            echo $language_manager->getSelectorDisplay(new Template(), true, false);
             echo '</div>';
         }
         echo '