Make TimeZoneRegion::utc() return a TimeZoneRegion not an TimeZoneOffset

brick · Aug 5, 2024 · a3c2a40 · a3c2a40
1 parent 727a192
commit a3c2a40
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/src/Instant.php b/src/Instant.php
@@ -363,7 +363,7 @@ public function jsonSerialize(): string
      */
     public function toISOString(): string
     {
-        return (string) ZonedDateTime::ofInstant($this, TimeZone::utc());
+        return (string) ZonedDateTime::ofInstant($this, TimeZoneOffset::utc());
     }
 
     /**

diff --git a/src/LocalDateTime.php b/src/LocalDateTime.php
@@ -715,7 +715,7 @@ public function isPast(TimeZone $timeZone, ?Clock $clock = null): bool
      */
     public function toNativeDateTime(): DateTime
     {
-        return $this->atTimeZone(TimeZone::utc())->toNativeDateTime();
+        return $this->atTimeZone(TimeZoneOffset::utc())->toNativeDateTime();
     }
 
     /**

diff --git a/src/TimeZoneRegion.php b/src/TimeZoneRegion.php
@@ -55,6 +55,11 @@ public static function from(DateTimeParseResult $result): TimeZoneRegion
         return TimeZoneRegion::of($region);
     }
 
+    public static function utc() : TimeZoneRegion
+    {
+        return TimeZoneRegion::of('UTC');
+    }
+
     /**
      * Returns all the available time-zone identifiers.
      *

diff --git a/tests/InstantTest.php b/tests/InstantTest.php
@@ -8,7 +8,7 @@
 use Brick\DateTime\DateTimeException;
 use Brick\DateTime\Duration;
 use Brick\DateTime\Instant;
-use Brick\DateTime\TimeZone;
+use Brick\DateTime\TimeZoneOffset;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 use function json_encode;
@@ -658,7 +658,7 @@ public static function providerToString(): array
 
     public function testAtTimeZone(): void
     {
-        $timeZone = TimeZone::utc();
+        $timeZone = TimeZoneOffset::utc();
         $instant = Instant::of(1000000000);
         $result = $instant->atTimeZone($timeZone);
         self::assertSame(1000000000, $result->getInstant()->getEpochSecond());

diff --git a/tests/TimeZoneOffsetTest.php b/tests/TimeZoneOffsetTest.php
@@ -10,6 +10,7 @@
 use Brick\DateTime\TimeZoneOffset;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\DataProvider;
+use Brick\DateTime\TimeZoneRegion;
 
 use const PHP_VERSION_ID;
 

diff --git a/tests/TimeZoneRegionTest.php b/tests/TimeZoneRegionTest.php
@@ -163,4 +163,11 @@ public function testToString(): void
     {
         self::assertSame('America/Los_Angeles', (string) TimeZoneRegion::of('America/Los_Angeles'));
     }
+
+    public function testUTC(): void
+    {
+        $utcTimeZoneRegion = TimeZoneRegion::utc();
+        $this->assertInstanceOf(TimeZoneRegion::class, $utcTimeZoneRegion);
+        $this->assertSame('UTC', $utcTimeZoneRegion->getId());
+    }
 }
diff --git a/tests/TimeZoneTest.php b/tests/TimeZoneTest.php
@@ -66,16 +66,13 @@ public static function providerParseInvalidStringThrowsException(): array
 
     public function testUtc(): void
     {
-        $utc = TimeZone::utc();
-
-        self::assertTimeZoneOffsetIs(0, $utc);
-        self::assertSame($utc, TimeZone::utc());
+        $this->assertTimeZoneOffsetIs(0, TimeZoneOffset::utc());
     }
 
     public function testIsEqualTo(): void
     {
-        self::assertTrue(TimeZone::utc()->isEqualTo(TimeZoneOffset::ofTotalSeconds(0)));
-        self::assertFalse(TimeZone::utc()->isEqualTo(TimeZoneOffset::ofTotalSeconds(3600)));
+        self::assertTrue(TimeZoneOffset::utc()->isEqualTo(TimeZoneOffset::ofTotalSeconds(0)));
+        self::assertFalse(TimeZoneOffset::utc()->isEqualTo(TimeZoneOffset::ofTotalSeconds(3600)));
     }
 
     /**