Merge pull request #775 from lorenzolosa/return_static

static return type when returning $this
spatie · Jun 6, 2022 · b3e8e12 · b3e8e12
2 parents 8dcf144 + 51005e1
commit b3e8e12
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/Concerns/AddsFieldsToQuery.php b/src/Concerns/AddsFieldsToQuery.php
@@ -12,7 +12,7 @@ trait AddsFieldsToQuery
 {
     protected ?Collection $allowedFields = null;
 
-    public function allowedFields($fields): self
+    public function allowedFields($fields): static
     {
         if ($this->allowedIncludes instanceof Collection) {
             throw new AllowedFieldsMustBeCalledBeforeAllowedIncludes();

diff --git a/src/Concerns/AddsIncludesToQuery.php b/src/Concerns/AddsIncludesToQuery.php
@@ -12,7 +12,7 @@ trait AddsIncludesToQuery
 {
     protected ?Collection $allowedIncludes = null;
 
-    public function allowedIncludes($includes): self
+    public function allowedIncludes($includes): static
     {
         $includes = is_array($includes) ? $includes : func_get_args();
 

diff --git a/src/Concerns/FiltersQuery.php b/src/Concerns/FiltersQuery.php
@@ -10,7 +10,7 @@ trait FiltersQuery
     /** @var \Illuminate\Support\Collection */
     protected $allowedFilters;
 
-    public function allowedFilters($filters): self
+    public function allowedFilters($filters): static
     {
         $filters = is_array($filters) ? $filters : func_get_args();
 

diff --git a/src/Concerns/SortsQuery.php b/src/Concerns/SortsQuery.php
@@ -10,7 +10,7 @@ trait SortsQuery
     /** @var \Illuminate\Support\Collection */
     protected $allowedSorts;
 
-    public function allowedSorts($sorts): self
+    public function allowedSorts($sorts): static
     {
         if ($this->request->sorts()->isEmpty()) {
             // We haven't got any requested sorts. No need to parse allowed sorts.
@@ -40,7 +40,7 @@ public function allowedSorts($sorts): self
      *
      * @return \Spatie\QueryBuilder\QueryBuilder
      */
-    public function defaultSort($sorts): self
+    public function defaultSort($sorts): static
     {
         return $this->defaultSorts(func_get_args());
     }
@@ -50,7 +50,7 @@ public function defaultSort($sorts): self
      *
      * @return \Spatie\QueryBuilder\QueryBuilder
      */
-    public function defaultSorts($sorts): self
+    public function defaultSorts($sorts): static
     {
         if ($this->request->sorts()->isNotEmpty()) {
             // We've got requested sorts. No need to parse defaults.

diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
@@ -46,7 +46,7 @@ public function __construct($subject, ?Request $request = null)
      *
      * @return $this
      */
-    protected function initializeSubject($subject): self
+    protected function initializeSubject($subject): static
     {
         throw_unless(
             $subject instanceof EloquentBuilder || $subject instanceof Relation,
@@ -58,7 +58,7 @@ protected function initializeSubject($subject): self
         return $this;
     }
 
-    protected function initializeRequest(?Request $request = null): self
+    protected function initializeRequest(?Request $request = null): static
     {
         $this->request = $request
             ? QueryBuilderRequest::fromRequest($request)
@@ -91,7 +91,7 @@ public function getSubject()
      *
      * @return static
      */
-    public static function for($subject, ?Request $request = null): self
+    public static function for($subject, ?Request $request = null): static
     {
         if (is_subclass_of($subject, Model::class)) {
             $subject = $subject::query();