[1.x] Ensure run at is always returned to the front end in UTC (#425)

* ensure run at is always returned to the front end in UTC * Fix code styling --------- Co-authored-by: timacdonald <[email protected]>
laravel · Nov 29, 2024 · 8e0107f · 8e0107f
1 parent 17353de
commit 8e0107f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Livewire/Concerns/RemembersQueries.php b/src/Livewire/Concerns/RemembersQueries.php
@@ -20,7 +20,7 @@ trait RemembersQueries
     public function remember(callable $query, string $key = '', DateTimeInterface|DateInterval|Closure|int|null $ttl = 5): array
     {
         return App::make(CacheStoreResolver::class)->store()->remember('laravel:pulse:'.static::class.':'.$key.':'.$this->period, $ttl, function () use ($query) {
-            $start = CarbonImmutable::now()->toDateTimeString();
+            $start = CarbonImmutable::now('UTC')->toDateTimeString();
 
             [$value, $duration] = Benchmark::value(fn () => $query($this->periodAsInterval()));
 

diff --git a/tests/Feature/Livewire/RemembersQueriesTest.php b/tests/Feature/Livewire/RemembersQueriesTest.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Support\Carbon;
+use Laravel\Pulse\Livewire\SlowQueries;
+use Livewire\Livewire;
+
+it('always returns the run at date in UTC time', function () {
+    date_default_timezone_set('Australia/Melbourne');
+    Carbon::setTestNow(Carbon::createFromFormat('Y-m-d H:i:s', '2000-01-01 13:00:00', 'UTC'));
+
+    Livewire::test(SlowQueries::class, ['lazy' => false, 'disableHighlighting' => true])
+        ->assertSeeHtml(<<<'HTML'
+            Run at: ${formatDate(&#039;2000-01-01 13:00:00&#039;)}
+            HTML);
+});