-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Remove compatibility layers with old Laravel versions #2615
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,6 @@ | |
use Illuminate\Database\Eloquent\Builder; | ||
use Illuminate\Database\Eloquent\Model; | ||
|
||
use function property_exists; | ||
|
||
class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo | ||
{ | ||
/** | ||
|
@@ -18,7 +16,7 @@ class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo | |
*/ | ||
public function getHasCompareKey() | ||
{ | ||
return $this->getOwnerKey(); | ||
return $this->ownerKey; | ||
} | ||
|
||
/** @inheritdoc */ | ||
|
@@ -28,7 +26,7 @@ public function addConstraints() | |
// For belongs to relationships, which are essentially the inverse of has one | ||
// or has many relationships, we need to actually query on the primary key | ||
// of the related models matching on the foreign key that's on a parent. | ||
$this->query->where($this->getOwnerKey(), '=', $this->parent->{$this->foreignKey}); | ||
$this->query->where($this->ownerKey, '=', $this->parent->{$this->foreignKey}); | ||
} | ||
} | ||
|
||
|
@@ -38,9 +36,7 @@ public function addEagerConstraints(array $models) | |
// We'll grab the primary key name of the related models since it could be set to | ||
// a non-standard name and not "id". We will then construct the constraint for | ||
// our eagerly loading query so it returns the proper models from execution. | ||
$key = $this->getOwnerKey(); | ||
|
||
$this->query->whereIn($key, $this->getEagerModelKeys($models)); | ||
$this->query->whereIn($this->ownerKey, $this->getEagerModelKeys($models)); | ||
} | ||
|
||
/** @inheritdoc */ | ||
|
@@ -49,16 +45,6 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery, | |
return $query; | ||
} | ||
|
||
/** | ||
* Get the owner key with backwards compatible support. | ||
* | ||
* @return string | ||
*/ | ||
public function getOwnerKey() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This was introduced as a compatibility layer in #1116 |
||
{ | ||
return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey; | ||
} | ||
|
||
/** | ||
* Get the name of the "where in" method for eager loading. | ||
* | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was introduced as a compatibility layer in 3e26e05b