Make sure mutators also are called from pivot constructor

phaza · phaza · commit b02324702145 · 2015-05-27T09:51:20.000Z
diff --git a/src/Illuminate/Database/Eloquent/Relations/Pivot.php b/src/Illuminate/Database/Eloquent/Relations/Pivot.php
@@ -49,7 +49,8 @@ public function __construct(Model $parent, $attributes, $table, $exists = false)
 		// The pivot model is a "dynamic" model since we will set the tables dynamically
 		// for the instance. This allows it work for any intermediate tables for the
 		// many to many relationship that are defined by this developer's classes.
-		$this->setRawAttributes($attributes, true);
+		$this->forceFill($attributes);
+		$this->syncOriginal();
 
 		$this->setTable($table);
 
diff --git a/tests/Database/DatabaseEloquentPivotTest.php b/tests/Database/DatabaseEloquentPivotTest.php
@@ -23,6 +23,15 @@ public function testPropertiesAreSetCorrectly()
 		$this->assertTrue($pivot->exists);
 	}
 
+	public function testMutatorsAreCalledFromConstructor() {
+			$parent = m::mock('Illuminate\Database\Eloquent\Model[getConnectionName]');
+			$parent->shouldReceive('getConnectionName')->once()->andReturn('connection');
+
+			$pivot = new DatabaseEloquentPivotTestMutatorStub($parent, array('foo' => 'bar'), 'table', true);
+
+			$this->assertTrue($pivot->getMutatorCalled());
+	}
+
 
 	public function testPropertiesUnchangedAreNotDirty()
 	{
@@ -99,3 +108,16 @@ public function getDates()
 		return array();
 	}
 }
+
+class DatabaseEloquentPivotTestMutatorStub extends Illuminate\Database\Eloquent\Relations\Pivot {
+	private $mutatorCalled = false;
+
+	public function setFooAttribute($value) {
+			$this->mutatorCalled = true;
+			return $value;
+	}
+
+	public function getMutatorCalled() {
+			return $this->mutatorCalled;
+	}
+}
