Small tweaks

Author: jenssegers

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

@@ -14,12 +14,13 @@ class BelongsToMany extends EloquentBelongsToMany {
 	 */
 	protected function hydratePivotRelation(array $models)
 	{
-		// Do nothing
+		// Do nothing.
 	}
 
 	/**
 	 * Set the select clause for the relation query.
 	 *
+	 * @param  array  $columns
 	 * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
 	 */
 	protected function getSelectColumns(array $columns = array('*'))
@@ -34,10 +35,21 @@ protected function getSelectColumns(array $columns = array('*'))
 	 */
 	public function addConstraints()
 	{
-		if (static::$constraints)
-		{
-			$this->query->where($this->getForeignKey(), '=', $this->parent->getKey());
-		}
+		if (static::$constraints) $this->setWhere();
+	}
+
+	/**
+	 * Set the where clause for the relation query.
+	 *
+	 * @return $this
+	 */
+	protected function setWhere()
+	{
+		$foreign = $this->getForeignKey();
+
+		$this->query->where($foreign, '=', $this->parent->getKey());
+
+		return $this;
 	}
 
 	/**
@@ -82,7 +94,7 @@ public function create(array $attributes, array $joining = array(), $touch = tru
 	/**
 	 * Sync the intermediate tables with a list of IDs or collection of models.
 	 *
-	 * @param  mixed  $ids
+	 * @param  array  $ids
 	 * @param  bool   $detaching
 	 * @return array
 	 */
@@ -104,7 +116,11 @@ public function sync($ids, $detaching = true)
 
 		$records = $this->formatSyncList($ids);
 
-		$detach = array_values(array_diff($current, array_keys($records)));
+		$detach = array_diff($current, array_keys($records));
+
+		// We need to make sure we pass a clean array, so that it is not interpreted
+		// as an associative array.
+		$detach = array_values($detach);
 
 		// Next, we will take the differences of the currents and given IDs and detach
 		// all of the entities that exist in the "current" array but are not in the
@@ -113,7 +129,7 @@ public function sync($ids, $detaching = true)
 		{
 			$this->detach($detach);
 
-			$changes['detached'] = (array) array_map('intval', $detach);
+			$changes['detached'] = (array) array_map(function($v) { return (int) $v; }, $detach);
 		}
 
 		// Now we are finally ready to attach the new records. Note that we'll disable
@@ -156,33 +172,26 @@ public function attach($id, array $attributes = array(), $touch = true)
 	{
 		if ($id instanceof Model)
 		{
-			$model = $id; $id = $model->getKey();
-		}
+			$model = $id;
 
-		$ids = (array) $id;
+			$id = $model->getKey();
 
-		// Attach the new ids to the parent model.
-		$this->parent->push($this->otherKey, $ids, true);
-
-		// If we have a model instance, we can push the ids to that model,
-		// so that the internal attributes are updated as well. Otherwise,
-		// we will just perform a regular database query.
-		if (isset($model))
-		{
-			// Attach the new ids to the related model.
+			// Attach the new parent id to the related model.
 			$model->push($this->foreignKey, $this->parent->getKey(), true);
 		}
 		else
 		{
 			$query = $this->newRelatedQuery();
 
-			// Select related models.
-			$query->whereIn($this->related->getKeyName(), $ids);
+			$query->whereIn($this->related->getKeyName(), (array) $id);
 
 			// Attach the new parent id to the related model.
 			$query->push($this->foreignKey, $this->parent->getKey(), true);
 		}
 
+		// Attach the new ids to the parent model.
+		$this->parent->push($this->otherKey, (array) $id, true);
+
 		if ($touch) $this->touchIfTouching();
 	}
 
@@ -238,9 +247,9 @@ protected function buildDictionary(Collection $results)
 
 		foreach ($results as $result)
 		{
-			foreach ($result->$foreign as $single)
+			foreach ($result->$foreign as $item)
 			{
-				$dictionary[$single][] = $result;
+				$dictionary[$item][] = $result;
 			}
 		}
 

src/Jenssegers/Mongodb/Relations/MorphTo.php

@@ -21,15 +21,4 @@ public function addConstraints()
 		}
 	}
 
-	/**
-	 * Set the constraints for an eager load of the relation.
-	 *
-	 * @param  array  $models
-	 * @return void
-	 */
-	public function addEagerConstraints(array $models)
-	{
-		$this->buildDictionary($this->models = Collection::make($models));
-	}
-
 }