Merge pull request ludoguenet#1 from szepeviktor/fix2

Fix method calls and improve PHPStan analysis

Author: ludoguenet

phpstan.neon

@@ -3,9 +3,7 @@ includes:
 
 parameters:
     paths:
-        - src
+        - src/
+        - tests/phpstan/Users.php
 
     level: 5
-
-    ignoreErrors:
-        - '#Trait .* is used zero times and is not analysed#'

src/Models/Concerns/HasSchedules.php

@@ -19,6 +19,8 @@ trait HasSchedules
 {
     /**
      * Get all schedules for this model.
+     *
+     * @return MorphMany<Schedule, $this>
      */
     public function schedules(): MorphMany
     {
@@ -27,6 +29,8 @@ public function schedules(): MorphMany
 
     /**
      * Get only active schedules.
+     *
+     * @return MorphMany<Schedule, $this>
      */
     public function activeSchedules(): MorphMany
     {
@@ -35,6 +39,8 @@ public function activeSchedules(): MorphMany
 
     /**
      * Get schedules for a specific date.
+     *
+     * @return MorphMany<Schedule, $this>
      */
     public function schedulesForDate(string $date): MorphMany
     {
@@ -43,6 +49,8 @@ public function schedulesForDate(string $date): MorphMany
 
     /**
      * Get schedules within a date range.
+     *
+     * @return MorphMany<Schedule, $this>
      */
     public function schedulesForDateRange(string $startDate, string $endDate): MorphMany
     {
@@ -51,6 +59,8 @@ public function schedulesForDateRange(string $startDate, string $endDate): Morph
 
     /**
      * Get recurring schedules.
+     *
+     * @return MorphMany<Schedule, $this>
      */
     public function recurringSchedules(): MorphMany
     {
@@ -70,15 +80,15 @@ public function createSchedule(): ScheduleBuilder
      */
     public function hasScheduleConflict(Schedule $schedule): bool
     {
-        return app(ConflictDetectionService::class)->hasConflicts($this, $schedule);
+        return app(ConflictDetectionService::class)->hasConflicts($schedule);
     }
 
     /**
      * Find all schedules that conflict with the given schedule.
      */
     public function findScheduleConflicts(Schedule $schedule): array
     {
-        return app(ConflictDetectionService::class)->findConflicts($this, $schedule);
+        return app(ConflictDetectionService::class)->findConflicts($schedule);
     }
 
     /**

src/Models/Schedule.php

@@ -70,6 +70,8 @@ public function schedulable(): MorphTo
 
     /**
      * Get the schedule periods.
+     *
+     * @return HasMany<SchedulePeriod, $this>
      */
     public function periods(): HasMany
     {

tests/phpstan/Users.php

@@ -0,0 +1,15 @@
+<?php
+
+class Users extends \Illuminate\Database\Eloquent\Model
+{
+    use \Zap\Models\Concerns\HasSchedules;
+
+    protected $table = 'users';
+
+    protected $fillable = ['name', 'email'];
+
+    public function getKey()
+    {
+        return 1;
+    }
+}