Use DateTime::createFromImmutable if available (#7)

* Use DateTime::createFromImmutable if available * Use new \DateTime in SystemClock. Assert return value Co-authored-by: Marko Kunic <[email protected]> * Please PHPStan * Use FQNS * Remove additional space
Lendable · Nov 6, 2019 · fef8a81 · fef8a81
1 parent 72df79f
commit fef8a81
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/FixedClock.php b/lib/FixedClock.php
@@ -28,10 +28,14 @@ public function now(): \DateTimeImmutable
 
     public function nowMutable(): \DateTime
     {
-        // @TODO Use \DateTime::createFromImmutable when PHP version is >=7.3
-        $instance = \DateTime::createFromFormat(self::ISO8601_MICROSECONDS_FORMAT, $this->now->format(self::ISO8601_MICROSECONDS_FORMAT));
-        \assert($instance instanceof \DateTime);
+        $nowImmutable = $this->now();
 
-        return $instance;
+        $nowMutable = \PHP_VERSION_ID >= 70300
+            ? \DateTime::createFromImmutable($nowImmutable)
+            : \DateTime::createFromFormat(self::ISO8601_MICROSECONDS_FORMAT, $nowImmutable->format(self::ISO8601_MICROSECONDS_FORMAT));
+
+        \assert($nowMutable instanceof \DateTime);
+
+        return $nowMutable;
     }
 }
diff --git a/lib/SystemClock.php b/lib/SystemClock.php
@@ -30,10 +30,6 @@ public function now(): \DateTimeImmutable
 
     public function nowMutable(): \DateTime
     {
-        // @TODO Use \DateTime::createFromImmutable when PHP version is >=7.3
-        $instance = \DateTime::createFromFormat(self::ISO8601_MICROSECONDS_FORMAT, $this->now()->format(self::ISO8601_MICROSECONDS_FORMAT));
-        \assert($instance instanceof \DateTime);
-
-        return $instance;
+        return new \DateTime('now', $this->timeZone);
     }
 }