Framework update v2.3.1

artimman · Mar 21, 2024 · 2dd8a89 · 2dd8a89
1 parent 3a283b7
commit 2dd8a89
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/application/classes/BaseController.php b/application/classes/BaseController.php
@@ -17,7 +17,6 @@
 
 class BaseController extends TemplateEngine implements BaseInterface
 {
-    public $translation;
     private $database;
 
     public function __construct(DatabaseInterface $database)

diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php
@@ -21,7 +21,7 @@ public function __construct(DatabaseInterface $database)
     {
         parent::__construct($database);
 
-        $model = new LoginModel($database);
+        $model = new LoginModel($database, $this->translation);
         $this->model = $model;
     }
 

diff --git a/src/Controller/RegisterController.php b/src/Controller/RegisterController.php
@@ -22,7 +22,7 @@ public function __construct(DatabaseInterface $database)
     {
         parent::__construct($database);
 
-        $model = new RegisterModel($database);
+        $model = new RegisterModel($database, $this->translation);
         $this->model = $model;
     }
 

diff --git a/src/Model/LoginModel.php b/src/Model/LoginModel.php
@@ -9,8 +9,8 @@
 
 namespace App\Model;
 
-use Dbm\Classes\Translation;
 use Dbm\Interfaces\DatabaseInterface;
+use Dbm\Interfaces\TranslationInterface;
 
 class LoginModel
 {
@@ -20,11 +20,9 @@ class LoginModel
     private $database;
     private $translation;
 
-    public function __construct(DatabaseInterface $database)
+    public function __construct(DatabaseInterface $database, TranslationInterface $translation)
     {
         $this->database = $database;
-
-        $translation = new Translation();
         $this->translation = $translation;
     }
 

diff --git a/src/Model/RegisterModel.php b/src/Model/RegisterModel.php
@@ -9,19 +9,17 @@
 
 namespace App\Model;
 
-use Dbm\Classes\Translation;
 use Dbm\Interfaces\DatabaseInterface;
+use Dbm\Interfaces\TranslationInterface;
 
 class RegisterModel
 {
     private $database;
     private $translation;
 
-    public function __construct(DatabaseInterface $database)
+    public function __construct(DatabaseInterface $database, TranslationInterface $translation)
     {
         $this->database = $database;
-
-        $translation = new Translation();
         $this->translation = $translation;
     }