fix(date): fixed date creation with wrong timezone (#9)

Symandy · Nov 24, 2022 · 0f91374 · 0f91374
1 parent d55b83b
commit 0f91374
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 12 deletions.
diff --git a/src/Model/ArchivableInterface.php b/src/Model/ArchivableInterface.php
@@ -5,6 +5,7 @@
 namespace Symandy\Component\Resource\Model;
 
 use DateTimeInterface;
+use DateTimeZone;
 
 interface ArchivableInterface
 {
@@ -13,7 +14,7 @@ public function getArchivedAt(): ?DateTimeInterface;
 
     public function setArchivedAt(?DateTimeInterface $archivedAt): void;
 
-    public function archive(): void;
+    public function archive(DateTimeZone $timezone = null): void;
 
     public function restore(): void;
 

diff --git a/src/Model/ArchivableTrait.php b/src/Model/ArchivableTrait.php
@@ -6,7 +6,9 @@
 
 use DateTimeImmutable;
 use DateTimeInterface;
+use DateTimeZone;
 
+use function date_default_timezone_get;
 use function time;
 
 trait ArchivableTrait
@@ -24,9 +26,12 @@ public function setArchivedAt(?DateTimeInterface $archivedAt): void
         $this->archivedAt = $archivedAt;
     }
 
-    public function archive(): void
+    public function archive(DateTimeZone $timezone = null): void
     {
-        $this->setArchivedAt(DateTimeImmutable::createFromFormat('U', (string) time()));
+        $timezone ??= new DateTimeZone(date_default_timezone_get());
+        $archivedAt = DateTimeImmutable::createFromFormat('U', (string) time());
+
+        $this->setArchivedAt($archivedAt->setTimezone($timezone));
     }
 
     public function restore(): void

diff --git a/src/Model/CreatableInterface.php b/src/Model/CreatableInterface.php
@@ -5,6 +5,7 @@
 namespace Symandy\Component\Resource\Model;
 
 use DateTimeInterface;
+use DateTimeZone;
 
 interface CreatableInterface
 {
@@ -13,6 +14,6 @@ public function getCreatedAt(): ?DateTimeInterface;
 
     public function setCreatedAt(?DateTimeInterface $createdAt): void;
 
-    public function create(): void;
+    public function create(DateTimeZone $timezone = null): void;
 
 }
diff --git a/src/Model/CreatableTrait.php b/src/Model/CreatableTrait.php
@@ -6,7 +6,9 @@
 
 use DateTimeImmutable;
 use DateTimeInterface;
+use DateTimeZone;
 
+use function date_default_timezone_get;
 use function time;
 
 trait CreatableTrait
@@ -24,9 +26,12 @@ public function setCreatedAt(?DateTimeInterface $createdAt): void
         $this->createdAt = $createdAt;
     }
 
-    public function create(): void
+    public function create(DateTimeZone $timezone = null): void
     {
-        $this->setCreatedAt(DateTimeImmutable::createFromFormat('U', (string) time()));
+        $timezone ??= new DateTimeZone(date_default_timezone_get());
+        $createdAt = DateTimeImmutable::createFromFormat('U', (string) time());
+
+        $this->setCreatedAt($createdAt->setTimezone($timezone));
     }
 
 }
diff --git a/src/Model/TimestampableTrait.php b/src/Model/TimestampableTrait.php
@@ -4,6 +4,8 @@
 
 namespace Symandy\Component\Resource\Model;
 
+use DateTimeZone;
+
 trait TimestampableTrait
 {
 
@@ -12,9 +14,9 @@ trait TimestampableTrait
     }
     use UpdatableTrait;
 
-    public function create(): void
+    public function create(DateTimeZone $timezone = null): void
     {
-        $this->initializeCreatedAt();
+        $this->initializeCreatedAt($timezone);
         $this->update();
     }
 

diff --git a/src/Model/UpdatableInterface.php b/src/Model/UpdatableInterface.php
@@ -5,6 +5,7 @@
 namespace Symandy\Component\Resource\Model;
 
 use DateTimeInterface;
+use DateTimeZone;
 
 interface UpdatableInterface
 {
@@ -13,6 +14,6 @@ public function getUpdatedAt(): ?DateTimeInterface;
 
     public function setUpdatedAt(?DateTimeInterface $updatedAt): void;
 
-    public function update(): void;
+    public function update(DateTimeZone $timezone = null): void;
 
 }
diff --git a/src/Model/UpdatableTrait.php b/src/Model/UpdatableTrait.php
@@ -4,10 +4,11 @@
 
 namespace Symandy\Component\Resource\Model;
 
-use DateTime;
 use DateTimeImmutable;
 use DateTimeInterface;
+use DateTimeZone;
 
+use function date_default_timezone_get;
 use function time;
 
 trait UpdatableTrait
@@ -25,9 +26,12 @@ public function setUpdatedAt(?DateTimeInterface $updatedAt): void
         $this->updatedAt = $updatedAt;
     }
 
-    public function update(): void
+    public function update(DateTimeZone $timezone = null): void
     {
-        $this->setUpdatedAt(DateTimeImmutable::createFromFormat('U', (string) time()));
+        $timezone ??= new DateTimeZone(date_default_timezone_get());
+        $updatedAt = DateTimeImmutable::createFromFormat('U', (string) time());
+
+        $this->setUpdatedAt($updatedAt->setTimezone($timezone));
     }
 
 }