Skip to content

fix: applyScopes method to support Collection #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yajra merged 4 commits into from
Feb 20, 2023
Merged

fix: applyScopes method to support Collection #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3e58ee
fix applyScopes method to support Collection
g3c0d3r5 Feb 5, 2023
22ffed6
Merge pull request #1 from g3c0d3r5/fix-datatable-service-not-compati…
g3c0d3r5 Feb 5, 2023
765b80c
document apply method to accept Collection
g3c0d3r5 Feb 6, 2023
e53327e
add missing backslash
g3c0d3r5 Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Contracts/DataTableScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface DataTableScope
/**
* Apply a query scope.
*
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation $query
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Support\Collection $query
* @return mixed
*/
public function apply($query);
Expand Down
6 changes: 3 additions & 3 deletions src/Services/DataTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,10 +713,10 @@ public function __get(string $key)
/**
* Apply query scopes.
*
* @param EloquentBuilder|QueryBuilder|EloquentRelation $query
* @return EloquentBuilder|QueryBuilder|EloquentRelation
* @param EloquentBuilder|QueryBuilder|EloquentRelation|Collection $query
* @return EloquentBuilder|QueryBuilder|EloquentRelation|Collection
*/
protected function applyScopes(EloquentBuilder|QueryBuilder|EloquentRelation $query): EloquentBuilder|QueryBuilder|EloquentRelation
protected function applyScopes(EloquentBuilder|QueryBuilder|EloquentRelation|Collection $query): EloquentBuilder|QueryBuilder|EloquentRelation|Collection
{
foreach ($this->scopes as $scope) {
$scope->apply($query);
Expand Down