[4.x] Improved Timezone Handling (#197)

duncanmcclean · web-flow · commit 9be49b4c7061 · 2025-05-01T10:55:53.000+01:00
* Take the "display timezone" into account when setting Carbon string format

* Use `Statamic::displayTimezone()`
diff --git a/src/Generator.php b/src/Generator.php
@@ -271,7 +271,9 @@ protected function makeContentGenerationClosures($pages, $request)
                     $oldCarbonFormat = $this->getToStringFormat();
 
                     if ($this->shouldSetCarbonFormat($page)) {
-                        Carbon::setToStringFormat(Statamic::dateFormat());
+                        Date::setToStringFormat(function (Carbon $date) {
+                            return $date->setTimezone(Statamic::displayTimezone())->format(Statamic::dateFormat());
+                        });
                     }
 
                     $this->updateCurrentSite($page->site());
@@ -489,7 +491,7 @@ protected function shouldRejectPage($page, $outputError = false)
      *
      * @throws \ReflectionException
      */
-    protected function getToStringFormat(): ?string
+    protected function getToStringFormat(): string|\Closure|null
     {
         $reflection = new ReflectionClass($date = Date::now());
 

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,9 @@ protected function makeContentGenerationClosures($pages, $request)`
`271`	`271`	`$oldCarbonFormat = $this->getToStringFormat();`
`272`	`272`
`273`	`273`	`if ($this->shouldSetCarbonFormat($page)) {`
`274`		`- Carbon::setToStringFormat(Statamic::dateFormat());`
	`274`	`+ Date::setToStringFormat(function (Carbon $date) {`
	`275`	`+ return $date->setTimezone(Statamic::displayTimezone())->format(Statamic::dateFormat());`
	`276`	`+ });`
`275`	`277`	`}`
`276`	`278`
`277`	`279`	`$this->updateCurrentSite($page->site());`
`@@ -489,7 +491,7 @@ protected function shouldRejectPage($page, $outputError = false)`
`489`	`491`	`*`
`490`	`492`	`* @throws \ReflectionException`
`491`	`493`	`*/`
`492`		`- protected function getToStringFormat(): ?string`
	`494`	`+ protected function getToStringFormat(): string\|\Closure\|null`
`493`	`495`	`{`
`494`	`496`	`$reflection = new ReflectionClass($date = Date::now());`
`495`	`497`