Use the current timezone when reading an UTCDateTime

Author: GromNaN

Diff for: src/Eloquent/DocumentModel.php

@@ -100,7 +100,7 @@ public function getQualifiedKeyName()
     }
 
     /**
-     * Convert a DateTime to a storable UTCDateTime.
+     * Convert a DateTimeInterface (including Carbon) to a storable UTCDateTime.
      *
      * @see HasAttributes::fromDateTime()
      *
@@ -122,7 +122,7 @@ public function fromDateTime($value): UTCDateTime
     }
 
     /**
-     * Return a timestamp as DateTime object.
+     * Return a timestamp as Carbon object.
      *
      * @see HasAttributes::asDateTime()
      *

Diff for: src/Query/Builder.php

@@ -9,6 +9,7 @@
 use Carbon\CarbonPeriod;
 use Closure;
 use DateTimeInterface;
+use DateTimeZone;
 use Illuminate\Database\Query\Builder as BaseBuilder;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Arr;
@@ -40,6 +41,7 @@
 use function call_user_func_array;
 use function count;
 use function ctype_xdigit;
+use function date_default_timezone_get;
 use function dd;
 use function dump;
 use function end;
@@ -1662,8 +1664,9 @@ private function aliasIdForResult(array|object $values): array|object
 
             foreach ($values as $key => $value) {
                 if ($value instanceof UTCDateTime) {
-                    $values[$key] = Date::instance($value->toDateTime());
-                } elseif (is_array($value) || $value instanceof stdClass) {
+                    $values[$key] = Date::instance($value->toDateTime())
+                        ->setTimezone(new DateTimeZone(date_default_timezone_get()));
+                } elseif (is_array($value) || is_object($value)) {
                     $values[$key] = $this->aliasIdForResult($value);
                 }
             }
@@ -1677,8 +1680,9 @@ private function aliasIdForResult(array|object $values): array|object
 
             foreach (get_object_vars($values) as $key => $value) {
                 if ($value instanceof UTCDateTime) {
-                    $values->{$key} = Date::instance($value->toDateTime());
-                } elseif (is_array($value) || $value instanceof stdClass) {
+                    $values->{$key} = Date::instance($value->toDateTime())
+                        ->setTimezone(new DateTimeZone(date_default_timezone_get()));
+                } elseif (is_array($value) || is_object($value)) {
                     $values->{$key} = $this->aliasIdForResult($value);
                 }
             }

Diff for: tests/AuthTest.php

@@ -4,11 +4,11 @@
 
 namespace MongoDB\Laravel\Tests;
 
+use Carbon\Carbon;
 use Illuminate\Auth\Passwords\PasswordBroker;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
-use MongoDB\BSON\UTCDateTime;
 use MongoDB\Laravel\Tests\Models\User;
 
 use function bcrypt;
@@ -63,7 +63,7 @@ function ($actualUser, $actualToken) use ($user, &$token) {
         $reminder = DB::table('password_reset_tokens')->first();
         $this->assertEquals('[email protected]', $reminder->email);
         $this->assertNotNull($reminder->token);
-        $this->assertInstanceOf(UTCDateTime::class, $reminder->created_at);
+        $this->assertInstanceOf(Carbon::class, $reminder->created_at);
 
         $credentials = [
             'email' => '[email protected]',

Diff for: tests/QueueTest.php

@@ -11,7 +11,6 @@
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Str;
 use Mockery;
-use MongoDB\BSON\UTCDateTime;
 use MongoDB\Laravel\Queue\MongoJob;
 use MongoDB\Laravel\Queue\MongoQueue;
 
@@ -197,7 +196,7 @@ public function testFailedJobLogging()
         $this->assertSame('test_connection', $failedJob->connection);
         $this->assertSame('test_queue', $failedJob->queue);
         $this->assertSame('test_payload', $failedJob->payload);
-        $this->assertEquals(new UTCDateTime(Carbon::now()), $failedJob->failed_at);
+        $this->assertEquals(Carbon::now(), $failedJob->failed_at);
         $this->assertStringStartsWith('Exception: test_exception in ', $failedJob->exception);
     }
 }