refactor: use CheckQueryReturnTrait in BaseModel

Author: kenjis

src/Models/CheckQueryReturnTrait.php

@@ -10,12 +10,12 @@
 
 trait CheckQueryReturnTrait
 {
-    private ?bool $currentDBDebug = null;
+    protected ?bool $currentDBDebug = null;
 
     /**
      * @param bool|int|string $return insert() returns insert ID.
      */
-    private function checkQueryReturn($return): void
+    protected function checkQueryReturn($return): void
     {
         $this->restoreDBDebug();
 
@@ -30,7 +30,7 @@ private function checkQueryReturn($return): void
         }
     }
 
-    private function checkValidationError(): void
+    protected function checkValidationError(): void
     {
         $validationErrors = $this->getValidationErrors();
 
@@ -50,14 +50,14 @@ private function checkValidationError(): void
      *
      * @return string[]
      */
-    private function getValidationErrors(): array
+    protected function getValidationErrors(): array
     {
         // @TODO When CI v4.3 is released, you don't need this hack.
         //       See https://github.com/codeigniter4/CodeIgniter4/pull/6384
         return $this->getValidationPropertyErrors();
     }
 
-    private function getValidationPropertyErrors(): array
+    protected function getValidationPropertyErrors(): array
     {
         $refClass    = new ReflectionObject($this->validation);
         $refProperty = $refClass->getProperty('errors');
@@ -66,7 +66,7 @@ private function getValidationPropertyErrors(): array
         return $refProperty->getValue($this->validation);
     }
 
-    private function disableDBDebug(): void
+    protected function disableDBDebug(): void
     {
         if (! $this->db->DBDebug) {
             // `DBDebug` is false. Do nothing.
@@ -79,7 +79,7 @@ private function disableDBDebug(): void
         $propertyDBDebug->setValue($this->db, false);
     }
 
-    private function restoreDBDebug(): void
+    protected function restoreDBDebug(): void
     {
         if ($this->currentDBDebug === null) {
             // `DBDebug` has not been changed. Do nothing.
@@ -92,7 +92,7 @@ private function restoreDBDebug(): void
         $this->currentDBDebug = null;
     }
 
-    private function getPropertyDBDebug(): ReflectionProperty
+    protected function getPropertyDBDebug(): ReflectionProperty
     {
         $refClass    = new ReflectionObject($this->db);
         $refProperty = $refClass->getProperty('DBDebug');

src/Models/GroupModel.php

@@ -8,8 +8,6 @@
 
 class GroupModel extends BaseModel
 {
-    use CheckQueryReturnTrait;
-
     protected $primaryKey     = 'id';
     protected $returnType     = 'array';
     protected $useSoftDeletes = false;

src/Models/LoginModel.php

@@ -6,15 +6,12 @@
 
 use CodeIgniter\I18n\Time;
 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 BaseModel
 {
-    use CheckQueryReturnTrait;
-
     protected $primaryKey     = 'id';
     protected $returnType     = Login::class;
     protected $useSoftDeletes = false;

src/Models/PermissionModel.php

@@ -8,8 +8,6 @@
 
 class PermissionModel extends BaseModel
 {
-    use CheckQueryReturnTrait;
-
     protected $primaryKey     = 'id';
     protected $returnType     = 'array';
     protected $useSoftDeletes = false;

src/Models/RememberModel.php

@@ -5,16 +5,13 @@
 namespace CodeIgniter\Shield\Models;
 
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\User;
 use DateTime;
 use Faker\Generator;
 use stdClass;
 
 class RememberModel extends BaseModel
 {
-    use CheckQueryReturnTrait;
-
     protected $primaryKey     = 'id';
     protected $returnType     = 'object';
     protected $useSoftDeletes = false;

src/Models/UserIdentityModel.php

@@ -5,11 +5,9 @@
 namespace CodeIgniter\Shield\Models;
 
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Model;
 use CodeIgniter\Shield\Authentication\Authenticators\AccessTokens;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
 use CodeIgniter\Shield\Authentication\Passwords;
-use CodeIgniter\Shield\Config\Auth;
 use CodeIgniter\Shield\Entities\AccessToken;
 use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Shield\Entities\UserIdentity;
@@ -19,8 +17,6 @@
 
 class UserIdentityModel extends BaseModel
 {
-    use CheckQueryReturnTrait;
-
     protected $primaryKey     = 'id';
     protected $returnType     = UserIdentity::class;
     protected $useSoftDeletes = false;

src/Models/UserModel.php

@@ -6,7 +6,6 @@
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Model;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
 use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Shield\Entities\UserIdentity;
@@ -19,8 +18,6 @@
  */
 class UserModel extends BaseModel
 {
-    use CheckQueryReturnTrait;
-
     protected $primaryKey     = 'id';
     protected $returnType     = User::class;
     protected $useSoftDeletes = true;