[5.5] Remove attribute filling from pivot model #23401 (#23554)

* Remove attribute filling from pivot model * Re-add test
laravel · Mar 15, 2018 · 260a3f8 · 260a3f8
1 parent 8d6b778
commit 260a3f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Relations/Pivot.php b/src/Illuminate/Database/Eloquent/Relations/Pivot.php
@@ -80,7 +80,7 @@ public static function fromAttributes(Model $parent, $attributes, $table, $exist
      */
     public static function fromRawAttributes(Model $parent, $attributes, $table, $exists = false)
     {
-        $instance = static::fromAttributes($parent, $attributes, $table, $exists);
+        $instance = static::fromAttributes($parent, [], $table, $exists);
 
         $instance->setRawAttributes($attributes, true);
 

diff --git a/tests/Database/DatabaseEloquentPivotTest.php b/tests/Database/DatabaseEloquentPivotTest.php
@@ -47,6 +47,16 @@ public function testFromRawAttributesDoesNotDoubleMutate()
         $this->assertEquals(['name' => 'Taylor'], $pivot->foo);
     }
 
+    public function testFromRawAttributesDoesNotMutate()
+    {
+        $parent = m::mock('Illuminate\Database\Eloquent\Model[getConnectionName]');
+        $parent->shouldReceive('getConnectionName')->once()->andReturn('connection');
+
+        $pivot = DatabaseEloquentPivotTestMutatorStub::fromRawAttributes($parent, ['foo' => 'bar'], 'table', true);
+
+        $this->assertFalse($pivot->getMutatorCalled());
+    }
+
     public function testPropertiesUnchangedAreNotDirty()
     {
         $parent = m::mock('Illuminate\Database\Eloquent\Model[getConnectionName]');