Remove date conversion from results

Author: GromNaN

docs/includes/usage-examples/FindOneTest.php

@@ -24,13 +24,13 @@ public function testFindOne(): void
 
         // begin-find-one
         $movie = Movie::where('directors', 'Rob Reiner')
-          ->orderBy('_id')
+          ->orderBy('id')
           ->first();
 
         echo $movie->toJson();
         // end-find-one
 
         $this->assertInstanceOf(Movie::class, $movie);
-        $this->expectOutputRegex('/^{"_id":"[a-z0-9]{24}","title":"The Shawshank Redemption","directors":\["Frank Darabont","Rob Reiner"\]}$/');
+        $this->expectOutputRegex('/^{"title":"The Shawshank Redemption","directors":\["Frank Darabont","Rob Reiner"\],"id":"[a-z0-9]{24}"}$/');
     }
 }

docs/includes/usage-examples/InsertOneTest.php

@@ -30,6 +30,6 @@ public function testInsertOne(): void
         // end-insert-one
 
         $this->assertInstanceOf(Movie::class, $movie);
-        $this->expectOutputRegex('/^{"title":"Marriage Story","year":2019,"runtime":136,"updated_at":".{27}","created_at":".{27}","_id":"[a-z0-9]{24}"}$/');
+        $this->expectOutputRegex('/^{"title":"Marriage Story","year":2019,"runtime":136,"updated_at":".{27}","created_at":".{27}","id":"[a-z0-9]{24}"}$/');
     }
 }

src/Query/Builder.php

@@ -1593,9 +1593,7 @@ private function aliasIdForResult(stdClass|array $values): stdClass|array
             }
 
             foreach ($values as $key => $value) {
-                if ($value instanceof UTCDateTime) {
-                    $values[$key] = CarbonImmutable::createFromTimestamp($value->toDateTime()->getTimestamp(), 'UTC')->setTimezone(date_default_timezone_get());
-                } elseif (is_array($value) || $value instanceof stdClass) {
+                if (is_array($value) || $value instanceof stdClass) {
                     $values[$key] = $this->aliasIdForResult($value);
                 }
             }
@@ -1606,9 +1604,7 @@ private function aliasIdForResult(stdClass|array $values): stdClass|array
             }
 
             foreach (get_object_vars($values) as $key => $value) {
-                if ($value instanceof UTCDateTime) {
-                    $values->{$key} = CarbonImmutable::createFromTimestamp($value->toDateTime()->getTimestamp(), 'UTC')->setTimezone(date_default_timezone_get());
-                } elseif (is_array($value) || $value instanceof stdClass) {
+                if (is_array($value) || $value instanceof stdClass) {
                     $values->{$key} = $this->aliasIdForResult($value);
                 }
             }

tests/AuthTest.php

@@ -9,6 +9,7 @@
 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 +64,7 @@ function ($actualUser, $actualToken) use ($user, &$token) {
         $reminder = DB::collection('password_reset_tokens')->first();
         $this->assertEquals('[email protected]', $reminder->email);
         $this->assertNotNull($reminder->token);
-        $this->assertInstanceOf(DateTimeInterface::class, $reminder->created_at);
+        $this->assertInstanceOf(UTCDateTime::class, $reminder->created_at);
 
         $credentials = [
             'email' => '[email protected]',

tests/Casts/DecimalTest.php

@@ -120,7 +120,7 @@ private function setBSONType($value, $id = null)
         return Casting::raw(function (Collection $collection) use ($id, $value) {
             if (! empty($id)) {
                 return $collection->updateOne(
-                    ['id' => $id],
+                    ['_id' => $id], // "id" is not translated to "_id" by the raw method
                     ['$set' => ['decimalNumber' => $value]],
                 );
             }

tests/QueueTest.php

@@ -10,6 +10,7 @@
 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;
 
@@ -188,7 +189,7 @@ public function testFailedJobLogging()
         $this->assertSame('test_connection', $failedJob->connection);
         $this->assertSame('test_queue', $failedJob->queue);
         $this->assertSame('test_payload', $failedJob->payload);
-        $this->assertEquals(Carbon::now(), $failedJob->failed_at);
+        $this->assertEquals(new UTCDateTime(Carbon::now()), $failedJob->failed_at);
         $this->assertStringStartsWith('Exception: test_exception in ', $failedJob->exception);
     }
 }