Fix ID conversion for toJson and toArray

Author: jenssegers

src/Jenssegers/Mongodb/Model.php

@@ -195,14 +195,18 @@ public function attributesToArray()
     {
         $attributes = parent::attributesToArray();
 
+        // Because the original Eloquent never returns objects, we convert
+        // MongoDB related objects to a string representation. This kind
+        // of mimics the SQL behaviour so that dates are formatted
+        // nicely when your models are converted to JSON.
         foreach ($attributes as &$value)
         {
-            /**
-             * Here we convert MongoDate instances to string. This mimics
-             * original SQL behaviour so that dates are formatted nicely
-             * when your models are converted to JSON.
-             */
-            if ($value instanceof MongoDate)
+            if ($value instanceof MongoId)
+            {
+                $value = (string) $value;
+            }
+
+            else if ($value instanceof MongoDate)
             {
                 $value = $this->asDateTime($value)->format($this->getDateFormat());
             }

tests/ModelTest.php

@@ -287,6 +287,7 @@ public function testToArray()
 		$this->assertEquals(array('_id', 'created_at', 'name', 'type', 'updated_at'), $keys);
 		$this->assertTrue(is_string($array['created_at']));
 		$this->assertTrue(is_string($array['updated_at']));
+		$this->assertTrue(is_string($array['_id']));
 	}
 
 	public function testUnset()