PHPORM-234 Convert dates in DB Query results

Author: GromNaN

src/Query/Builder.php

@@ -14,6 +14,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Date;
 use Illuminate\Support\LazyCollection;
 use InvalidArgumentException;
 use LogicException;
@@ -1646,6 +1647,8 @@ private function aliasIdForResult(array $values): array
         foreach ($values as $key => $value) {
             if (is_array($value)) {
                 $values[$key] = $this->aliasIdForResult($value);
+            } elseif ($value instanceof UTCDateTime) {
+                $values[$key] = Date::instance($value->toDateTime());
             }
         }
 

tests/QueryBuilderTest.php

@@ -4,6 +4,7 @@
 
 namespace MongoDB\Laravel\Tests;
 
+use Carbon\Carbon;
 use DateTime;
 use DateTimeImmutable;
 use Illuminate\Support\Facades\Date;
@@ -33,7 +34,6 @@
 use function md5;
 use function sort;
 use function strlen;
-use function strtotime;
 
 class QueryBuilderTest extends TestCase
 {
@@ -677,27 +677,31 @@ public function testUpdateSubdocument()
     public function testDates()
     {
         DB::table('users')->insert([
-            ['name' => 'John Doe', 'birthday' => new UTCDateTime(Date::parse('1980-01-01 00:00:00'))],
-            ['name' => 'Robert Roe', 'birthday' => new UTCDateTime(Date::parse('1982-01-01 00:00:00'))],
-            ['name' => 'Mark Moe', 'birthday' => new UTCDateTime(Date::parse('1983-01-01 00:00:00.1'))],
-            ['name' => 'Frank White', 'birthday' => new UTCDateTime(Date::parse('1960-01-01 12:12:12.1'))],
+            ['name' => 'John Doe', 'birthday' => Date::parse('1980-01-01 00:00:00')],
+            ['name' => 'Robert Roe', 'birthday' => Date::parse('1982-01-01 00:00:00')],
+            ['name' => 'Mark Moe', 'birthday' => Date::parse('1983-01-01 00:00:00.1')],
+            ['name' => 'Frank White', 'birthday' => Date::parse('1960-01-01 12:12:12.1')],
         ]);
 
         $user = DB::table('users')
-            ->where('birthday', new UTCDateTime(Date::parse('1980-01-01 00:00:00')))
+            ->where('birthday', Date::parse('1980-01-01 00:00:00'))
             ->first();
         $this->assertEquals('John Doe', $user['name']);
 
         $user = DB::table('users')
-            ->where('birthday', new UTCDateTime(Date::parse('1960-01-01 12:12:12.1')))
+            ->where('birthday', Date::parse('1960-01-01 12:12:12.1'))
             ->first();
         $this->assertEquals('Frank White', $user['name']);
+        $this->assertInstanceOf(Carbon::class, $user['birthday']);
+        $this->assertSame('1960-01-01 12:12:12.100000', $user['birthday']->format('Y-m-d H:i:s.u'));
 
         $user = DB::table('users')->where('birthday', '=', new DateTime('1980-01-01 00:00:00'))->first();
         $this->assertEquals('John Doe', $user['name']);
+        $this->assertInstanceOf(Carbon::class, $user['birthday']);
+        $this->assertSame('1980-01-01 00:00:00.000000', $user['birthday']->format('Y-m-d H:i:s.u'));
 
-        $start = new UTCDateTime(1000 * strtotime('1950-01-01 00:00:00'));
-        $stop  = new UTCDateTime(1000 * strtotime('1981-01-01 00:00:00'));
+        $start = Carbon::parse('1950-01-01 00:00:00');
+        $stop  = Carbon::parse('1981-01-01 00:00:00');
 
         $users = DB::table('users')->whereBetween('birthday', [$start, $stop])->get();
         $this->assertCount(2, $users);