Merge pull request #1002 from alexkart/query-buikder-generic

freekmurze · web-flow · commit 3675f7bace34 · 2025-04-16T09:30:03.000+02:00
Enhance QueryBuilder with generics support for better type inference
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
@@ -14,7 +14,8 @@
 use Spatie\QueryBuilder\Concerns\SortsQuery;
 
 /**
- * @mixin EloquentBuilder
+ * @template TModel of Model
+ * @mixin EloquentBuilder<TModel>
  */
 class QueryBuilder implements ArrayAccess
 {
@@ -57,7 +58,10 @@ public static function for(
             $subject = $subject::query();
         }
 
-        return new static($subject, $request);
+        /** @var static<TModel> $queryBuilder */
+        $queryBuilder = new static($subject, $request);
+
+        return $queryBuilder;
     }
 
     public function __call($name, $arguments)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@`
`14`	`14`	`use Spatie\QueryBuilder\Concerns\SortsQuery;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * @mixin EloquentBuilder`
	`17`	`+ * @template TModel of Model`
	`18`	`+ * @mixin EloquentBuilder<TModel>`
`18`	`19`	`*/`
`19`	`20`	`class QueryBuilder implements ArrayAccess`
`20`	`21`	`{`
`@@ -57,7 +58,10 @@ public static function for(`
`57`	`58`	`$subject = $subject::query();`
`58`	`59`	`}`
`59`	`60`
`60`		`- return new static($subject, $request);`
	`61`	`+ /** @var static<TModel> $queryBuilder */`
	`62`	`+ $queryBuilder = new static($subject, $request);`
	`63`	`+`
	`64`	`+ return $queryBuilder;`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`public function __call($name, $arguments)`