Merge branch 'master' into develop

Author: jenssegers

src/Jenssegers/Mongodb/Model.php

@@ -8,6 +8,7 @@
 use Jenssegers\Mongodb\Builder as QueryBuilder;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 
+use Carbon\Carbon;
 use DateTime;
 use MongoId;
 use MongoDate;
@@ -66,19 +67,25 @@ public function fromDateTime($value)
      */
     protected function asDateTime($value)
     {
-        // Convert MongoDate to timestamp
-        if ($value instanceof MongoDate)
+        // Convert timestamp
+        if (is_numeric($value))
         {
-            $value = $value->sec;
+            return Carbon::createFromTimestamp($value);
         }
 
-        // Convert timestamp to string for DateTime
-        if (is_int($value))
+        // Convert string
+        if (is_string($value))
+        {
+            return new Carbon($value);
+        }
+
+        // Convert MongoDate
+        if ($value instanceof MongoDate)
         {
-            $value = "@$value";
+            return Carbon::createFromTimestamp($value->sec);
         }
 
-        return new DateTime($value);
+        return Carbon::instance($value);
     }
 
     /**

tests/ModelTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use Carbon;
+
 class ModelTest extends PHPUnit_Framework_TestCase {
 
 	public function setUp() {}
@@ -37,7 +39,7 @@ public function testInsert()
 		$this->assertTrue(isset($user->_id));
 		$this->assertNotEquals('', (string) $user->_id);
 		$this->assertNotEquals(0, strlen((string) $user->_id));
-		$this->assertInstanceOf('DateTime', $user->created_at);
+		$this->assertInstanceOf('Carbon\Carbon', $user->created_at);
 
 		$this->assertEquals('John Doe', $user->name);
 		$this->assertEquals(35, $user->age);
@@ -57,8 +59,8 @@ public function testUpdate()
 		$check->save();
 
 		$this->assertEquals(true, $check->exists);
-		$this->assertInstanceOf('DateTime', $check->created_at);
-		$this->assertInstanceOf('DateTime', $check->updated_at);
+		$this->assertInstanceOf('Carbon\Carbon', $check->created_at);
+		$this->assertInstanceOf('Carbon\Carbon', $check->updated_at);
 		$this->assertEquals(1, User::count());
 
 		$this->assertEquals('John Doe', $check->name);
@@ -229,7 +231,7 @@ public function testSoftDelete()
 		$this->assertEquals(1, $all->count());
 
 		$check = $all[0];
-		$this->assertInstanceOf('DateTime', $check->deleted_at);
+		$this->assertInstanceOf('Carbon\Carbon', $check->deleted_at);
 		$this->assertEquals(true, $check->trashed());
 
 		$check->restore();
@@ -312,11 +314,11 @@ public function testUnset()
 	public function testDates()
 	{
 		$user = User::create(array('name' => 'John Doe', 'birthday' => new DateTime('1980/1/1')));
-		$this->assertInstanceOf('DateTime', $user->birthday);
+		$this->assertInstanceOf('Carbon\Carbon', $user->birthday);
 
-		// Re-fetch to be sure
-		$user = User::find($user->_id);
-		$this->assertInstanceOf('DateTime', $user->birthday);
+		$check = User::find($user->_id);
+		$this->assertInstanceOf('Carbon\Carbon', $check->birthday);
+		$this->assertEquals($user->birthday, $check->birthday);
 
 		$user = User::where('birthday', '>', new DateTime('1975/1/1'))->first();
 		$this->assertEquals('John Doe', $user->name);