Skip to content

Commit a67ffb6

Browse files
authored
Merge pull request #170 from yajra/fix-resource
fix: scopes when using api resource
2 parents 3bd56f1 + 216becc commit a67ffb6

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/Contracts/DataTableScope.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface DataTableScope
77
/**
88
* Apply a query scope.
99
*
10-
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Support\Collection $query
10+
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Support\Collection|\Illuminate\Http\Resources\Json\AnonymousResourceCollection $query
1111
* @return mixed
1212
*/
1313
public function apply($query);

src/Services/DataTable.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Illuminate\Database\Eloquent\Relations\Relation as EloquentRelation;
1111
use Illuminate\Database\Query\Builder as QueryBuilder;
1212
use Illuminate\Http\JsonResponse;
13+
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
1314
use Illuminate\Http\Response;
1415
use Illuminate\Support\Collection;
1516
use Illuminate\Support\LazyCollection;
@@ -709,12 +710,10 @@ public function __get(string $key)
709710

710711
/**
711712
* Apply query scopes.
712-
*
713-
* @param EloquentBuilder|QueryBuilder|EloquentRelation|Collection $query
714-
* @return EloquentBuilder|QueryBuilder|EloquentRelation|Collection
715713
*/
716-
protected function applyScopes(EloquentBuilder|QueryBuilder|EloquentRelation|Collection $query): EloquentBuilder|QueryBuilder|EloquentRelation|Collection
717-
{
714+
protected function applyScopes(
715+
EloquentBuilder|QueryBuilder|EloquentRelation|Collection|AnonymousResourceCollection $query
716+
): EloquentBuilder|QueryBuilder|EloquentRelation|Collection|AnonymousResourceCollection {
718717
foreach ($this->scopes as $scope) {
719718
$scope->apply($query);
720719
}

0 commit comments

Comments
 (0)