fix phpstan errors

DutchCodingCompany · Jul 15, 2024 · 757e7c2 · 757e7c2
1 parent 28c6b82
commit 757e7c2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 34 deletions.
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: src/FilamentSocialitePlugin.php
 
-		-
-			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
-
 		-
 			message: "#^Parameter \\#1 \\$value of method DutchCodingCompany\\\\FilamentSocialite\\\\Http\\\\Controllers\\\\SocialiteLoginController\\:\\:evaluate\\(\\) expects bool\\|\\(callable\\(\\)\\: bool\\), bool\\|\\(Closure\\(string, Laravel\\\\Socialite\\\\Contracts\\\\User, Illuminate\\\\Contracts\\\\Auth\\\\Authenticatable\\|null\\)\\: bool\\) given\\.$#"
 			count: 1

diff --git a/src/Models/SocialiteUser.php b/src/Models/SocialiteUser.php
@@ -5,7 +5,6 @@
 use DutchCodingCompany\FilamentSocialite\FilamentSocialitePlugin;
 use DutchCodingCompany\FilamentSocialite\Models\Contracts\FilamentSocialiteUser as FilamentSocialiteUserContract;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Laravel\Socialite\Contracts\User as SocialiteUserContract;
@@ -14,19 +13,18 @@
  * @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
 {
-    use HasFactory;
-
     protected $fillable = [
         'user_id',
         'provider',
         'provider_id',
     ];
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable, self>
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\Illuminate\Database\Eloquent\Model, $this>
      */
     public function user(): BelongsTo
     {

diff --git a/src/Traits/Models.php b/src/Traits/Models.php
@@ -11,17 +11,17 @@
 trait Models
 {
     /**
-     * @var class-string<\Illuminate\Contracts\Auth\Authenticatable>
+     * @var ?class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
      */
-    protected string $userModelClass = User::class;
+    protected ?string $userModelClass = null;
 
     /**
      * @var class-string<\DutchCodingCompany\FilamentSocialite\Models\Contracts\FilamentSocialiteUser>
      */
     protected string $socialiteUserModelClass = SocialiteUser::class;
 
     /**
-     * @param class-string<\Illuminate\Contracts\Auth\Authenticatable> $value
+     * @param class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> $value
      * @throws ImplementationException
      */
     public function userModelClass(string $value): static
@@ -36,11 +36,14 @@ public function userModelClass(string $value): static
     }
 
     /**
-     * @return class-string<\Illuminate\Contracts\Auth\Authenticatable>
+     * @return class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
      */
     public function getUserModelClass(): string
     {
-        return $this->userModelClass;
+        /** @var class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> */
+        $user = User::class;
+
+        return $this->userModelClass ?? $user;
     }
 
     /**

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