Merge pull request #963 from kenjis/remove-deleted_at

refactor: remove unneeded deleted_at in $allowedFields
codeigniter4 · Dec 4, 2023 · 9b5c2bf · 9b5c2bf
2 parents 8de5f73 + 9f715f9
commit 9b5c2bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -311,31 +311,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Models/UserIdentityModel.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Cannot unset offset \'email\' on array\\{username\\: string, status\\: string, status_message\\: string, active\\: bool, last_active\\: string, deleted_at\\: string\\}\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Models/UserModel.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Cannot unset offset \'password_hash\' on array\\{username\\: string, status\\: string, status_message\\: string, active\\: bool, last_active\\: string, deleted_at\\: string\\}\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Models/UserModel.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,
 	'path' => __DIR__ . '/src/Models/UserModel.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Offset \'email\' does not exist on array\\{username\\: string, status\\: string, status_message\\: string, active\\: bool, last_active\\: string, deleted_at\\: string\\}\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Models/UserModel.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Offset \'password_hash\' does not exist on array\\{username\\: string, status\\: string, status_message\\: string, active\\: bool, last_active\\: string, deleted_at\\: string\\}\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Models/UserModel.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$data \\(array\\|CodeIgniter\\\\Shield\\\\Entities\\\\User\\) of method CodeIgniter\\\\Shield\\\\Models\\\\UserModel\\:\\:insert\\(\\) should be contravariant with parameter \\$data \\(array\\|object\\|null\\) of method CodeIgniter\\\\Model\\:\\:insert\\(\\)$#',
 	'count' => 1,

diff --git a/src/Models/UserModel.php b/src/Models/UserModel.php
@@ -36,7 +36,6 @@ class UserModel extends BaseModel
         'status_message',
         'active',
         'last_active',
-        'deleted_at',
     ];
     protected $useTimestamps = true;
     protected $afterFind     = ['fetchIdentities'];
@@ -205,6 +204,7 @@ public function findByCredentials(array $credentials): ?User
         }
 
         if ($email !== null) {
+            /** @var array<string, int|string|null>|null $data */
             $data = $this->select(
                 sprintf('%1$s.*, %2$s.secret as email, %2$s.secret2 as password_hash', $this->table, $this->tables['identities'])
             )