fix laravel version

UniSharp · Nov 21, 2019 · 4cb1ec3 · 4cb1ec3
1 parent 48131e4
commit 4cb1ec3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "illuminate/database": ">=5.*"
+        "illuminate/database": ">=5.8.0"
     },
     "require-dev": {
         "orchestra/testbench": "3.*",

diff --git a/src/EloquentJoinBuilder.php b/src/EloquentJoinBuilder.php
@@ -199,9 +199,9 @@ private function performJoin($relations, $leftJoin = null)
             if (!in_array($relationAccumulatedString, $this->joinedTables)) {
                 $joinQuery = $relatedTable.($this->useTableAlias ? ' as '.$relatedTableAlias : '');
                 if ($relatedRelation instanceof BelongsTo) {
-                    $relatedKey = $relatedRelation->getQualifiedForeignKey();
+                    $relatedKey = $relatedRelation->getQualifiedForeignKeyName();
                     $relatedKey = last(explode('.', $relatedKey));
-                    $ownerKey = $relatedRelation->getOwnerKey();
+                    $ownerKey = $relatedRelation->getOwnerKeyName();
 
                     $this->$joinMethod($joinQuery, function ($join) use ($relatedRelation, $relatedTableAlias, $relatedKey, $currentTableAlias, $ownerKey) {
                         $join->on($relatedTableAlias.'.'.$ownerKey, '=', $currentTableAlias.'.'.$relatedKey);

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -9,7 +9,7 @@
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();