Remove BSON date conversion from DocumentModel

Author: GromNaN

src/Eloquent/DocumentModel.php

@@ -5,10 +5,8 @@
 namespace MongoDB\Laravel\Eloquent;
 
 use BackedEnum;
-use Carbon\Carbon;
 use Carbon\CarbonInterface;
 use DateTimeInterface;
-use DateTimeZone;
 use Illuminate\Contracts\Queue\QueueableCollection;
 use Illuminate\Contracts\Queue\QueueableEntity;
 use Illuminate\Contracts\Support\Arrayable;
@@ -35,7 +33,6 @@
 use function array_values;
 use function class_basename;
 use function count;
-use function date_default_timezone_get;
 use function explode;
 use function func_get_args;
 use function in_array;
@@ -121,24 +118,6 @@ public function fromDateTime($value): UTCDateTime
         return new UTCDateTime($value);
     }
 
-    /**
-     * Return a timestamp as DateTime object.
-     *
-     * @see HasAttributes::asDateTime()
-     *
-     * @param  mixed $value
-     */
-    protected function asDateTime($value): Carbon
-    {
-        // Convert UTCDateTime instances to Carbon.
-        if ($value instanceof UTCDateTime) {
-            return Date::instance($value->toDateTime())
-                ->setTimezone(new DateTimeZone(date_default_timezone_get()));
-        }
-
-        return parent::asDateTime($value);
-    }
-
     /** @inheritdoc */
     public function getDateFormat()
     {

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,7 +1664,8 @@ private function aliasIdForResult(array|object $values): array|object
 
             foreach ($values as $key => $value) {
                 if ($value instanceof UTCDateTime) {
-                    $values[$key] = Date::instance($value->toDateTime());
+                    $values[$key] = Date::instance($value->toDateTime())
+                        ->setTimezone(new DateTimeZone(date_default_timezone_get()));
                 } elseif (is_array($value) || $value instanceof stdClass) {
                     $values[$key] = $this->aliasIdForResult($value);
                 }
@@ -1677,7 +1680,8 @@ 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());
+                    $values->{$key} = Date::instance($value->toDateTime())
+                        ->setTimezone(new DateTimeZone(date_default_timezone_get()));
                 } elseif (is_array($value) || $value instanceof stdClass) {
                     $values->{$key} = $this->aliasIdForResult($value);
                 }