fix: depend on Authenticatable, not User

Author: kenjis

src/Authentication/Authenticators/AccessTokens.php

@@ -227,7 +227,7 @@ public function getBearerToken(): ?string
      */
     public function recordActive(): void
     {
-        if (! $this->user instanceof User) {
+        if (! $this->user instanceof Authenticatable) {
             throw new InvalidArgumentException(self::class . '::recordActive() requires logged in user before calling.');
         }
 

src/Authentication/Authenticators/Session.php

@@ -172,13 +172,7 @@ public function loggedIn(): bool
      */
     public function login(Authenticatable $user): bool
     {
-        /**
-         * @todo Authenticatable should define getEmailIdentity() or this should require User
-         */
-        if (! $user instanceof User) {
-            throw new InvalidArgumentException(self::class . '::login() only accepts Shield User');
-        }
-
+        // @todo Authenticatable should define getEmailIdentity() or this should require User
         $this->user = $user;
 
         // Update the user's last used date on their password identity.
@@ -297,7 +291,7 @@ public function getUser(): ?Authenticatable
      */
     public function recordActive(): void
     {
-        if (! $this->user instanceof User) {
+        if (! $this->user instanceof Authenticatable) {
             throw new InvalidArgumentException(self::class . '::recordActive() requires logged in user before calling.');
         }
 

src/Controllers/RegisterController.php

@@ -6,6 +6,7 @@
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\Shield\Entities\User;
+use CodeIgniter\Shield\Interfaces\Authenticatable;
 use CodeIgniter\Shield\Interfaces\UserProvider;
 use CodeIgniter\Validation\Validation;
 
@@ -115,7 +116,7 @@ protected function getUserProvider(): UserProvider
     /**
      * Returns the Entity class that should be used
      */
-    protected function getUserEntity(): User
+    protected function getUserEntity(): Authenticatable
     {
         return new User();
     }

src/Models/UserModel.php

@@ -5,6 +5,7 @@
 use CodeIgniter\Model;
 use CodeIgniter\Shield\Authentication\Traits\UserProvider as UserProviderTrait;
 use CodeIgniter\Shield\Entities\User;
+use CodeIgniter\Shield\Interfaces\Authenticatable;
 use CodeIgniter\Shield\Interfaces\UserProvider;
 use Faker\Generator;
 use InvalidArgumentException;
@@ -101,7 +102,7 @@ protected function fetchIdentities(array $data): array
      * Adds a user to the default group.
      * Used during registration.
      */
-    public function addToDefaultGroup(User $user): void
+    public function addToDefaultGroup(Authenticatable $user): void
     {
         $defaultGroup  = setting('AuthGroups.defaultGroup');
         $allowedGroups = array_keys(setting('AuthGroups.groups'));

src/Test/AuthenticationTesting.php

@@ -3,6 +3,7 @@
 namespace CodeIgniter\Shield\Test;
 
 use CodeIgniter\Shield\Entities\User;
+use CodeIgniter\Shield\Interfaces\Authenticatable;
 
 /**
  * Trait AuthenticationTesting
@@ -16,7 +17,7 @@ trait AuthenticationTesting
      *
      * @return $this
      */
-    public function actingAs(User $user)
+    public function actingAs(Authenticatable $user)
     {
         // Ensure the helper is loaded during tests.
         helper('auth');