Merge pull request #31 from codeliner/hotfix/use-utc

Treat all dates as UTC
prooph · Aug 11, 2015 · 9c31589 · 9c31589
2 parents 46d0bb5 + 72bcd19
commit 9c31589
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Messaging/DomainMessage.php b/src/Messaging/DomainMessage.php
@@ -117,7 +117,7 @@ public static function fromArray(array $messageData)
         $message->metadata = $messageData['metadata'];
 
         if (! $messageData['created_at'] instanceof \DateTimeInterface) {
-            $messageData['created_at'] = \DateTimeImmutable::createFromFormat($message->dateTimeFormat, $messageData['created_at']);
+            $messageData['created_at'] = \DateTimeImmutable::createFromFormat($message->dateTimeFormat, $messageData['created_at'], new \DateTimeZone('UTC'));
         }
 
         $message->createdAt = $messageData['created_at'];
@@ -139,7 +139,7 @@ protected function init()
         }
 
         if ($this->createdAt === null) {
-            $this->createdAt = new \DateTimeImmutable();
+            $this->createdAt = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
         }
     }