Larastan 3.x and fixes for the phpstan errors

composer.json

@@ -21,14 +21,14 @@
     "require": {
         "php": "^8.2",
         "doctrine/dbal": "^3.6",
-        "filament/filament": "^3.2.23",
+        "filament/filament": "^3.2.57",
         "filament/spatie-laravel-settings-plugin": "^3.2",
         "guzzlehttp/guzzle": "^7.8",
-        "illuminate/console": "^11.0",
-        "illuminate/database": "^11.0",
-        "illuminate/events": "^11.0",
-        "illuminate/queue": "^11.0",
-        "illuminate/support": "^11.0",
+        "illuminate/console": "^11.23.0",
+        "illuminate/database": "^11.23.0",
+        "illuminate/events": "^11.23.0",
+        "illuminate/queue": "^11.23.0",
+        "illuminate/support": "^11.23.0",
         "nesbot/carbon": "^2.70",
         "spatie/laravel-data": "^4.11",
         "spatie/laravel-query-builder": "^5.5",
@@ -37,7 +37,7 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "larastan/larastan": "^2.9",
+        "larastan/larastan": "^3.0",
         "laravel/pail": "^1.1",
         "orchestra/testbench": "^9.5.1",
         "pestphp/pest": "^3.2",

config/cachet.php

@@ -33,7 +33,7 @@
      | This is the model that will be used to authenticate users. This model
      | must be an instance of Illuminate\Foundation\Auth\User.
      */
-    'user_model' => App\Models\User::class,
+    'user_model' => \App\Models\User::class,
 
     /*
      |--------------------------------------------------------------------------

database/seeders/DatabaseSeeder.php

@@ -82,18 +82,21 @@ public function run(): void
             'visible' => ResourceVisibilityEnum::guest,
         ]);
 
+        /** @phpstan-ignore-next-line argument.type Larastan bug */
         $componentGroup->components()->createMany([
             [
                 'name' => 'Cachet Website',
                 'description' => 'The Cachet website.',
                 'link' => 'https://cachethq.io',
                 'status' => ComponentStatusEnum::operational,
-            ], [
+            ],
+            [
                 'name' => 'Cachet Documentation',
                 'description' => 'The Cachet docs, powered by Mintlify.',
                 'link' => 'https://docs.cachethq.io',
                 'status' => ComponentStatusEnum::operational,
-            ], [
+            ],
+            [
                 'name' => 'Cachet Blog',
                 'description' => 'Learn more about Cachet.',
                 'link' => 'https://blog.cachethq.io',

phpstan.neon.dist

@@ -1,14 +1,12 @@
 includes:
     - vendor/larastan/larastan/extension.neon
-    - phpstan-baseline.neon
 
 parameters:
     level: 5
 
     paths:
         - src
         - routes
-        - config
         - database/factories
         - database/seeders
 
@@ -18,4 +16,10 @@ parameters:
         - public
 
     databaseMigrationsPath:
-            - database/migrations
+        - database/migrations
+
+    ignoreErrors:
+        -
+            path: src/Http/Resources
+            identifier: return.type
+            message: '#Method Cachet\\Http\\Resources\\.*?::toRelationships\(\).*#'

src/Actions/Metric/CreateMetricPoint.php

@@ -16,16 +16,16 @@ public function handle(Metric $metric, ?CreateMetricPointData $data = null): Met
         $lastPoint = $metric->metricPoints()->latest()->first();
 
         // If the last point was created within the threshold, increment the counter.
-        if ($lastPoint && $lastPoint->withinThreshold($metric->threshold, $data?->timestamp ?? null)) {
+        if ($lastPoint && $lastPoint->withinThreshold($metric->threshold, $data->timestamp ?? null)) {
             $lastPoint->increment('counter');
 
             return $lastPoint;
         }
 
         return $metric->metricPoints()->create([
-            'value' => $data?->value ?? $metric->default_value,
+            'value' => $data->value ?? $metric->default_value,
             'counter' => 1,
-            'created_at' => $data?->timestamp ?? now(),
+            'created_at' => $data->timestamp ?? now(),
         ]);
     }
 }

src/Enums/ComponentGroupVisibilityEnum.php

@@ -21,7 +21,7 @@ public function getLabel(): string
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::expanded => 'heroicon-o-chevron-down',
@@ -30,7 +30,7 @@ public function getIcon(): ?string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): string
     {
         return 'gray';
     }

src/Enums/ComponentStatusEnum.php

@@ -35,7 +35,7 @@ public function getLabel(): string
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::operational => 'cachet-circle-check',
@@ -46,7 +46,7 @@ public function getIcon(): ?string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): array
     {
         return match ($this) {
             self::operational => Color::Green,

src/Enums/ExternalProviderEnum.php

@@ -11,12 +11,12 @@ enum ExternalProviderEnum: string
      */
     public function status(mixed $status): IncidentStatusEnum
     {
-        if ($this === self::OhDear) {
-            return match ($status) {
+        return match ($this) {
+            self::OhDear => match ($status) {
                 'resolved' => IncidentStatusEnum::fixed,
                 'warning' => IncidentStatusEnum::investigating,
                 default => IncidentStatusEnum::unknown,
-            };
-        }
+            },
+        };
     }
 }

src/Enums/IncidentStatusEnum.php

@@ -46,7 +46,7 @@ public function getLabel(): string
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::investigating => 'cachet-incident-investigating',
@@ -57,7 +57,7 @@ public function getIcon(): ?string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): array
     {
         return match ($this) {
             self::investigating => Color::Blue,

src/Enums/IncidentTemplateEngineEnum.php

@@ -12,23 +12,23 @@ enum IncidentTemplateEngineEnum: string implements HasColor, HasIcon, HasLabel
     case blade = 'blade';
     case twig = 'twig';
 
-    public function getColor(): string|array|null
+    public function getColor(): array
     {
         return match ($this) {
             self::blade => Color::rgb('rgb(249, 50, 44)'),
             self::twig => Color::Zinc,
         };
     }
 
-    public function getLabel(): ?string
+    public function getLabel(): string
     {
         return match ($this) {
             self::blade => __('Laravel Blade'),
             self::twig => __('Twig'),
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::blade => 'cachet-laravel',

src/Enums/MetricTypeEnum.php

@@ -10,15 +10,15 @@ enum MetricTypeEnum: int implements HasIcon, HasLabel
     case sum = 0;
     case average = 1;
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::sum => 'cachet-metrics',
             self::average => 'cachet-metrics',
         };
     }
 
-    public function getLabel(): ?string
+    public function getLabel(): string
     {
         return match ($this) {
             self::sum => __('Sum'),

src/Enums/MetricViewEnum.php

@@ -23,7 +23,7 @@ public function getLabel(): string
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::last_hour => 'cachet-metrics',
@@ -33,7 +33,7 @@ public function getIcon(): ?string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): string
     {
         return 'info';
     }

src/Enums/ResourceVisibilityEnum.php

@@ -22,7 +22,7 @@ public static function visibleToUsers(): array
         return [self::authenticated, self::guest];
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::authenticated => 'heroicon-o-lock-closed',
@@ -31,7 +31,7 @@ public function getIcon(): ?string
         };
     }
 
-    public function getLabel(): ?string
+    public function getLabel(): string
     {
         return match ($this) {
             self::authenticated => __('Users'),
@@ -40,7 +40,7 @@ public function getLabel(): ?string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): string
     {
         return match ($this) {
             self::authenticated => 'warning',

src/Enums/ScheduleStatusEnum.php

@@ -44,7 +44,7 @@ public function getLabel(): string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): array
     {
         return match ($this) {
             self::upcoming => Color::Blue,
@@ -53,7 +53,7 @@ public function getColor(): string|array|null
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::complete => 'cachet-circle-check',

src/Enums/SystemStatusEnum.php

@@ -13,7 +13,7 @@ enum SystemStatusEnum implements HasColor, HasIcon, HasLabel
     case partial_outage;
     case major_outage;
 
-    public function getLabel(): ?string
+    public function getLabel(): string
     {
         return match ($this) {
             self::operational => __('All systems are operational.'),
@@ -22,7 +22,7 @@ public function getLabel(): ?string
         };
     }
 
-    public function getColor(): string|array|null
+    public function getColor(): array
     {
         return match ($this) {
             self::operational => Color::Green,
@@ -31,7 +31,7 @@ public function getColor(): string|array|null
         };
     }
 
-    public function getIcon(): ?string
+    public function getIcon(): string
     {
         return match ($this) {
             self::operational => 'heroicon-m-check-circle',

src/Http/Controllers/Api/IncidentController.php

@@ -42,10 +42,12 @@ class IncidentController extends Controller
      */
     public function index()
     {
-        $incidents = QueryBuilder::for(Incident::class)
+        $query = Incident::query()
             ->when(! request('sort'), function (Builder $builder) {
                 $builder->orderByDesc('created_at');
-            })
+            });
+
+        $incidents = QueryBuilder::for($query)
             ->allowedIncludes(self::ALLOWED_INCLUDES)
             ->allowedFilters(['name', 'status', 'occurred_at'])
             ->allowedSorts(['name', 'status', 'id'])