Merge pull request laravel#8706 from rkgrep/patch-morph-fon

taylorotwell · taylorotwell · commit cc697364e258 · 2015-05-14T09:12:37.000-05:00
[5.0] Fix relations firstOrNew logic
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -643,7 +643,7 @@ public function firstOrNew(array $attributes)
 	{
 		if (is_null($instance = $this->where($attributes)->first()))
 		{
-			$instance = $this->related->newInstance();
+			$instance = $this->related->newInstance($attributes);
 		}
 
 		return $instance;
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
@@ -125,7 +125,7 @@ public function firstOrNew(array $attributes)
 	{
 		if (is_null($instance = $this->where($attributes)->first()))
 		{
-			$instance = $this->related->newInstance();
+			$instance = $this->related->newInstance($attributes);
 
 			// When saving a polymorphic relationship, we need to set not only the foreign
 			// key, but also the foreign key type, which is typically the class name of
diff --git a/tests/Database/DatabaseEloquentMorphTest.php b/tests/Database/DatabaseEloquentMorphTest.php
@@ -110,7 +110,7 @@ public function testFirstOrNewMethodReturnsNewModelWithMorphKeysSet()
 		$relation = $this->getOneRelation();
 		$relation->getQuery()->shouldReceive('where')->once()->with(array('foo'))->andReturn($relation->getQuery());
 		$relation->getQuery()->shouldReceive('first')->once()->with()->andReturn(null);
-		$relation->getRelated()->shouldReceive('newInstance')->once()->with()->andReturn($model = m::mock('Illuminate\Database\Eloquent\Model'));
+		$relation->getRelated()->shouldReceive('newInstance')->once()->with(array('foo'))->andReturn($model = m::mock('Illuminate\Database\Eloquent\Model'));
 		$model->shouldReceive('setAttribute')->once()->with('morph_id', 1);
 		$model->shouldReceive('setAttribute')->once()->with('morph_type', get_class($relation->getParent()));
 		$model->shouldReceive('save')->never();
@@ -161,7 +161,7 @@ public function testUpdateOrCreateMethodCreatesNewMorphModel()
 		$relation = $this->getOneRelation();
 		$relation->getQuery()->shouldReceive('where')->once()->with(array('foo'))->andReturn($relation->getQuery());
 		$relation->getQuery()->shouldReceive('first')->once()->with()->andReturn(null);
-		$relation->getRelated()->shouldReceive('newInstance')->once()->with()->andReturn($model = m::mock('Illuminate\Database\Eloquent\Model'));
+		$relation->getRelated()->shouldReceive('newInstance')->once()->with(array('foo'))->andReturn($model = m::mock('Illuminate\Database\Eloquent\Model'));
 		$model->shouldReceive('setAttribute')->once()->with('morph_id', 1);
 		$model->shouldReceive('setAttribute')->once()->with('morph_type', get_class($relation->getParent()));
 		$model->shouldReceive('save')->once()->andReturn(true);

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ public function firstOrNew(array $attributes)`
`643`	`643`	`{`
`644`	`644`	`if (is_null($instance = $this->where($attributes)->first()))`
`645`	`645`	`{`
`646`		`- $instance = $this->related->newInstance();`
	`646`	`+ $instance = $this->related->newInstance($attributes);`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`return $instance;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function firstOrNew(array $attributes)`
`125`	`125`	`{`
`126`	`126`	`if (is_null($instance = $this->where($attributes)->first()))`
`127`	`127`	`{`
`128`		`- $instance = $this->related->newInstance();`
	`128`	`+ $instance = $this->related->newInstance($attributes);`
`129`	`129`
`130`	`130`	`// When saving a polymorphic relationship, we need to set not only the foreign`
`131`	`131`	`// key, but also the foreign key type, which is typically the class name of`