fix!: now Time::createFromTimestamp() returns Time with UTC by default

codeigniter4 · Aug 6, 2024 · 410635c · 410635c
1 parent bc61694
commit 410635c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/system/I18n/TimeTrait.php b/system/I18n/TimeTrait.php
@@ -269,7 +269,7 @@ public static function createFromTimestamp(int $timestamp, $timezone = null, ?st
     {
         $time = new self(gmdate('Y-m-d H:i:s', $timestamp), 'UTC', $locale);
 
-        $timezone ??= date_default_timezone_get();
+        $timezone ??= 'UTC';
 
         return $time->setTimezone($timezone);
     }

diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
@@ -277,10 +277,11 @@ public function testCreateFromTimestamp(): void
 
         $timestamp = strtotime('2017-03-18 midnight');
 
+        // The timezone will be UTC if you don't specify.
         $time = Time::createFromTimestamp($timestamp);
 
-        $this->assertSame('Asia/Tokyo', $time->getTimezone()->getName());
-        $this->assertSame('2017-03-18 00:00:00', $time->format('Y-m-d H:i:s'));
+        $this->assertSame('UTC', $time->getTimezone()->getName());
+        $this->assertSame('2017-03-17 15:00:00', $time->format('Y-m-d H:i:s'));
 
         // Restore timezone.
         date_default_timezone_set($tz);