Remove cross-version patch for renamed methods

3e26e05

Author: GromNaN

src/Eloquent/HybridRelations.php

@@ -324,20 +324,6 @@ public function belongsToMany(
         );
     }
 
-    /**
-     * Get the relationship name of the belongs to many.
-     *
-     * @return string
-     */
-    protected function guessBelongsToManyRelation()
-    {
-        if (method_exists($this, 'getBelongsToManyCaller')) {
-            return $this->getBelongsToManyCaller();
-        }
-
-        return parent::guessBelongsToManyRelation();
-    }
-
     /** @inheritdoc */
     public function newEloquentBuilder($query)
     {

src/Relations/BelongsToMany.php

@@ -123,7 +123,7 @@ public function sync($ids, $detaching = true)
         // First we need to attach any of the associated models that are not currently
         // in this joining table. We'll spin through the given IDs, checking to see
         // if they exist in the array of current ones, and if not we will insert.
-        $current = $this->parent->{$this->getRelatedKey()} ?: [];
+        $current = $this->parent->{$this->relatedPivotKey} ?: [];
 
         // See issue #256.
         if ($current instanceof Collection) {
@@ -196,7 +196,7 @@ public function attach($id, array $attributes = [], $touch = true)
         }
 
         // Attach the new ids to the parent model.
-        $this->parent->push($this->getRelatedKey(), (array) $id, true);
+        $this->parent->push($this->relatedPivotKey, (array) $id, true);
 
         if (! $touch) {
             return;
@@ -220,7 +220,7 @@ public function detach($ids = [], $touch = true)
         $ids = (array) $ids;
 
         // Detach all ids from the parent model.
-        $this->parent->pull($this->getRelatedKey(), $ids);
+        $this->parent->pull($this->relatedPivotKey, $ids);
 
         // Prepare the query to select all related objects.
         if (count($ids) > 0) {
@@ -316,16 +316,6 @@ protected function formatSyncList(array $records)
         return $results;
     }
 
-    /**
-     * Get the related key with backwards compatible support.
-     *
-     * @return string
-     */
-    public function getRelatedKey()
-    {
-        return property_exists($this, 'relatedPivotKey') ? $this->relatedPivotKey : $this->relatedKey;
-    }
-
     /**
      * Get the name of the "where in" method for eager loading.
      *