Skip to content

Commit 4cb1ec3

Browse files
committed
fix laravel version
1 parent 48131e4 commit 4cb1ec3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
],
2424
"require": {
25-
"illuminate/database": ">=5.*"
25+
"illuminate/database": ">=5.8.0"
2626
},
2727
"require-dev": {
2828
"orchestra/testbench": "3.*",

src/EloquentJoinBuilder.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ private function performJoin($relations, $leftJoin = null)
199199
if (!in_array($relationAccumulatedString, $this->joinedTables)) {
200200
$joinQuery = $relatedTable.($this->useTableAlias ? ' as '.$relatedTableAlias : '');
201201
if ($relatedRelation instanceof BelongsTo) {
202-
$relatedKey = $relatedRelation->getQualifiedForeignKey();
202+
$relatedKey = $relatedRelation->getQualifiedForeignKeyName();
203203
$relatedKey = last(explode('.', $relatedKey));
204-
$ownerKey = $relatedRelation->getOwnerKey();
204+
$ownerKey = $relatedRelation->getOwnerKeyName();
205205

206206
$this->$joinMethod($joinQuery, function ($join) use ($relatedRelation, $relatedTableAlias, $relatedKey, $currentTableAlias, $ownerKey) {
207207
$join->on($relatedTableAlias.'.'.$ownerKey, '=', $currentTableAlias.'.'.$relatedKey);

tests/TestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
abstract class TestCase extends \Orchestra\Testbench\TestCase
1111
{
12-
public function setUp()
12+
public function setUp(): void
1313
{
1414
parent::setUp();
1515

0 commit comments

Comments
 (0)