Copy timezome offset with date and time

briannesbitt · Oct 7, 2024 · ec0288f · ec0288f
1 parent 1108131
commit ec0288f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/Carbon/Traits/Cast.php b/src/Carbon/Traits/Cast.php
@@ -36,7 +36,8 @@ public function cast(string $className): mixed
     {
         if (!method_exists($className, 'instance')) {
             if (is_a($className, DateTimeInterface::class, true)) {
-                return new $className($this->rawFormat('Y-m-d H:i:s.u'), $this->getTimezone());
+                return $className::createFromFormat('U.u', $this->rawFormat('U.u'))
+                    ->setTimezone($this->getTimezone());
             }
 
             throw new InvalidCastException("$className has not the instance() method needed to cast the date.");

diff --git a/src/Carbon/Traits/Converter.php b/src/Carbon/Traits/Converter.php
@@ -475,7 +475,8 @@ public function toJSON(): ?string
      */
     public function toDateTime(): DateTime
     {
-        return new DateTime($this->rawFormat('Y-m-d H:i:s.u'), $this->getTimezone());
+        return DateTime::createFromFormat('U.u', $this->rawFormat('U.u'))
+            ->setTimezone($this->getTimezone());
     }
 
     /**
@@ -488,7 +489,8 @@ public function toDateTime(): DateTime
      */
     public function toDateTimeImmutable(): DateTimeImmutable
     {
-        return new DateTimeImmutable($this->rawFormat('Y-m-d H:i:s.u'), $this->getTimezone());
+        return DateTimeImmutable::createFromFormat('U.u', $this->rawFormat('U.u'))
+            ->setTimezone($this->getTimezone());
     }
 
     /**

diff --git a/src/Carbon/Traits/Creator.php b/src/Carbon/Traits/Creator.php
@@ -146,7 +146,8 @@ public static function instance(DateTimeInterface $date): static
             return clone $date;
         }
 
-        $instance = new static($date->format('Y-m-d H:i:s.u'), $date->getTimezone());
+        $instance = static::createFromFormat('U.u', $date->format('U.u'))
+            ->setTimezone($date->getTimezone());
 
         if ($date instanceof CarbonInterface) {
             $settings = $date->getSettings();

diff --git a/tests/Carbon/ObjectsTest.php b/tests/Carbon/ObjectsTest.php
@@ -84,6 +84,17 @@ public function testToDateTime()
         $this->assertNotInstanceOf(CarbonInterface::class, $date);
 
         $this->assertSame('2000-03-26', $date->format('Y-m-d'));
+
+        // Check it keeps timezone offset during DST
+        $date = Carbon::create(2290, 11, 2, 1, 10, 10 + 888480 / 1000000, 'America/Toronto');
+        $this->assertSame(
+            '2290-11-02 01:10:10.888480 America/Toronto -0400',
+            $date->toDateTime()->format('Y-m-d H:i:s.u e O'),
+        );
+        $this->assertSame(
+            '2290-11-02 01:10:10.888480 America/Toronto -0500',
+            $date->copy()->addHour()->toDateTime()->format('Y-m-d H:i:s.u e O'),
+        );
     }
 
     public function testToDateTimeImmutable()