Skip to content

Commit 8c21036

Browse files
committed
Use the current timezone when reading an UTCDateTime
1 parent 053a893 commit 8c21036

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Diff for: src/Query/Builder.php

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Carbon\CarbonPeriod;
1010
use Closure;
1111
use DateTimeInterface;
12+
use DateTimeZone;
1213
use Illuminate\Database\Query\Builder as BaseBuilder;
1314
use Illuminate\Database\Query\Expression;
1415
use Illuminate\Support\Arr;
@@ -40,6 +41,7 @@
4041
use function call_user_func_array;
4142
use function count;
4243
use function ctype_xdigit;
44+
use function date_default_timezone_get;
4345
use function dd;
4446
use function dump;
4547
use function end;
@@ -1662,7 +1664,8 @@ private function aliasIdForResult(array|object $values): array|object
16621664

16631665
foreach ($values as $key => $value) {
16641666
if ($value instanceof UTCDateTime) {
1665-
$values[$key] = Date::instance($value->toDateTime());
1667+
$values[$key] = Date::instance($value->toDateTime())
1668+
->setTimezone(new DateTimeZone(date_default_timezone_get()));
16661669
} elseif (is_array($value) || $value instanceof stdClass) {
16671670
$values[$key] = $this->aliasIdForResult($value);
16681671
}
@@ -1677,7 +1680,8 @@ private function aliasIdForResult(array|object $values): array|object
16771680

16781681
foreach (get_object_vars($values) as $key => $value) {
16791682
if ($value instanceof UTCDateTime) {
1680-
$values->{$key} = Date::instance($value->toDateTime());
1683+
$values->{$key} = Date::instance($value->toDateTime())
1684+
->setTimezone(new DateTimeZone(date_default_timezone_get()));
16811685
} elseif (is_array($value) || $value instanceof stdClass) {
16821686
$values->{$key} = $this->aliasIdForResult($value);
16831687
}

0 commit comments

Comments
 (0)