Time(Immutable)::createFromTimestamp() now supports microsecond preci…

…sion
mako-framework · Aug 20, 2024 · d319315 · d319315
1 parent f05d463
commit d319315
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/mako/chrono/TimeInterface.php b/src/mako/chrono/TimeInterface.php
@@ -74,7 +74,7 @@ public static function createFromDate(int $year, ?int $month = null, ?int $day =
 	 *
 	 * @return false|static
 	 */
-	public static function createFromTimestamp(int $timestamp, null|DateTimeZone|string $timeZone = null);
+	public static function createFromTimestamp(float|int $timestamp, null|DateTimeZone|string $timeZone = null);
 
 	/**
 	 * Returns a new instance according to the specified DOS timestamp.

diff --git a/src/mako/chrono/traits/TimeTrait.php b/src/mako/chrono/traits/TimeTrait.php
@@ -59,9 +59,9 @@ public static function createFromDate(int $year, ?int $month = null, ?int $day =
 	 *
 	 * @return false|static
 	 */
-	public static function createFromTimestamp(int $timestamp, null|DateTimeZone|string $timeZone = null)
+	public static function createFromTimestamp(float|int $timestamp, null|DateTimeZone|string $timeZone = null)
 	{
-		return (new static('now', $timeZone))->setTimestamp($timestamp);
+		return static::createFromFormat(is_int($timestamp) ? 'U' : 'U.u', (string) $timestamp, $timeZone);
 	}
 
 	/**
@@ -91,18 +91,7 @@ public static function createFromDOSTimestamp(int $timestamp, null|DateTimeZone|
 	#[\ReturnTypeWillChange]
 	public static function createFromFormat(string $format, string $time, null|DateTimeZone|string $timeZone = null)
 	{
-		if ($timeZone !== null) {
-			if (($timeZone instanceof DateTimeZone) === false) {
-				$timeZone = new DateTimeZone($timeZone);
-			}
-
-			$dateTime = parent::createFromFormat($format, $time, $timeZone);
-		}
-		else {
-			$dateTime = parent::createFromFormat($format, $time);
-		}
-
-		return new static($dateTime->format('Y-m-d\TH:i:s.u'), $dateTime->getTimeZone());
+		return new static(parent::createFromFormat($format, $time)->format('Y-m-d\TH:i:s.u'), $timeZone);
 	}
 
 	/**

diff --git a/tests/unit/chrono/TimeImmutableTest.php b/tests/unit/chrono/TimeImmutableTest.php
@@ -165,6 +165,12 @@ public function testCreateFromTimestamp(): void
 
 		//
 
+		$time = Time::createFromTimestamp(431093532.123);
+
+		$this->assertSame('431093532.123000', $time->format('U.u'));
+
+		//
+
 		$time = TimeImmutable::createFromTimestamp(431093532, 'Asia/Tokyo');
 
 		$this->assertSame('Asia/Tokyo', $time->getTimeZone()->getName());

diff --git a/tests/unit/chrono/TimeTest.php b/tests/unit/chrono/TimeTest.php
@@ -165,6 +165,12 @@ public function testCreateFromTimestamp(): void
 
 		//
 
+		$time = Time::createFromTimestamp(431093532.123);
+
+		$this->assertSame('431093532.123000', $time->format('U.u'));
+
+		//
+
 		$time = Time::createFromTimestamp(431093532, 'Asia/Tokyo');
 
 		$this->assertSame('Asia/Tokyo', $time->getTimeZone()->getName());