Simplify Sprunje abstract method

userfrosting · Oct 9, 2023 · 0094af2 · 0094af2
1 parent 01dcdbd
commit 0094af2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/src/Sprunje/Sprunje.php b/app/src/Sprunje/Sprunje.php
@@ -635,7 +635,7 @@ protected function applyTransformations(Collection $collection): Collection
      *
      * @return EloquentBuilder|QueryBuilder|Relation|Model
      */
-    abstract protected function baseQuery(): EloquentBuilder|QueryBuilder|Relation|Model;
+    abstract protected function baseQuery();
 
     /**
      * Returns a list of distinct values for a specified column.

diff --git a/app/tests/Integration/Sprunje/SprunjeTest.php b/app/tests/Integration/Sprunje/SprunjeTest.php
@@ -13,7 +13,6 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Sprunje;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Schema\Blueprint;
@@ -473,7 +472,7 @@ class TestSprunje extends Sprunje
         'type',
     ];
 
-    protected function baseQuery(): EloquentBuilder|QueryBuilder|Relation|Model
+    protected function baseQuery()
     {
         return new TestSprunjeModel();
     }

diff --git a/app/tests/Unit/Sprunje/SprunjeTest.php b/app/tests/Unit/Sprunje/SprunjeTest.php
@@ -258,7 +258,7 @@ class SprunjeStub extends Sprunje
         'name',
     ];
 
-    protected function baseQuery(): EloquentBuilder|QueryBuilder|Relation|Model
+    protected function baseQuery()
     {
         // We use a partial mock for Builder, because we need to be able to run some of its actual methods.
         // For example, we need to be able to run the `where` method with a closure.
@@ -313,7 +313,7 @@ public function __construct(protected SprunjeTestModelStub $model, array $option
         parent::__construct($options);
     }
 
-    protected function baseQuery(): EloquentBuilder|QueryBuilder|Relation|Model
+    protected function baseQuery()
     {
         return $this->model;
     }