Fixes microsecond timezone support, fixes #832

1 files changed, 9 insertions, 2 deletions

diff --git a/src/Monolog/DateTimeImmutable.php b/src/Monolog/DateTimeImmutable.php
index 6ca786c..30ef809 100644
--- a/src/Monolog/DateTimeImmutable.php
+++ b/src/Monolog/DateTimeImmutable.php
@@ -28,9 +28,16 @@ class DateTimeImmutable extends \DateTimeImmutable implements \JsonSerializable
             // Circumvent DateTimeImmutable::createFromFormat() which always returns \DateTimeImmutable instead of `static`
             // @link https://bugs.php.net/bug.php?id=60302
             $timestamp = microtime(true);
-            $microseconds = sprintf("%06d", ($timestamp - floor($timestamp)) * 1000000);
-            $date = date('Y-m-d H:i:s.' . $microseconds, (int) $timestamp);
+
+            // apply offset of the timezone as microtime() is always UTC
+            if ($timezone && $timezone->getName() !== 'UTC') {
+                $timestamp += (new \DateTime('now', $timezone))->getOffset();
+            }
+
+            $dt = self::createFromFormat('U.u', sprintf('%.6F', $timestamp));
+            $date = $dt->format('Y-m-d H:i:s.u');
         }
+
         parent::__construct($date, $timezone);
 
         $this->useMicroseconds = $useMicroseconds;