fix: phpstan

Author: Ark4ne

src/Descriptors/Relations/Relation.php

@@ -68,9 +68,9 @@ public function whenIncluded(): static
      *
      * @param string|null $relation
      *
-     * @return $this
+     * @return static
      */
-    public function whenLoaded(string $relation = null): static
+    public function whenLoaded(string $relation = null): self
     {
         return $this->when(fn(
             Request $request,
@@ -85,9 +85,9 @@ public function whenLoaded(string $relation = null): static
      * @param string      $table
      * @param string|null $accessor
      *
-     * @return $this
+     * @return static
      */
-    public function whenPivotLoaded(string $table, string $accessor = null): static
+    public function whenPivotLoaded(string $table, string $accessor = null): self
     {
         return $this->when(fn(
             Request $request,

src/Resources/Concerns/ConditionallyLoadsAttributes.php

@@ -13,13 +13,13 @@ trait ConditionallyLoadsAttributes
     /**
      * Retrieve a relationship if it has been present in fields.
      *
-     * @template T
+     * @template K
      *
      * @param \Illuminate\Http\Request $request
      * @param string                   $attribute
-     * @param T                        $value
+     * @param K                        $value
      *
-     * @return \Illuminate\Http\Resources\MissingValue|T
+     * @return \Illuminate\Http\Resources\MissingValue|K
      */
     protected function whenInFields(Request $request, string $attribute, mixed $value)
     {
@@ -29,13 +29,13 @@ protected function whenInFields(Request $request, string $attribute, mixed $valu
     /**
      * Retrieve a relationship if it has been included.
      *
-     * @template T
+     * @template K
      *
      * @param \Illuminate\Http\Request $request
      * @param string                   $type
-     * @param T                        $value
+     * @param K                        $value
      *
-     * @return \Illuminate\Http\Resources\MissingValue|T
+     * @return \Illuminate\Http\Resources\MissingValue|K
      */
     protected function whenIncluded(Request $request, string $type, mixed $value)
     {

src/Resources/Concerns/Links.php

@@ -29,9 +29,9 @@ protected function toLinks(Request $request): ?iterable
     /**
      * @param \Illuminate\Http\Request $request
      *
-     * @return array<string, mixed>|null
+     * @return array<string, mixed>
      */
-    private function requestedLinks(Request $request): ?array
+    private function requestedLinks(Request $request): array
     {
         return $this->prepareData($request, $this->toLinks($request));
     }

src/Resources/Concerns/Meta.php

@@ -43,19 +43,19 @@ protected function toMeta(Request $request): ?iterable
     /**
      * @param \Illuminate\Http\Request $request
      *
-     * @return array<string, mixed>|null
+     * @return array<string, mixed>
      */
-    private function requestedResourceMeta(Request $request): ?array
+    private function requestedResourceMeta(Request $request): array
     {
         return $this->prepareData($request, $this->toResourceMeta($request));
     }
 
     /**
      * @param \Illuminate\Http\Request $request
      *
-     * @return array<string, mixed>|null
+     * @return array<string, mixed>
      */
-    private function requestedMeta(Request $request): ?array
+    private function requestedMeta(Request $request): array
     {
         return $this->prepareData($request, $this->toMeta($request));
     }

src/Resources/Concerns/PrepareData.php

@@ -12,10 +12,11 @@ trait PrepareData
     use Resolver;
 
     /**
-     * @template TKey extends array-key
+     * @template TKey as array-key
      * @template TValue
      *
-     * @param iterable<TKey, TValue> $data
+     * @param \Illuminate\Http\Request    $request
+     * @param iterable<TKey, TValue>|null $data
      *
      * @return iterable<TKey, TValue>
      */
@@ -25,7 +26,7 @@ protected function prepareData(Request $request, ?iterable $data): iterable
     }
 
     /**
-     * @template TKey extends array-key
+     * @template TKey as array-key
      * @template TValue
      *
      * @param iterable<TKey, TValue> $data

tests/app/Http/Resources/PostResource.php

@@ -42,7 +42,7 @@ protected function toRelationships(Request $request): iterable
                 'self' => "https://api.example.com/posts/{$this->resource->id}/relationships/comments",
                 'related' => "https://api.example.com/posts/{$this->resource->id}/comments",
             ])->meta(fn() => [
-                'total' => $this->resource->comments()->count(),
+                'total' => $this->resource->comments()->getQuery()->count(),
             ]),
         ];
     }

tests/app/Http/Resources/UserResource.php

@@ -43,7 +43,7 @@ protected function toRelationships(Request $request): iterable
                 'self' => "https://api.example.com/user/{$this->resource->id}/relationships/posts",
                 'related' => "https://api.example.com/user/{$this->resource->id}/posts",
             ], fn() => [
-                'total' => $this->resource->posts()->count(),
+                'total' => $this->resource->posts()->getQuery()->count(),
             ])
                 ->asCollection(),
 
@@ -54,7 +54,7 @@ protected function toRelationships(Request $request): iterable
                     'related' => "https://api.example.com/user/{$this->resource->id}/comments",
                 ])
                 ->meta(fn() => [
-                    'total' => $this->resource->comments()->count(),
+                    'total' => $this->resource->comments()->getQuery()->count(),
                 ]),
         ];
     }