Skip to content

[9.x] Fix scopes for Eloquent Relation - Exception: "TypeError" #150

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
merged 3 commits into from
Jun 25, 2022
Merged

[9.x] Fix scopes for Eloquent Relation - Exception: "TypeError" #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29cbaf2
Exception: "TypeError"
padre Jun 23, 2022
b145ad1
Update DataTable.php
padre Jun 24, 2022
c6a361a
Update DataTableScope.php
padre Jun 24, 2022
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 $query
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation $query
* @return mixed
*/
public function apply($query);
Expand Down
9 changes: 5 additions & 4 deletions src/Services/DataTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Generator;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Relations\Relation as EloquentRelation;
use Illuminate\Database\Query\Builder as QueryBuilder;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Response;
Expand Down Expand Up @@ -243,7 +244,7 @@ public function ajax(): JsonResponse
{
$query = null;
if (method_exists($this, 'query')) {
/** @var EloquentBuilder|QueryBuilder $query */
/** @var EloquentBuilder|QueryBuilder|EloquentRelation $query */
$query = app()->call([$this, 'query']);
$query = $this->applyScopes($query);
}
Expand Down Expand Up @@ -713,10 +714,10 @@ public function __get(string $key)
/**
* Apply query scopes.
*
* @param EloquentBuilder|QueryBuilder $query
* @return EloquentBuilder|QueryBuilder
* @param EloquentBuilder|QueryBuilder|EloquentRelation $query
* @return EloquentBuilder|QueryBuilder|EloquentRelation
*/
protected function applyScopes(EloquentBuilder|QueryBuilder $query): EloquentBuilder|QueryBuilder
protected function applyScopes(EloquentBuilder|QueryBuilder|EloquentRelation $query): EloquentBuilder|QueryBuilder|EloquentRelation
{
foreach ($this->scopes as $scope) {
$scope->apply($query);
Expand Down