MorphTo: instantiate related class appropriate to given parent instance

Also update tests to account for new behavior
laravel · Feb 8, 2019 · 5e0bc23 · 5e0bc23
1 parent 31cb80a
commit 5e0bc23
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 9 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -222,6 +222,17 @@ public function touch()
         }
     }
 
+    /**
+     * Make a new related instance for the given model.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $parent
+     * @return \Illuminate\Database\Eloquent\Model
+     */
+    protected function newRelatedInstanceFor(Model $parent)
+    {
+        return $parent->{$this->getRelationName()}()->getRelated()->newInstance();
+    }
+
     /**
      * Get the foreign key "type" name.
      *

diff --git a/tests/Database/DatabaseEloquentMorphToTest.php b/tests/Database/DatabaseEloquentMorphToTest.php
@@ -53,9 +53,7 @@ public function testMorphToWithDefault()
 
         $newModel = new EloquentMorphToModelStub;
 
-        $this->related->shouldReceive('newInstance')->once()->andReturn($newModel);
-
-        $this->assertSame($newModel, $relation->getResults());
+        $this->assertEquals($newModel, $relation->getResults());
     }
 
     public function testMorphToWithDynamicDefault()
@@ -67,12 +65,13 @@ public function testMorphToWithDynamicDefault()
         $this->builder->shouldReceive('first')->once()->andReturnNull();
 
         $newModel = new EloquentMorphToModelStub;
+        $newModel->username = 'taylor';
 
-        $this->related->shouldReceive('newInstance')->once()->andReturn($newModel);
+        $result = $relation->getResults();
 
-        $this->assertSame($newModel, $relation->getResults());
+        $this->assertEquals($newModel, $result);
 
-        $this->assertSame('taylor', $newModel->username);
+        $this->assertSame('taylor', $result->username);
     }
 
     public function testMorphToWithArrayDefault()
@@ -82,12 +81,27 @@ public function testMorphToWithArrayDefault()
         $this->builder->shouldReceive('first')->once()->andReturnNull();
 
         $newModel = new EloquentMorphToModelStub;
+        $newModel->username = 'taylor';
+
+        $result = $relation->getResults();
+
+        $this->assertEquals($newModel, $result);
+
+        $this->assertSame('taylor', $result->username);
+    }
+
+    public function testMorphToWithSpecifiedClassDefault()
+    {
+        $parent = new EloquentMorphToModelStub;
+        $parent->relation_type = EloquentMorphToRelatedStub::class;
+
+        $relation = $parent->relation()->withDefault();
 
-        $this->related->shouldReceive('newInstance')->once()->andReturn($newModel);
+        $newModel = new EloquentMorphToRelatedStub;
 
-        $this->assertSame($newModel, $relation->getResults());
+        $result = $relation->getResults();
 
-        $this->assertSame('taylor', $newModel->username);
+        $this->assertEquals($newModel, $result);
     }
 
     public function testAssociateMethodSetsForeignKeyAndTypeOnModel()
@@ -165,4 +179,16 @@ public function getRelation($parent = null, $builder = null)
 class EloquentMorphToModelStub extends Model
 {
     public $foreign_key = 'foreign.value';
+
+    public $table = 'eloquent_morph_to_model_stubs';
+
+    public function relation()
+    {
+        return $this->morphTo();
+    }
+}
+
+class EloquentMorphToRelatedStub extends Model
+{
+    public $table = 'eloquent_morph_to_related_stubs';
 }