V5

Query Builder return stdClass: https://github.com/laravel/framework/blob/213a370b703592587bafcd52d38a0ad772ff7442/src/Illuminate/Database/Connection.php#L118C16-L118C25
Alias id for _id everywhere
Don't expose _id field:
No _id attribute in Eloquent.
Deprecate reading and writing _id attribute.
Always convert datetime to UTCDateTime: https://github.com/laravel/framework/blob/213a370b703592587bafcd52d38a0ad772ff7442/src/Illuminate/Database/Connection.php#L733-L734
Timezone : using Carbon instead of system timezone.

Author: GromNaN

docs/includes/fundamentals/aggregation/AggregationsBuilderTest.php

@@ -68,7 +68,7 @@ public function testAggregationBuilderSortStage(): void
         // end aggregation sort stage
 
         $this->assertEquals(6, $result->count());
-        $this->assertEquals('Janet Doe', $result->first()['name']);
+        $this->assertEquals('Janet Doe', $result->first()->name);
     }
 
     public function testAggregationBuilderProjectStage(): void
@@ -80,8 +80,9 @@ public function testAggregationBuilderProjectStage(): void
         // end aggregation project stage
 
         $this->assertEquals(6, $result->count());
-        $this->assertNotNull($result->first()['name']);
-        $this->assertArrayNotHasKey('_id', $result->first());
+        $this->assertNotNull($result->first()->name);
+        $this->assertObjectNotHasProperty('_id', $result->first());
+        $this->assertObjectNotHasProperty('id', $result->first());
     }
 
     public function testAggregationBuilderPipeline(): void
@@ -104,7 +105,7 @@ public function testAggregationBuilderPipeline(): void
         $result = $pipeline->get();
 
         $this->assertEquals(2, $result->count());
-        $this->assertNotNull($result->first()['birth_year_avg']);
+        $this->assertNotNull($result->first()->birth_year_avg);
     }
 
     // phpcs:disable Squiz.Commenting.FunctionComment.WrongStyle
@@ -130,6 +131,6 @@ public function testCustomOperatorFactory(): void
         $result = $pipeline->get();
 
         $this->assertEquals(6, $result->count());
-        $this->assertNotNull($result->first()['birth_year']);
+        $this->assertNotNull($result->first()->birth_year);
     }
 }

src/Auth/User.php

@@ -11,6 +11,5 @@ class User extends BaseUser
 {
     use DocumentModel;
 
-    protected $primaryKey = '_id';
     protected $keyType = 'string';
 }

src/Collection.php

@@ -6,6 +6,7 @@
 
 use Exception;
 use MongoDB\BSON\ObjectID;
+use MongoDB\BSON\UTCDateTime;
 use MongoDB\Collection as MongoCollection;
 
 use function array_walk_recursive;

src/Eloquent/Builder.php

@@ -191,7 +191,7 @@ public function raw($value = null)
         }
 
         // The result is a single object.
-        if (is_array($results) && array_key_exists('_id', $results)) {
+        if (is_array($results) && array_key_exists('id', $results)) {
             return $this->model->newFromBuilder((array) $results);
         }
 

src/Eloquent/DocumentModel.php

@@ -76,8 +76,8 @@ public function getIdAttribute($value = null)
     {
         // If we don't have a value for 'id', we will use the MongoDB '_id' value.
         // This allows us to work with models in a more sql-like way.
-        if (! $value && array_key_exists('_id', $this->attributes)) {
-            $value = $this->attributes['_id'];
+        if (! $value && array_key_exists('id', $this->attributes)) {
+            $value = $this->attributes['id'];
         }
 
         // Convert ObjectID to string.
@@ -238,8 +238,8 @@ public function setAttribute($key, $value)
             };
         }
 
-        // Convert _id to ObjectID.
-        if ($key === '_id' && is_string($value)) {
+        // Convert "id" to ObjectID.
+        if ($key === 'id' && is_string($value)) {
             $builder = $this->newBaseQueryBuilder();
 
             $value = $builder->convertKey($value);
@@ -721,9 +721,9 @@ protected function isBSON(mixed $value): bool
     public function save(array $options = [])
     {
         // SQL databases would use autoincrement the id field if set to null.
-        // Apply the same behavior to MongoDB with _id only, otherwise null would be stored.
-        if (array_key_exists('_id', $this->attributes) && $this->attributes['_id'] === null) {
-            unset($this->attributes['_id']);
+        // Apply the same behavior to MongoDB with "id" only, otherwise null would be stored.
+        if (array_key_exists('id', $this->attributes) && $this->attributes['id'] === null) {
+            unset($this->attributes['id']);
         }
 
         $saved = parent::save($options);

src/Eloquent/Model.php

@@ -16,13 +16,6 @@ abstract class Model extends BaseModel
 {
     use DocumentModel;
 
-    /**
-     * The primary key for the model.
-     *
-     * @var string
-     */
-    protected $primaryKey = '_id';
-
     /**
      * The primary key type.
      *

src/MongoDBQueueServiceProvider.php

@@ -4,6 +4,7 @@
 
 namespace MongoDB\Laravel;
 
+use Illuminate\Queue\Failed\DatabaseFailedJobProvider;
 use Illuminate\Queue\Failed\NullFailedJobProvider;
 use Illuminate\Queue\QueueServiceProvider;
 use MongoDB\Laravel\Queue\Failed\MongoFailedJobProvider;
@@ -52,14 +53,14 @@ protected function registerFailedJobServices()
     /**
      * Create a new MongoDB failed job provider.
      */
-    protected function mongoFailedJobProvider(array $config): MongoFailedJobProvider
+    protected function mongoFailedJobProvider(array $config): DatabaseFailedJobProvider
     {
         if (! isset($config['collection']) && isset($config['table'])) {
             trigger_error('Since mongodb/laravel-mongodb 4.4: Using "table" option for the queue is deprecated. Use "collection" instead.', E_USER_DEPRECATED);
             $config['collection'] = $config['table'];
         }
 
-        return new MongoFailedJobProvider(
+        return new DatabaseFailedJobProvider(
             $this->app['db'],
             $config['database'] ?? null,
             $config['collection'] ?? 'failed_jobs',

src/Query/AggregationBuilder.php

@@ -88,7 +88,7 @@ private function execute(array $options): CursorInterface&Iterator
         $pipeline = $encoder->encode($this->getPipeline());
 
         $options = array_replace(
-            ['typeMap' => ['root' => 'array', 'document' => 'array']],
+            ['typeMap' => ['root' => 'object', 'document' => 'object']],
             $this->options,
             $options,
         );

src/Query/Builder.php

@@ -6,6 +6,7 @@
 
 use ArgumentCountError;
 use BadMethodCallException;
+use Carbon\CarbonImmutable;
 use Carbon\CarbonPeriod;
 use Closure;
 use DateTimeInterface;
@@ -25,6 +26,7 @@
 use MongoDB\Driver\Cursor;
 use Override;
 use RuntimeException;
+use stdClass;
 
 use function array_fill_keys;
 use function array_is_list;
@@ -39,20 +41,23 @@
 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;
 use function explode;
 use function func_get_args;
 use function func_num_args;
 use function get_debug_type;
+use function get_object_vars;
 use function implode;
 use function in_array;
 use function is_array;
 use function is_bool;
 use function is_callable;
 use function is_float;
 use function is_int;
+use function is_object;
 use function is_string;
 use function md5;
 use function preg_match;
@@ -227,7 +232,7 @@ public function hint($index)
     /** @inheritdoc */
     public function find($id, $columns = [])
     {
-        return $this->where('_id', '=', $this->convertKey($id))->first($columns);
+        return $this->where('id', '=', $this->convertKey($id))->first($columns);
     }
 
     /** @inheritdoc */
@@ -391,7 +396,7 @@ public function toMql(): array
             }
 
             $options = [
-                'typeMap' => ['root' => 'array', 'document' => 'array'],
+                'typeMap' => ['root' => 'object', 'document' => 'array'],
             ];
 
             // Add custom query options
@@ -451,7 +456,7 @@ public function toMql(): array
         }
 
         // Fix for legacy support, converts the results to arrays instead of objects.
-        $options['typeMap'] = ['root' => 'array', 'document' => 'array'];
+        $options['typeMap'] = ['root' => 'object', 'document' => 'array'];
 
         // Add custom query options
         if (count($this->options)) {
@@ -506,7 +511,7 @@ public function getFresh($columns = [], $returnLazy = false)
         if ($returnLazy) {
             return LazyCollection::make(function () use ($result) {
                 foreach ($result as $item) {
-                    yield $this->aliasIdForResult($item);
+                    yield is_object($item) ? $this->aliasIdForResult($item) : $item;
                 }
             });
         }
@@ -515,8 +520,8 @@ public function getFresh($columns = [], $returnLazy = false)
             $result = $result->toArray();
         }
 
-        foreach ($result as &$document) {
-            $document = $this->aliasIdForResult($document);
+        foreach ($result as &$item) {
+            $item = is_object($item) ? $this->aliasIdForResult($item) : $item;
         }
 
         return new Collection($result);
@@ -590,7 +595,7 @@ public function aggregate($function = null, $columns = ['*'])
         if (isset($results[0])) {
             $result = (array) $results[0];
 
-            return $result['aggregate'];
+            return $this->aliasIdForResult($result['aggregate']);
         }
     }
 
@@ -628,6 +633,7 @@ public function orderBy($column, $direction = 'asc')
         }
 
         $column = (string) $column;
+
         if ($column === 'natural') {
             $this->orders['$natural'] = $direction;
         } else {
@@ -692,10 +698,9 @@ public function insert(array $values)
                 if (isset($document['_id']) && $document['_id'] !== $document['id']) {
                     throw new InvalidArgumentException('Cannot insert document with different "id" and "_id" values');
                 }
-
-                $document['_id'] = $document['id'];
-                unset($document['id']);
             }
+
+            $document = $this->aliasIdForQuery($document);
         }
 
         $options = $this->inheritConnectionOptions();
@@ -710,6 +715,8 @@ public function insertGetId(array $values, $sequence = null)
     {
         $options = $this->inheritConnectionOptions();
 
+        $values = $this->aliasIdForQuery($values);
+
         $result = $this->collection->insertOne($values, $options);
 
         if (! $result->isAcknowledged()) {
@@ -735,13 +742,6 @@ public function update(array $values, array $options = [])
             unset($values[$key]);
         }
 
-        // Since "id" is an alias for "_id", we prevent updating it
-        foreach ($values as $fields) {
-            if (array_key_exists('id', $fields)) {
-                throw new InvalidArgumentException('Cannot update "id" field.');
-            }
-        }
-
         return $this->performUpdate($values, $options);
     }
 
@@ -778,9 +778,9 @@ public function pluck($column, $key = null)
         $results = $this->get($key === null ? [$column] : [$column, $key]);
 
         // Convert ObjectID's to strings
-        if (((string) $key) === '_id') {
+        if (((string) $key) === 'id') {
             $results = $results->map(function ($item) {
-                $item['_id'] = (string) $item['_id'];
+                $item->id = (string) $item->id;
 
                 return $item;
             });
@@ -798,13 +798,14 @@ public function delete($id = null)
         // the ID to allow developers to simply and quickly remove a single row
         // from their database without manually specifying the where clauses.
         if ($id !== null) {
-            $this->where('_id', '=', $id);
+            $this->where('id', '=', $id);
         }
 
         $wheres  = $this->compileWheres();
         $options = $this->inheritConnectionOptions();
 
-        if (is_int($this->limit)) {
+        /** 1000 is a large value used by Laravel {@see DatabaseFailedJobProvider} */
+        if (is_int($this->limit) && $this->limit !== 1000) {
             if ($this->limit !== 1) {
                 throw new LogicException(sprintf('Delete limit can be 1 or null (unlimited). Got %d', $this->limit));
             }
@@ -997,15 +998,19 @@ protected function performUpdate(array $update, array $options = [])
         }
 
         // Since "id" is an alias for "_id", we prevent updating it
-        foreach ($update as $operator => $fields) {
+        foreach ($update as &$fields) {
             if (array_key_exists('id', $fields)) {
                 throw new InvalidArgumentException('Cannot update "id" field.');
             }
+
+            // Rename "id" to "_id" for embedded documents
+            $fields = $this->aliasIdForQuery($fields);
         }
 
         $options = $this->inheritConnectionOptions($options);
 
         $wheres = $this->compileWheres();
+
         $result = $this->collection->updateMany($wheres, $update, $options);
         if ($result->isAcknowledged()) {
             return $result->getModifiedCount() ? $result->getModifiedCount() : $result->getUpsertedCount();
@@ -1188,7 +1193,7 @@ protected function compileWheres(): array
             }
         }
 
-        return $compiled;
+        return $this->aliasIdForQuery($compiled);
     }
 
     protected function compileWhereBasic(array $where): array
@@ -1561,13 +1566,52 @@ private function aliasIdForQuery(array $values): array
             unset($values['id']);
         }
 
+        foreach ($values as $key => $value) {
+            if (is_string($key) && str_ends_with($key, '.id')) {
+                $values[substr($key, 0, -3) . '._id'] = $value;
+                unset($values[$key]);
+            }
+        }
+
+        foreach ($values as &$value) {
+            if ($value instanceof DateTimeInterface) {
+                $value = new UTCDateTime($value);
+            } elseif (is_array($value)) {
+                $value = $this->aliasIdForQuery($value);
+            }
+        }
+
         return $values;
     }
 
-    private function aliasIdForResult(array $values): array
+    private function aliasIdForResult(stdClass|array $values): stdClass|array
     {
-        if (isset($values['_id'])) {
-            $values['id'] = $values['_id'];
+        if (is_array($values)) {
+            if (isset($values['_id'])) {
+                $values['id'] = $values['_id'];
+                unset($values['_id']);
+            }
+
+            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) {
+                    $values[$key] = $this->aliasIdForResult($value);
+                }
+            }
+        } else {
+            if (isset($values->_id)) {
+                $values->id = $values->_id;
+                unset($values->_id);
+            }
+
+            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) {
+                    $values->{$key} = $this->aliasIdForResult($value);
+                }
+            }
         }
 
         return $values;