Merge pull request #27 from sander3/single-relationship-bugfix

Resolves #26
sander3 · Apr 14, 2019 · 957036e · 957036e
2 parents 03bfb49 + 6cfe612
commit 957036e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Portable.php b/src/Portable.php
@@ -73,12 +73,21 @@ private function getPortableRelations(array $relations)
      */
     private function loadPortableRelation(string $relation)
     {
-        $this->attributes[$relation] = $this
-            ->$relation()
+        $instance = $this->$relation();
+
+        $collection = $instance
             ->get()
             ->transform(function ($item) {
                 return $item->portable();
             });
+
+        $class = class_basename(get_class($instance));
+
+        if (in_array($class, ['HasOne', 'BelongsTo'])) {
+            $collection = $collection->first();
+        }
+
+        $this->attributes[$relation] = $collection;
     }
 
     /**