File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed
Filter options
Expand file tree Collapse file tree 2 files changed +8
-3
lines changed
Original file line number Diff line number Diff line change 9
9
use Carbon \CarbonPeriod ;
10
10
use Closure ;
11
11
use DateTimeInterface ;
12
+ use DateTimeZone ;
12
13
use Illuminate \Database \Query \Builder as BaseBuilder ;
13
14
use Illuminate \Database \Query \Expression ;
14
15
use Illuminate \Support \Arr ;
40
41
use function call_user_func_array ;
41
42
use function count ;
42
43
use function ctype_xdigit ;
44
+ use function date_default_timezone_get ;
43
45
use function dd ;
44
46
use function dump ;
45
47
use function end ;
@@ -1662,7 +1664,8 @@ private function aliasIdForResult(array|object $values): array|object
1662
1664
1663
1665
foreach ($ values as $ key => $ value ) {
1664
1666
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 ()));
1666
1669
} elseif (is_array ($ value ) || $ value instanceof stdClass) {
1667
1670
$ values [$ key ] = $ this ->aliasIdForResult ($ value );
1668
1671
}
@@ -1677,7 +1680,8 @@ private function aliasIdForResult(array|object $values): array|object
1677
1680
1678
1681
foreach (get_object_vars ($ values ) as $ key => $ value ) {
1679
1682
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 ()));
1681
1685
} elseif (is_array ($ value ) || $ value instanceof stdClass) {
1682
1686
$ values ->{$ key } = $ this ->aliasIdForResult ($ value );
1683
1687
}
Original file line number Diff line number Diff line change 4
4
5
5
namespace MongoDB \Laravel \Tests ;
6
6
7
+ use Carbon \Carbon ;
7
8
use Illuminate \Auth \Passwords \PasswordBroker ;
8
9
use Illuminate \Support \Facades \Auth ;
9
10
use Illuminate \Support \Facades \DB ;
@@ -63,7 +64,7 @@ function ($actualUser, $actualToken) use ($user, &$token) {
63
64
$ reminder = DB ::table ('password_reset_tokens ' )->first ();
64
65
$ this ->assertEquals ('john.doe@example.com ' , $ reminder ->email );
65
66
$ this ->assertNotNull ($ reminder ->token );
66
- $ this ->assertInstanceOf (UTCDateTime ::class, $ reminder ->created_at );
67
+ $ this ->assertInstanceOf (Carbon ::class, $ reminder ->created_at );
67
68
68
69
$ credentials = [
69
70
'email ' => 'john.doe@example.com ' ,
You can’t perform that action at this time.
0 commit comments