From 3e65b69c6704882afaaae5c2ae8da0d05a688fdf Mon Sep 17 00:00:00 2001 From: Marko Kunic Date: Wed, 8 Jan 2020 10:44:44 +0000 Subject: [PATCH] switch to microseconds --- generator/tests/DateTimeImmutableTest.php | 4 ++-- lib/DateTime.php | 2 +- lib/DateTimeImmutable.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/tests/DateTimeImmutableTest.php b/generator/tests/DateTimeImmutableTest.php index a091ce73..b4c49e7e 100644 --- a/generator/tests/DateTimeImmutableTest.php +++ b/generator/tests/DateTimeImmutableTest.php @@ -158,8 +158,8 @@ public function testEquals(): void { $phpDateTime = new \DateTimeImmutable(); - $safeDateTime1 = \Safe\DateTimeImmutable::createFromFormat('Y-m-d H:i:s.v', $phpDateTime->format('Y-m-d H:i:s.v')); - $safeDateTime2 = new \Safe\DateTimeImmutable($safeDateTime1->format('Y-m-d H:i:s.v')); + $safeDateTime1 = \Safe\DateTimeImmutable::createFromFormat('Y-m-d H:i:s.u', $phpDateTime->format('Y-m-d H:i:s.u')); + $safeDateTime2 = new \Safe\DateTimeImmutable($safeDateTime1->format('Y-m-d H:i:s.u')); $this->assertEquals($phpDateTime, $safeDateTime1); $this->assertEquals($phpDateTime, $safeDateTime2); diff --git a/lib/DateTime.php b/lib/DateTime.php index 0e9970b9..b3778d4b 100644 --- a/lib/DateTime.php +++ b/lib/DateTime.php @@ -13,7 +13,7 @@ class DateTime extends \DateTime //switch from regular datetime to safe version private static function createFromRegular(\DateTime $datetime): self { - return new self($datetime->format('Y-m-d H:i:s.v'), $datetime->getTimezone()); + return new self($datetime->format('Y-m-d H:i:s.u'), $datetime->getTimezone()); } /** diff --git a/lib/DateTimeImmutable.php b/lib/DateTimeImmutable.php index 981a4e57..948b8f0f 100644 --- a/lib/DateTimeImmutable.php +++ b/lib/DateTimeImmutable.php @@ -35,7 +35,7 @@ public function __construct($time = 'now', $timezone = null) //switch from regular datetime to safe version private static function createFromRegular(\DateTimeImmutable $datetime): self { - $safeDatetime = new self($datetime->format('Y-m-d H:i:s.v'), $datetime->getTimezone()); //we need to also update the wrapper to not break the operators '<' and '>' + $safeDatetime = new self($datetime->format('Y-m-d H:i:s.u'), $datetime->getTimezone()); //we need to also update the wrapper to not break the operators '<' and '>' $safeDatetime->innerDateTime = $datetime; return $safeDatetime; }