Clean up proto ci steps and fix PHPStan with latest dependencies

Author: spawnia

.github/workflows/proto.yml renamed to .github/workflows/generate-proto-code.yml

@@ -1,4 +1,4 @@
-name: "Build protobuf"
+name: "Generate proto code"
 on:
   push:
     branches:
@@ -8,7 +8,7 @@ on:
       - 'buf.gen.yaml'
 
 jobs:
-  proto:
+  generate-proto-code:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/update-reports-proto.yml

@@ -1,11 +1,11 @@
-name: "Update reports.proto"
+name: "Update `reports.proto`"
 on:
   workflow_dispatch:
   schedule:
     - cron: "0 0 * * 0"
 
 jobs:
-  proto:
+  update-reports-proto:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
 
       - uses: peter-evans/create-pull-request@v5
         with:
-          title: 'Updated `reports.proto`'
-          commit_message: Updated `reports.proto`
+          title: Update `reports.proto`
+          commit-message: Update `reports.proto`
           branch: patch/update-reports-proto
           delete-branch: true

phpstan.neon

@@ -53,11 +53,11 @@ parameters:
   # Laravel 11 changes a lot of generics
   - '#generic class (Illuminate\\Database\\Eloquent\\Builder|Laravel\\Scout\\Builder)( but)? does not specify its types#'
   - '#contains generic type Illuminate\\Testing\\TestResponse<.+> but class Illuminate\\Testing\\TestResponse is not generic\.#'
-  - '#Generic type Illuminate\\Database\\Eloquent\\Relations\\(HasOne|HasMany|BelongsToMany|MorphOne|MorphMany|MorphToMany)<.+> in PHPDoc tag @return specifies \d template types, but class Illuminate\\Database\\Eloquent\\Relations\\\1 supports only \d: .+#'
+  - '#Generic type Illuminate\\.+ specifies \d template types, but (class|interface) Illuminate\\.+ supports only \d: .+#'
   - '#Method .+ should return Illuminate\\Database\\Eloquent\\Relations\\(HasOne|HasMany|BelongsToMany|MorphOne|MorphMany|MorphToMany)<(.+), .+> but returns Illuminate\\Database\\Eloquent\\Relations\\\1<\2>.#'
   - '#Method .+ should return Illuminate\\Database\\Eloquent\\Relations\\(BelongsTo|MorphTo)<(.+), \$this\((.+)\)> but returns Illuminate\\Database\\Eloquent\\Relations\\\1<\2, \3>.#'
-  - '#Generic type Illuminate\\Database\\Eloquent\\Relations\\(HasOneThrough|HasManyThrough)<.+, .+, .+> in PHPDoc tag @return specifies 3 template types, but class Illuminate\\Database\\Eloquent\\Relations\\\1 supports only 1: TRelatedModel#'
   - '#Method .+ should return Illuminate\\Database\\Eloquent\\Relations\\(HasOneThrough|HasManyThrough)<(.+), .+> but returns Illuminate\\Database\\Eloquent\\Relations\\\1<\2>.#'
+  - '#Return type of call to method Illuminate\\Database\\Eloquent\\Relations\\BelongsToMany<.+>::save\(\) contains unresolvable type\.#'
 
   # Different between PHPUnit versions
   - '#PHPDoc tag @return contains generic type PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker<stdClass> but class PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker is not generic.#'

src/Pagination/ConnectionField.php

@@ -14,7 +14,7 @@
 class ConnectionField
 {
     /**
-     * @param  \Illuminate\Contracts\Pagination\LengthAwarePaginator<mixed>  $paginator
+     * @param  \Illuminate\Contracts\Pagination\LengthAwarePaginator<*, *>  $paginator
      *
      * @return array{
      *     hasNextPage: bool,
@@ -52,7 +52,7 @@ public function pageInfoResolver(LengthAwarePaginator $paginator): array
     }
 
     /**
-     * @param  \Illuminate\Contracts\Pagination\Paginator<mixed>  $paginator
+     * @param  \Illuminate\Contracts\Pagination\Paginator<*, *>  $paginator
      * @param  array<string, mixed>  $args
      *
      * @return Collection<int, array<string, mixed>>

src/Pagination/PaginationArgs.php

@@ -106,20 +106,20 @@ protected static function optimalPaginationType(PaginationType $proposedType, Re
      *
      * @param  \Illuminate\Database\Query\Builder|\Laravel\Scout\Builder|\Illuminate\Database\Eloquent\Builder<TModel>|\Illuminate\Database\Eloquent\Relations\Relation<TModel>  $builder
      *
-     * @return \Illuminate\Contracts\Pagination\Paginator<TModel>
+     * @return \Illuminate\Contracts\Pagination\Paginator<array-key, TModel>
      */
     public function applyToBuilder(QueryBuilder|ScoutBuilder|EloquentBuilder|Relation $builder): Paginator
     {
         if ($this->first === 0) {
             if ($this->type->isSimple()) {
-                return new ZeroPerPagePaginator($this->page);
+                return new ZeroPerPagePaginator($this->page); // @phpstan-ignore return.type (generic type does not matter)
             }
 
             $total = $builder instanceof ScoutBuilder
                 ? 0 // Laravel\Scout\Builder exposes no method to get the total count
                 : $builder->count(); // @phpstan-ignore-line see Illuminate\Database\Query\Builder::count(), available as a mixin in the other classes
 
-            return new ZeroPerPageLengthAwarePaginator($total, $this->page);
+            return new ZeroPerPageLengthAwarePaginator($total, $this->page); // @phpstan-ignore return.type (generic type does not matter)
         }
 
         $methodName = $this->type->isSimple()

src/Pagination/PaginatorField.php

@@ -8,7 +8,7 @@
 class PaginatorField
 {
     /**
-     * @param  \Illuminate\Contracts\Pagination\LengthAwarePaginator<mixed>  $paginator
+     * @param  \Illuminate\Contracts\Pagination\LengthAwarePaginator<*, *>  $paginator
      *
      * @return array{
      *     count: int,
@@ -36,12 +36,15 @@ public function paginatorInfoResolver(LengthAwarePaginator $paginator): array
     }
 
     /**
-     * @param  \Illuminate\Contracts\Pagination\Paginator<mixed>  $paginator
+     * @template TKey of array-key
+     * @template TValue
      *
-     * @return array<int, mixed>
+     * @param  \Illuminate\Contracts\Pagination\Paginator<TKey, TValue>  $paginator
+     *
+     * @return array<TKey, TValue>
      */
     public function dataResolver(Paginator $paginator): array
     {
-        return $paginator->items();
+        return $paginator->items(); // @phpstan-ignore return.type (mismatch when Paginator has only 1 generic type)
     }
 }

src/Pagination/SimplePaginatorField.php

@@ -10,7 +10,7 @@ class SimplePaginatorField
     /**
      * Resolve simple paginator info for connection.
      *
-     * @param  \Illuminate\Pagination\Paginator<mixed>  $root
+     * @param  \Illuminate\Pagination\Paginator<*, *>  $root
      *
      * @return array{
      *     count: int,
@@ -36,7 +36,7 @@ public function paginatorInfoResolver(Paginator $root): array
     /**
      * Resolve data for connection.
      *
-     * @param  \Illuminate\Pagination\Paginator<mixed>  $root
+     * @param  \Illuminate\Pagination\Paginator<*, *>  $root
      *
      * @return \Illuminate\Support\Collection<int, mixed>
      */

src/Pagination/ZeroPerPageLengthAwarePaginator.php

@@ -5,7 +5,7 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
-/** @extends \Illuminate\Pagination\LengthAwarePaginator<mixed> */
+/** @extends \Illuminate\Pagination\LengthAwarePaginator<array-key, mixed> */
 class ZeroPerPageLengthAwarePaginator extends LengthAwarePaginator
 {
     public function __construct(int $total, int $page)

src/Pagination/ZeroPerPagePaginator.php

@@ -5,7 +5,7 @@
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
 
-/** @extends \Illuminate\Pagination\Paginator<mixed> */
+/** @extends \Illuminate\Pagination\Paginator<array-key, mixed> */
 class ZeroPerPagePaginator extends Paginator
 {
     public function __construct(int $page)

tests/Integration/Schema/Directives/ScopeDirectiveTest.php

@@ -14,12 +14,13 @@ public function testExplicitName(): void
     {
         factory(Task::class)->times(2)->create();
 
-        /** @var Task $taskWithTag */
         $taskWithTag = factory(Task::class)->create();
+        assert($taskWithTag instanceof Task);
 
-        /** @var Tag $tag */
-        $tag = factory(Tag::class)->make();
-        $taskWithTag->tags()->save($tag);
+        $tag = factory(Tag::class)->create();
+        assert($tag instanceof Tag);
+
+        $taskWithTag->tags()->attach($tag);
 
         $this->schema = /** @lang GraphQL */ '
         type Query {
@@ -62,11 +63,12 @@ public function testDefaultsScopeToEqualArgumentName(): void
     {
         factory(Task::class)->times(2)->create();
 
-        /** @var Task $taskWithTag */
         $taskWithTag = factory(Task::class)->create();
+        assert($taskWithTag instanceof Task);
+
+        $tag = factory(Tag::class)->create();
+        assert($tag instanceof Tag);
 
-        /** @var Tag $tag */
-        $tag = factory(Tag::class)->make();
         $taskWithTag->tags()->save($tag);
 
         $this->schema = /** @lang GraphQL */ '

tests/Unit/Pagination/PaginateDirectiveTest.php

@@ -723,11 +723,11 @@ public function testQueriesFirst0SimplePaginator(): void
     /**
      * @param  array{first: int}  $args
      *
-     * @return \Illuminate\Pagination\LengthAwarePaginator<array{id: int}>
+     * @return \Illuminate\Pagination\LengthAwarePaginator<int, array{id: int}>
      */
     public static function returnPaginatedDataInsteadOfBuilder(mixed $root, array $args): LengthAwarePaginator
     {
-        return new LengthAwarePaginator([
+        return new LengthAwarePaginator([ // @phpstan-ignore return.type (pagination generics changed between Laravel versions)
             [
                 'id' => 1,
             ],

tests/Utils/Models/User.php

@@ -103,7 +103,7 @@ public function posts(): HasMany
         return $this->hasMany(Post::class);
     }
 
-    /** @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<\Tests\Utils\Models\Role, $this, \Illuminate\Database\Eloquent\Relations\Pivot> */
+    /** @return \Illuminate\Database\Eloquent\Relations\BelongsToMany<\Tests\Utils\Models\Role, $this> */
     public function roles(): BelongsToMany
     {
         return $this->belongsToMany(Role::class)