refactor: extract BaseModel

Author: kenjis

src/Models/BaseModel.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodeIgniter\Shield\Models;
+
+use CodeIgniter\Model;
+use CodeIgniter\Shield\Config\Auth;
+
+abstract class BaseModel extends Model
+{
+    use CheckQueryReturnTrait;
+
+    /**
+     * Auth Table names
+     */
+    protected array $tables;
+
+    protected function initialize(): void
+    {
+        /** @var Auth $authConfig */
+        $authConfig = config('Auth');
+
+        $this->tables = $authConfig->tables;
+    }
+}

src/Models/GroupModel.php

@@ -4,11 +4,9 @@
 
 namespace CodeIgniter\Shield\Models;
 
-use CodeIgniter\Model;
-use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\User;
 
-class GroupModel extends Model
+class GroupModel extends BaseModel
 {
     use CheckQueryReturnTrait;
 
@@ -27,10 +25,9 @@ class GroupModel extends Model
 
     protected function initialize(): void
     {
-        /** @var Auth $authConfig */
-        $authConfig = config('Auth');
+        parent::initialize();
 
-        $this->table = $authConfig->tables['groups_users'];
+        $this->table = $this->tables['groups_users'];
     }
 
     public function getForUser(User $user): array

src/Models/LoginModel.php

@@ -5,14 +5,13 @@
 namespace CodeIgniter\Shield\Models;
 
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Model;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
 use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\Login;
 use CodeIgniter\Shield\Entities\User;
 use Faker\Generator;
 
-class LoginModel extends Model
+class LoginModel extends BaseModel
 {
     use CheckQueryReturnTrait;
 
@@ -42,10 +41,9 @@ class LoginModel extends Model
 
     protected function initialize(): void
     {
-        /** @var Auth $authConfig */
-        $authConfig = config('Auth');
+        parent::initialize();
 
-        $this->table = $authConfig->tables['logins'];
+        $this->table = $this->tables['logins'];
     }
 
     /**

src/Models/PermissionModel.php

@@ -4,11 +4,9 @@
 
 namespace CodeIgniter\Shield\Models;
 
-use CodeIgniter\Model;
-use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\User;
 
-class PermissionModel extends Model
+class PermissionModel extends BaseModel
 {
     use CheckQueryReturnTrait;
 
@@ -27,10 +25,9 @@ class PermissionModel extends Model
 
     protected function initialize(): void
     {
-        /** @var Auth $authConfig */
-        $authConfig = config('Auth');
+        parent::initialize();
 
-        $this->table = $authConfig->tables['permissions_users'];
+        $this->table = $this->tables['permissions_users'];
     }
 
     public function getForUser(User $user): array

src/Models/RememberModel.php

@@ -5,14 +5,13 @@
 namespace CodeIgniter\Shield\Models;
 
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Model;
 use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\User;
 use DateTime;
 use Faker\Generator;
 use stdClass;
 
-class RememberModel extends Model
+class RememberModel extends BaseModel
 {
     use CheckQueryReturnTrait;
 
@@ -29,10 +28,9 @@ class RememberModel extends Model
 
     protected function initialize(): void
     {
-        /** @var Auth $authConfig */
-        $authConfig = config('Auth');
+        parent::initialize();
 
-        $this->table = $authConfig->tables['remember_tokens'];
+        $this->table = $this->tables['remember_tokens'];
     }
 
     public function fake(Generator &$faker): stdClass

src/Models/TokenLoginModel.php

@@ -5,18 +5,16 @@
 namespace CodeIgniter\Shield\Models;
 
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\Login;
 use Faker\Generator;
 
 class TokenLoginModel extends LoginModel
 {
     protected function initialize(): void
     {
-        /** @var Auth $authConfig */
-        $authConfig = config('Auth');
+        parent::initialize();
 
-        $this->table = $authConfig->tables['token_logins'];
+        $this->table = $this->tables['token_logins'];
     }
 
     /**

src/Models/UserIdentityModel.php

@@ -17,7 +17,7 @@
 use CodeIgniter\Shield\Exceptions\ValidationException;
 use Faker\Generator;
 
-class UserIdentityModel extends Model
+class UserIdentityModel extends BaseModel
 {
     use CheckQueryReturnTrait;
 
@@ -39,10 +39,9 @@ class UserIdentityModel extends Model
 
     protected function initialize(): void
     {
-        /** @var Auth $authConfig */
-        $authConfig = config('Auth');
+        parent::initialize();
 
-        $this->table = $authConfig->tables['identities'];
+        $this->table = $this->tables['identities'];
     }
 
     /**