Manual merge of #487

Author: jenssegers

src/Jenssegers/Mongodb/Model.php

@@ -336,6 +336,15 @@ public function attributesToArray()
             }
         }
 
+        // Convert dot-notation dates.
+        foreach ($this->getDates() as $key)
+        {
+            if (str_contains($key, '.') and array_has($attributes, $key))
+            {
+                array_set($attributes, $key, (string) $this->asDateTime(array_get($attributes, $key)));
+            }
+        }
+
         return $attributes;
     }
 

tests/ModelTest.php

@@ -402,6 +402,10 @@ public function testDates()
 
         $user->setAttribute('entry.date', new DateTime);
         $this->assertInstanceOf('Carbon\Carbon', $user->getAttribute('entry.date'));
+
+        $data = $user->toArray();
+        $this->assertNotInstanceOf('MongoDate', $data['entry']['date']);
+        $this->assertEquals((string) $user->getAttribute('entry.date')->format('Y-m-d H:i:s'), $data['entry']['date']);
     }
 
     public function testIdAttribute()