Update larastan

app/Http/Controllers/Api/ChoreInstanceController.php

@@ -3,11 +3,13 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Collection;
+use App\Models\Chore;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
 
 class ChoreInstanceController extends Controller
 {
+    /** @return Collection<int, Chore> */
     public function index(): Collection
     {
         return Auth::user()

app/Http/Resources/AuthUserResource.php

@@ -2,22 +2,16 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use JsonSerializable;
 
 /** @mixin \App\Models\User */
 class AuthUserResource extends JsonResource
 {
     public static $wrap = 'user';
 
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>|Arrayable|JsonSerializable
-     */
-    public function toArray(Request $request): array|Arrayable|JsonSerializable
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ChoreResource.php

@@ -2,20 +2,14 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use JsonSerializable;
 
 /** @mixin \App\Models\Chore */
 class ChoreResource extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>|Arrayable|JsonSerializable
-     */
-    public function toArray(Request $request): array|Arrayable|JsonSerializable
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/StreakCountResource.php

@@ -2,20 +2,14 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use JsonSerializable;
 
 /** @mixin \App\Models\StreakCount */
 class StreakCountResource extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>|Arrayable|JsonSerializable
-     */
-    public function toArray(Request $request): array|Arrayable|JsonSerializable
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/UserResource.php

@@ -2,20 +2,14 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use JsonSerializable;
 
 /** @mixin \App\Models\User */
 class UserResource extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>|Arrayable|JsonSerializable
-     */
-    public function toArray(Request $request): array|Arrayable|JsonSerializable
+    /** @return array<string, mixed> */
+    public function toArray(Request $request): array
     {
         return [
             'id' => $this->id,

app/Livewire/CalendarTokens/Index.php

@@ -13,6 +13,7 @@ class Index extends Component
 {
     public CalendarToken $form;
 
+    /** @var Collection<int, ModelsCalendarToken> */
     public Collection $calendar_tokens;
 
     /** @var array<array<string, mixed>> */

app/Livewire/Chores/Index.php

@@ -12,6 +12,7 @@ class Index extends Component
 {
     use FiltersByTeamOrUser;
 
+    /** @var Collection<int, Chore> */
     public Collection $chores;
 
     public string $sort = 'chore_instances.due_date';

app/Livewire/Chores/Show.php

@@ -20,6 +20,7 @@ class Show extends Component
 
     public ?ChoreInstance $chore_instance;
 
+    /** @var Collection<int, ChoreInstance> */
     public Collection $past_chore_instances;
 
     public bool $showDeleteConfirmation = false;

app/Models/CalendarToken.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Illuminate\Contracts\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -80,6 +80,7 @@ public static function getToken(string $token): ?self
         return self::firstWhere('token', $token);
     }
 
+    /** @return HasManyThrough<Chore> */
     public function chores(): HasManyThrough
     {
         return $this->is_user_calendar
@@ -101,7 +102,8 @@ public function chores(): HasManyThrough
             );
     }
 
-    public function choreInstances(): Builder
+    /** @return Builder<ChoreInstance>|HasManyThrough<ChoreInstance> */
+    public function choreInstances(): Builder|HasManyThrough
     {
         return $this->is_user_calendar
             ? $this->hasManyThrough(
@@ -122,11 +124,13 @@ public function choreInstances(): Builder
                 ->orderBy('chore_instances.due_date');
     }
 
+    /** @return BelongsTo<User, self> */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
+    /** @return BelongsTo<Team, self> */
     public function team(): BelongsTo
     {
         return $this->belongsTo(Team::class);

app/Models/Chore.php

@@ -83,28 +83,33 @@ class Chore extends Model
         'frequency_id' => FrequencyType::class,
     ];
 
+    /** @return BelongsTo<User, self> */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
+    /** @return BelongsTo<Team, self> */
     public function team(): BelongsTo
     {
         return $this->belongsTo(Team::class);
     }
 
+    /** @return HasMany<ChoreInstance> */
     public function choreInstances(): HasMany
     {
         return $this->hasMany(ChoreInstance::class);
     }
 
+    /** @return HasOne<ChoreInstance> */
     public function nextChoreInstance(): HasOne
     {
         return $this
             ->hasOne(ChoreInstance::class)
             ->whereNull('completed_date');
     }
 
+    /** @return HasOne<ChoreInstance> */
     public function nextInstance(): HasOne
     {
         return $this->nextChoreInstance();
@@ -119,6 +124,7 @@ public function getFrequencyAttribute(): Frequency
         );
     }
 
+    /** @return HasMany<ChoreInstance> */
     public function pastChoreInstances(): HasMany
     {
         return $this->hasMany(ChoreInstance::class)

app/Models/ChoreInstance.php

@@ -65,16 +65,19 @@ public function complete(?int $for = null, ?Carbon $on = null): void
         $this->chore->createNewInstance($this->completed_date);
     }
 
+    /** @return BelongsTo<Chore, self> */
     public function chore(): BelongsTo
     {
         return $this->belongsTo(Chore::class);
     }
 
+    /** @return BelongsTo<User, self> */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
+    /** @return BelongsTo<User, self> */
     public function completedBy(): BelongsTo
     {
         return $this->belongsTo(User::class, 'completed_by_id');
@@ -85,24 +88,28 @@ public function getIsCompletedAttribute(): bool
         return ! is_null($this->completed_date);
     }
 
-    public function scopeCompleted(Builder $query): Builder
+    /** @param Builder<self> $query */
+    public function scopeCompleted(Builder $query): void
     {
-        return $query->whereNotNull('completed_date');
+        $query->whereNotNull('completed_date');
     }
 
-    public function scopeNotCompleted(Builder $query): Builder
+    /** @param Builder<self> $query */
+    public function scopeNotCompleted(Builder $query): void
     {
-        return $query->whereNull('completed_date');
+        $query->whereNull('completed_date');
     }
 
-    public function scopeDueToday(Builder $query): Builder
+    /** @param Builder<self> $query */
+    public function scopeDueToday(Builder $query): void
     {
-        return $query->where('due_date', today());
+        $query->where('due_date', today());
     }
 
-    public function scopeDueTodayOrPast(Builder $query): Builder
+    /** @param Builder<self> $query */
+    public function scopeDueTodayOrPast(Builder $query): void
     {
-        return $query->where('due_date', '<=', today());
+        $query->where('due_date', '<=', today());
     }
 
     public function snooze(Carbon $nextDueDate): void

app/Models/Concerns/HasChoreStreaks.php

@@ -7,6 +7,7 @@
 
 trait HasChoreStreaks
 {
+    /** @return HasOne<StreakCount> */
     public function currentStreak(): HasOne
     {
         return $this->hasOne(StreakCount::class)->whereNull('ended_at');

app/Models/Concerns/HasUnfinishedChoreScopes.php

@@ -5,28 +5,34 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 
+/**
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ */
 trait HasUnfinishedChoreScopes
 {
+    /** @param Builder<TModel> $query */
     public function scopeWithUnfinishedChores(
         Builder $query,
         ?Carbon $on_or_before = null
-    ): Builder {
-        return $query->whereHas(
+    ): void {
+        $query->whereHas(
             'choreInstances',
             fn ($q) => $this->uncompletedChores($q, $on_or_before)
         );
     }
 
+    /** @param Builder<TModel> $query */
     public function scopeWithoutUnfinishedChores(
         Builder $query,
         ?Carbon $on_or_before = null
-    ): Builder {
-        return $query->whereDoesntHave(
+    ): void {
+        $query->whereDoesntHave(
             'choreInstances',
             fn ($q) => $this->uncompletedChores($q, $on_or_before)
         );
     }
 
+    /** @param Builder<TModel> $query */
     protected function uncompletedChores(
         Builder $query,
         ?Carbon $on_or_before = null

app/Models/DeviceToken.php

@@ -19,6 +19,7 @@ class DeviceToken extends Model
         'updated_at' => 'datetime',
     ];
 
+    /** @return BelongsTo<User, self> */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);

app/Models/StreakCount.php

@@ -41,18 +41,21 @@ class StreakCount extends Model
 
     protected $guarded;
 
+    /** @return BelongsTo<User, self> */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
+    /** @return BelongsTo<Team, self> */
     public function team(): BelongsTo
     {
         return $this->belongsTo(Team::class);
     }
 
-    public function scopeCurrent(Builder $query): Builder
+    /** @param Builder<self> $query */
+    public function scopeCurrent(Builder $query): void
     {
-        return $query->whereNull('ended_at');
+        $query->whereNull('ended_at');
     }
 }

app/Models/Team.php

@@ -51,6 +51,8 @@ class Team extends JetstreamTeam
 {
     use HasChoreStreaks;
     use HasFactory;
+
+    /** @use HasUnfinishedChoreScopes<self> */
     use HasUnfinishedChoreScopes;
 
     public static ?Team $admin_team = null;
@@ -78,11 +80,13 @@ public static function adminTeam(): ?self
         return self::$admin_team;
     }
 
+    /** @return HasMany<Chore> */
     public function chores(): HasMany
     {
         return $this->hasMany(Chore::class);
     }
 
+    /** @return HasManyThrough<ChoreInstance> */
     public function choreInstances(): HasManyThrough
     {
         return $this->hasManyThrough(ChoreInstance::class, Chore::class);

app/Models/TeamInvitation.php

@@ -37,9 +37,7 @@ class TeamInvitation extends JetstreamTeamInvitation
         'role',
     ];
 
-    /**
-     * Get the team that the invitation belongs to.
-     */
+    /** @return BelongsTo<Team, self> */
     public function team(): BelongsTo
     {
         return $this->belongsTo(Jetstream::teamModel());