Merge pull request #741 from Rezouce/2.3

EmbedsOne relationship returns null when no model is associated
mongodb · Feb 15, 2016 · 3c20c17 · 3c20c17
2 parents 6e9b5f4 + 3bc5120
commit 3c20c17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php b/src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php
@@ -233,7 +233,7 @@ protected function getEmbedded()
         // Get raw attributes to skip relations and accessors.
         $attributes = $this->parent->getAttributes();
 
-        $embedded = isset($attributes[$this->localKey]) ? (array) $attributes[$this->localKey] : [];
+        $embedded = isset($attributes[$this->localKey]) ? (array) $attributes[$this->localKey] : null;
 
         return $embedded;
     }

diff --git a/tests/EmbeddedRelationsTest.php b/tests/EmbeddedRelationsTest.php
@@ -505,6 +505,12 @@ public function testEmbedsOneAssociate()
         $this->assertEquals('Mark Doe', $user->father->name);
     }
 
+    public function testEmbedsOneNullAssociation()
+    {
+        $user = User::create();
+        $this->assertNull($user->father);
+    }
+
     public function testEmbedsOneDelete()
     {
         $user = User::create(['name' => 'John Doe']);