Skip to content
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.

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

Jump to bottom

[7.x] Allow to use alias of morphed model #34032

Merged
merged 2 commits into from Aug 27, 2020
Merged

[7.x] Allow to use alias of morphed model #34032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeeef89
Allow to use alias of morphed model
thewebartisan7 Aug 27, 2020
62db293
Update QueriesRelationships.php
thewebartisan7 Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
View file
Open in desktop
Expand Up @@ -205,10 +205,10 @@ public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boole

if ($types === ['*']) {
$types = $this->model->newModelQuery()->distinct()->pluck($relation->getMorphType())->filter()->all();
}

foreach ($types as &$type) {
$type = Relation::getMorphedModel($type) ?? $type;
}
foreach ($types as &$type) {
$type = Relation::getMorphedModel($type) ?? $type;
}

return $this->where(function ($query) use ($relation, $callback, $operator, $count, $types) {
Expand Down