Finish.

Author: inpour

core/Application.php

@@ -3,6 +3,9 @@
 namespace app\core;
 
 
+use app\core\db\Database;
+use app\core\db\DbModel;
+
 class Application
 {
     public static string $ROOT_DIR;
@@ -15,7 +18,7 @@ class Application
     public Database $db;
     public Session $session;
     public View $view;
-    public ?Dbmodel $user;
+    public ?UserModel $user;
 
     public static Application $app;
     public ?Controller $controller = null;
@@ -65,7 +68,7 @@ public function setController(): Controller
         return $this->controller;
     }
 
-    public function login(DbModel $user): bool
+    public function login(UserModel $user): bool
     {
         $this->user = $user;
         $primaryKey = $user->primaryKey();

core/UserModel.php

@@ -2,6 +2,8 @@
 
 namespace app\core;
 
+use app\core\db\DbModel;
+
 abstract class UserModel extends DbModel
 {
     abstract public function getDisplayName(): string;

core/Database.php renamed to core/db/Database.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace app\core;
+namespace app\core\db;
+
+use app\core\Application;
 
 class Database
 {

core/DbModel.php renamed to core/db/DbModel.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace app\core;
+namespace app\core\db;
+
+use app\core\Application;
+use app\core\Model;
 
 abstract class DbModel extends Model
 {

traits/ValidatePath.php

@@ -4,7 +4,7 @@
 
 trait ValidatePath
 {
-    public function validatePath($path)
+    public function validatePath(string $path): string
     {
         // If path ends with /, remove / from end
         if ($path[-1] === '/')

views/login.php

@@ -9,8 +9,8 @@
 
 <?php $form = \app\core\form\From::begin('/login', 'post') ?>
 
-    <?php echo $form->input($model, 'email'); ?>
-    <?php echo $form->input($model, 'password')->passwordField(); ?>
+    <?php echo $form->input($model, 'email', 'text'); ?>
+    <?php echo $form->input($model, 'password', 'password'); ?>
 
     <div class="mb-3 form-group">
         <button type="submit" class="btn btn-primary">Submit</button>