Fix empty morph to relationship

lukasgeiter · lukasgeiter · commit 7dca817417ef · 2015-04-28T21:34:12.000+02:00
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -53,6 +53,18 @@ public function __construct(Builder $query, Model $parent, $foreignKey, $otherKe
 		parent::__construct($query, $parent, $foreignKey, $otherKey, $relation);
 	}
 
+	/**
+	 * Get the results of the relationship.
+	 *
+	 * @return mixed
+	 */
+	public function getResults()
+	{
+		if ( ! $this->otherKey) return;
+
+		return $this->query->first();
+	}
+
 	/**
 	 * Set the constraints for an eager load of the relation.
 	 *
diff --git a/tests/Database/DatabaseEloquentIntegrationTest.php b/tests/Database/DatabaseEloquentIntegrationTest.php
@@ -324,6 +324,14 @@ public function testBasicMorphManyRelationship()
 	}
 
 
+	public function testEmptyMorphToRelationship()
+	{
+		$photo = EloquentTestPhoto::create(['name' => 'Avatar 1']);
+		
+		$this->assertNull($photo->imageable);
+	}
+
+
 	public function testMultiInsertsWithDifferentValues()
 	{
 		$date = '1970-01-01';

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,14 @@ public function testBasicMorphManyRelationship()`
`324`	`324`	`}`
`325`	`325`
`326`	`326`
	`327`	`+ public function testEmptyMorphToRelationship()`
	`328`	`+ {`
	`329`	`+ $photo = EloquentTestPhoto::create(['name' => 'Avatar 1']);`
	`330`	`+`
	`331`	`+ $this->assertNull($photo->imageable);`
	`332`	`+ }`
	`333`	`+`
	`334`	`+`
`327`	`335`	`public function testMultiInsertsWithDifferentValues()`
`328`	`336`	`{`
`329`	`337`	`$date = '1970-01-01';`