Remove cross-version patch for other/owner key

#1116

Author: GromNaN

src/Relations/BelongsTo.php

@@ -18,7 +18,7 @@ class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function getHasCompareKey()
     {
-        return $this->getOwnerKey();
+        return $this->ownerKey;
     }
 
     /** @inheritdoc */
@@ -28,7 +28,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 +38,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 +47,6 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
         return $query;
     }
 
-    /**
-     * Get the owner key with backwards compatible support.
-     *
-     * @return string
-     */
-    public function getOwnerKey()
-    {
-        return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey;
-    }
-
     /**
      * Get the name of the "where in" method for eager loading.
      *

src/Relations/MorphTo.php

@@ -18,7 +18,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});
         }
     }
 
@@ -34,16 +34,6 @@ protected function getResultsByType($type)
         return $query->whereIn($key, $this->gatherKeysByType($type, $instance->getKeyType()))->get();
     }
 
-    /**
-     * Get the owner key with backwards compatible support.
-     *
-     * @return string
-     */
-    public function getOwnerKey()
-    {
-        return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey;
-    }
-
     /**
      * Get the name of the "where in" method for eager loading.
      *