Remove attribute filling from pivot model

laravel · Mar 6, 2018 · a738129 · luchaos · Apr 19, 2018 · staudenmeir
1 parent 49770ec
commit a738129
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
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
@@ -37,14 +37,14 @@ public function testMutatorsAreCalledFromConstructor()
         $this->assertTrue($pivot->getMutatorCalled());
     }
 
-    public function testFromRawAttributesDoesNotDoubleMutate()
+    public function testFromRawAttributesDoesNotMutate()
     {
         $parent = m::mock('Illuminate\Database\Eloquent\Model[getConnectionName]');
         $parent->shouldReceive('getConnectionName')->once()->andReturn('connection');
 
-        $pivot = DatabaseEloquentPivotTestJsonCastStub::fromRawAttributes($parent, ['foo' => json_encode(['name' => 'Taylor'])], 'table', true);
+        $pivot = DatabaseEloquentPivotTestMutatorStub::fromRawAttributes($parent, ['foo' => 'bar'], 'table', true);
 
-        $this->assertEquals(['name' => 'Taylor'], $pivot->foo);
+        $this->assertFalse($pivot->getMutatorCalled());
     }
 
     public function testPropertiesUnchangedAreNotDirty()
@@ -135,10 +135,3 @@ public function getMutatorCalled()
         return $this->mutatorCalled;
     }
 }
-
-class DatabaseEloquentPivotTestJsonCastStub extends \Illuminate\Database\Eloquent\Relations\Pivot
-{
-    protected $casts = [
-        'foo' => 'json',
-    ];
-}