Fix issue with renamed properties for belongsTo and belongsToMany

Author: jenssegers

src/Jenssegers/Mongodb/Eloquent/HybridRelations.php

@@ -22,7 +22,7 @@ trait HybridRelations
     public function hasOne($related, $foreignKey = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model')) {
+        if (! is_subclass_of($related, \Jenssegers\Mongodb\Eloquent\Model::class)) {
             return parent::hasOne($related, $foreignKey, $localKey);
         }
 
@@ -48,16 +48,14 @@ public function hasOne($related, $foreignKey = null, $localKey = null)
     public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model')) {
+        if (! is_subclass_of($related, \Jenssegers\Mongodb\Eloquent\Model::class)) {
             return parent::morphOne($related, $name, $type, $id, $localKey);
         }
 
         $instance = new $related;
 
         list($type, $id) = $this->getMorphs($name, $type, $id);
 
-        $table = $instance->getTable();
-
         $localKey = $localKey ?: $this->getKeyName();
 
         return new MorphOne($instance->newQuery(), $this, $type, $id, $localKey);
@@ -74,7 +72,7 @@ public function morphOne($related, $name, $type = null, $id = null, $localKey =
     public function hasMany($related, $foreignKey = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model')) {
+        if (! is_subclass_of($related, \Jenssegers\Mongodb\Eloquent\Model::class)) {
             return parent::hasMany($related, $foreignKey, $localKey);
         }
 
@@ -100,7 +98,7 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
     public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
     {
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model')) {
+        if (! is_subclass_of($related, \Jenssegers\Mongodb\Eloquent\Model::class)) {
             return parent::morphMany($related, $name, $type, $id, $localKey);
         }
 
@@ -139,7 +137,7 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
         }
 
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model')) {
+        if (! is_subclass_of($related, \Jenssegers\Mongodb\Eloquent\Model::class)) {
             return parent::belongsTo($related, $foreignKey, $otherKey, $relation);
         }
 
@@ -222,11 +220,11 @@ public function belongsToMany($related, $collection = null, $foreignKey = null,
         // name of the calling function. We will use that function name as the
         // title of this relation since that is a great convention to apply.
         if (is_null($relation)) {
-            $relation = $this->getBelongsToManyCaller();
+            $relation = $this->guessBelongsToManyRelation();
         }
 
         // Check if it is a relation with an original model.
-        if (! is_subclass_of($related, 'Jenssegers\Mongodb\Eloquent\Model')) {
+        if (! is_subclass_of($related, \Jenssegers\Mongodb\Eloquent\Model::class)) {
             return parent::belongsToMany($related, $collection, $foreignKey, $otherKey, $relation);
         }
 
@@ -253,4 +251,18 @@ public function belongsToMany($related, $collection = null, $foreignKey = null,
 
         return new BelongsToMany($query, $this, $collection, $foreignKey, $otherKey, $relation);
     }
+
+    /**
+     * 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();
+    }
 }

src/Jenssegers/Mongodb/Relations/BelongsTo.php

@@ -29,12 +29,10 @@ public function addEagerConstraints(array $models)
     }
 
     /**
-     * get the Other/Owner Key name based on different version of Illuminate/Database
-     * see commit https://github.com/illuminate/database/commit/6a35698d72e276f435324b7e29b3cd37ef7d5d9c
-     * @return string
+     * Get the owner key with backwards compatible support.
      */
     public function getOwnerKey()
     {
-        return property_exists($this, "ownerKey") ? $this->ownerKey : $this->otherKey;
+        return property_exists($this, 'ownerKey') ? $this->ownerKey : $this->otherKey;
     }
 }

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

@@ -96,7 +96,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->getOwnerKey()} ?: [];
+        $current = $this->parent->{$this->getRelatedKey()} ?: [];
 
         // See issue #256.
         if ($current instanceof Collection) {
@@ -170,7 +170,7 @@ public function attach($id, array $attributes = [], $touch = true)
         }
 
         // Attach the new ids to the parent model.
-        $this->parent->push($this->getOwnerKey(), (array) $id, true);
+        $this->parent->push($this->getRelatedKey(), (array) $id, true);
 
         if ($touch) {
             $this->touchIfTouching();
@@ -194,7 +194,7 @@ public function detach($ids = [], $touch = true)
         $ids = (array) $ids;
 
         // Detach all ids from the parent model.
-        $this->parent->pull($this->getOwnerKey(), $ids);
+        $this->parent->pull($this->getRelatedKey(), $ids);
 
         // Prepare the query to select all related objects.
         if (count($ids) > 0) {
@@ -281,12 +281,12 @@ protected function formatSyncList(array $records)
     }
 
     /**
-     * get the Other/Owner Key name based on different version of Illuminate/Database
-     * see commit https://github.com/illuminate/database/commit/6a35698d72e276f435324b7e29b3cd37ef7d5d9c
+     * Get the related key with backwards compatible support.
+     *
      * @return string
      */
-    public function getOwnerKey()
+    public function getRelatedKey()
     {
-        return property_exists($this, "ownerKey") ? $this->ownerKey : $this->otherKey;
+        return property_exists($this, 'relatedKey') ? $this->relatedKey : $this->otherKey;
     }
 }