simplify phpstan (allow custom Authenticatable)

DutchCodingCompany · Jul 15, 2024 · 7b58bc6 · 7b58bc6
1 parent 757e7c2
commit 7b58bc6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Models/SocialiteUser.php b/src/Models/SocialiteUser.php
@@ -13,7 +13,6 @@
  * @property int $user_id
  * @property string $provider
  * @property int $provider_id
- * @property \Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable $user
  */
 class SocialiteUser extends Model implements FilamentSocialiteUserContract
 {
@@ -28,7 +27,10 @@ class SocialiteUser extends Model implements FilamentSocialiteUserContract
      */
     public function user(): BelongsTo
     {
-        return $this->belongsTo(FilamentSocialitePlugin::current()->getUserModelClass());
+        /** @var class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> */
+        $user = FilamentSocialitePlugin::current()->getUserModelClass();
+
+        return $this->belongsTo($user);
     }
 
     public function getUser(): Authenticatable

diff --git a/src/Traits/Models.php b/src/Traits/Models.php
@@ -11,7 +11,7 @@
 trait Models
 {
     /**
-     * @var ?class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     * @var ?class-string<\Illuminate\Contracts\Auth\Authenticatable>
      */
     protected ?string $userModelClass = null;
 
@@ -21,7 +21,7 @@ trait Models
     protected string $socialiteUserModelClass = SocialiteUser::class;
 
     /**
-     * @param class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> $value
+     * @param class-string<\Illuminate\Contracts\Auth\Authenticatable> $value
      * @throws ImplementationException
      */
     public function userModelClass(string $value): static
@@ -36,7 +36,7 @@ public function userModelClass(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
     {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -27,7 +27,7 @@
 class TestCase extends Orchestra
 {
     /**
-     * @var class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     * @var class-string<\Illuminate\Contracts\Auth\Authenticatable>
      */
     protected string $userModelClass = TestUser::class;