[11.x] Apply default timezone when casting unix timestamps (#50751)

* [11.x] Apply default timezone when casting unix timestamps * Add additional date_default_timezone_get calls --------- Co-authored-by: Sergey Danilchenko <[email protected]> Co-authored-by: Dries Vints <[email protected]>
illuminate · Mar 25, 2024 · e868783 · e868783
1 parent d1b7290
commit e868783
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/DatabaseBatchRepository.php b/DatabaseBatchRepository.php
@@ -374,9 +374,9 @@ protected function toBatch($batch)
             (int) $batch->failed_jobs,
             (array) json_decode($batch->failed_job_ids, true),
             $this->unserialize($batch->options),
-            CarbonImmutable::createFromTimestamp($batch->created_at),
-            $batch->cancelled_at ? CarbonImmutable::createFromTimestamp($batch->cancelled_at) : $batch->cancelled_at,
-            $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at) : $batch->finished_at
+            CarbonImmutable::createFromTimestamp($batch->created_at, date_default_timezone_get()),
+            $batch->cancelled_at ? CarbonImmutable::createFromTimestamp($batch->cancelled_at, date_default_timezone_get()) : $batch->cancelled_at,
+            $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at, date_default_timezone_get()) : $batch->finished_at
         );
     }
 

diff --git a/DynamoBatchRepository.php b/DynamoBatchRepository.php
@@ -411,9 +411,9 @@ protected function toBatch($batch)
             (int) $batch->failed_jobs,
             $batch->failed_job_ids,
             $this->unserialize($batch->options) ?? [],
-            CarbonImmutable::createFromTimestamp($batch->created_at),
-            $batch->cancelled_at ? CarbonImmutable::createFromTimestamp($batch->cancelled_at) : $batch->cancelled_at,
-            $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at) : $batch->finished_at
+            CarbonImmutable::createFromTimestamp($batch->created_at, date_default_timezone_get()),
+            $batch->cancelled_at ? CarbonImmutable::createFromTimestamp($batch->cancelled_at, date_default_timezone_get()) : $batch->cancelled_at,
+            $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at, date_default_timezone_get()) : $batch->finished_at
         );
     }