simplify type to Authenticatable

DutchCodingCompany · Feb 27, 2024 · 423810b · 423810b
1 parent 2d4f95e
commit 423810b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2,7 +2,7 @@ parameters:
 	ignoreErrors:
 		-
 			message: "#^Property 'email' does not exist in Illuminate\\\\Contracts\\\\Auth\\\\Authenticatable&Illuminate\\\\Database\\\\Eloquent\\\\Model model\\.$#"
-			count: 1
+			count: 2
 			path: src/FilamentSocialite.php
 
 		-
@@ -16,6 +16,6 @@ parameters:
 			path: src/FilamentSocialitePlugin.php
 
 		-
-			message: "#^Property DutchCodingCompany\\\\FilamentSocialite\\\\FilamentSocialitePlugin\\:\\:\\$userModelClass \\(class\\-string\\<Illuminate\\\\Contracts\\\\Auth\\\\Authenticatable&Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\) does not accept default value of type string\\.$#"
+			message: "#^Property DutchCodingCompany\\\\FilamentSocialite\\\\FilamentSocialitePlugin\\:\\:\\$userModelClass \\(class\\-string\\<Illuminate\\\\Contracts\\\\Auth\\\\Authenticatable\\>\\) does not accept default value of type string\\.$#"
 			count: 1
 			path: src/FilamentSocialitePlugin.php
diff --git a/src/FilamentSocialite.php b/src/FilamentSocialite.php
@@ -77,14 +77,14 @@ public function getOptionalParameters(string $provider): array
     }
 
     /**
-     * @return class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     * @return class-string<\Illuminate\Contracts\Auth\Authenticatable>
      */
     public function getUserModelClass(): string
     {
         return $this->getPlugin()->getUserModelClass();
     }
 
-    public function getUserModel(): Model & Authenticatable
+    public function getUserModel(): Authenticatable
     {
         return new ($this->getUserModelClass());
     }
@@ -95,13 +95,13 @@ public function getUserModel(): Model & Authenticatable
     public function getUserResolver(): Closure
     {
         return $this->userResolver ?? function (string $provider, SocialiteUserContract $oauthUser, FilamentSocialite $socialite) {
-            /** @var \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> $query */
-            $query = $this->getUserModel()->where(
+            /** @var \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> $model */
+            $model = $this->getUserModel();
+
+            return $model->where(
                 'email',
                 $oauthUser->getEmail()
-            );
-
-            return $query->first();
+            )->first();
         };
     }
 

diff --git a/src/FilamentSocialitePlugin.php b/src/FilamentSocialitePlugin.php
@@ -26,7 +26,7 @@ class FilamentSocialitePlugin implements Plugin
     protected array $domainAllowList = [];
 
     /**
-     * @var class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     * @var class-string<\Illuminate\Contracts\Auth\Authenticatable>
      */
     protected string $userModelClass = User::class;
 
@@ -159,7 +159,7 @@ public function getDomainAllowList(): array
     }
 
     /**
-     * @param class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> $value
+     * @param class-string<\Illuminate\Contracts\Auth\Authenticatable> $value
      */
     public function setUserModelClass(string $value): static
     {
@@ -173,7 +173,7 @@ public function setUserModelClass(string $value): static
     }
 
     /**
-     * @return class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     * @return class-string<\Illuminate\Contracts\Auth\Authenticatable>
      */
     public function getUserModelClass(): string
     {