Fix cs, fix phpstan

Author: bastien-phi

src/Aggregates/AnyExists.php

@@ -14,7 +14,7 @@
  */
 class AnyExists implements MultiRelationAggregate
 {
-    /** @var \Illuminate\Support\Collection<int, \Illuminate\Database\Query\Builder> */
+    /** @var Collection<int, QueryBuilder> */
     protected Collection $existenceQueries;
 
     public function __construct(
@@ -43,15 +43,15 @@ public function defaultAlias(string $relation, string $column): string
 
     /**
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
-     * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
+     * @param Builder<TModelClass> $query
      */
     public function apply(Builder $query, QueryBuilder $aggregateQuery, string $alias): void
     {
         $this->existenceQueries->add($aggregateQuery);
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
+     * @param Builder<TModelClass> $query
      */
     public function enclose(Builder $query): void
     {

src/Aggregates/Contracts/AggregateFunction.php

@@ -29,7 +29,7 @@ public function defaultAlias(string $relation, string $column): string;
      * Apply the aggregateQuery in the query.
      * The method is executed on each relation.
      *
-     * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
+     * @param Builder<TModelClass> $query
      */
     public function apply(Builder $query, QueryBuilder $aggregateQuery, string $alias): void;
 }

src/Aggregates/Contracts/MultiRelationAggregate.php

@@ -14,7 +14,7 @@ interface MultiRelationAggregate extends AggregateFunction
      * Enclose the aggregate on the query.
      * This method is executed once for all relations.
      *
-     * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
+     * @param Builder<TModelClass> $query
      */
     public function enclose(Builder $query): void;
 }

src/Aggregates/Implode.php

@@ -51,7 +51,7 @@ public function defaultAlias(string $relation, string $column): string
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder<TModelClass> $query
+     * @param Builder<TModelClass> $query
      */
     public function apply(Builder $query, QueryBuilder $aggregateQuery, string $alias): void
     {

src/Mixins/CollectionMixin.php

@@ -6,7 +6,9 @@
 use Illuminate\Support\Arr;
 
 /**
- * @mixin \Illuminate\Database\Eloquent\Collection
+ * @template TKey of array-key
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ * @mixin \Illuminate\Database\Eloquent\Collection<TKey, TModel>
  */
 class CollectionMixin
 {

src/Mixins/Misc.php

@@ -6,7 +6,8 @@
 use Illuminate\Database\Eloquent\Scope;
 
 /**
- * @mixin \Illuminate\Database\Eloquent\Builder
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ * @mixin \Illuminate\Database\Eloquent\Builder<TModel>
  */
 class Misc
 {

src/Mixins/Ordering.php

@@ -10,7 +10,8 @@
 use function sprintf;
 
 /**
- * @mixin \Illuminate\Database\Eloquent\Builder
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ * @mixin \Illuminate\Database\Eloquent\Builder<TModel>
  */
 class Ordering
 {

src/Mixins/Result.php

@@ -6,7 +6,8 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @mixin \Illuminate\Database\Eloquent\Builder
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ * @mixin \Illuminate\Database\Eloquent\Builder<TModel>
  */
 class Result
 {

src/Mixins/Select.php

@@ -14,16 +14,16 @@
 use function is_array;
 
 /**
- * @template TModelClass of \Illuminate\Database\Eloquent\Model
- * @mixin \Illuminate\Database\Eloquent\Builder<TModelClass>
+ * @template TModel of \Illuminate\Database\Eloquent\Model
+ * @mixin \Illuminate\Database\Eloquent\Builder<TModel>
  */
 class Select
 {
     public function withAggregateFunction(): Closure
     {
         /**
          * @param array<string, Closure>|array<string>|string $relations
-         * @param \Soyhuce\EloquentExtended\Aggregates\Contracts\AggregateFunction<TModelClass>
+         * @param AggregateFunction<TModel>
          */
         return function ($relations, AggregateFunction $aggregateFunction): self {
             if (empty($relations)) {