DateTime::fromParts() uses setDate() & setTime()

Author: dg

src/Utils/DateTime.php

@@ -9,7 +9,6 @@
 
 namespace Nette\Utils;
 
-use Nette;
 use function array_merge, checkdate, implode, is_numeric, is_string, preg_replace_callback, sprintf, time, trim;
 
 
@@ -61,7 +60,7 @@ public static function from(string|int|\DateTimeInterface|null $time): static
 
 	/**
 	 * Creates DateTime object.
-	 * @throws Nette\InvalidArgumentException if the date and time are not valid.
+	 * @throws \Exception if the date and time are not valid.
 	 */
 	public static function fromParts(
 		int $year,
@@ -72,17 +71,10 @@ public static function fromParts(
 		float $second = 0.0,
 	): static
 	{
-		$s = sprintf('%04d-%02d-%02d %02d:%02d:%02.5F', $year, $month, $day, $hour, $minute, $second);
-		if (
-			!checkdate($month, $day, $year)
-			|| $hour < 0 || $hour > 23
-			|| $minute < 0 || $minute > 59
-			|| $second < 0 || $second >= 60
-		) {
-			throw new Nette\InvalidArgumentException("Invalid date '$s'");
-		}
-
-		return new static($s);
+		$sec = (int) floor($second);
+		return (new static(''))
+			->setDate($year, $month, $day)
+			->setTime($hour, $minute, $sec, (int) round(($second - $sec) * 1e6));
 	}
 
 

tests/Utils/DateTime.fromParts.phpt

@@ -25,61 +25,72 @@ Assert::same('1985-12-09 11:22:59.123000', DateTime::fromParts(1985, 12, 9, 11,
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 2, 29),
-	Nette\InvalidArgumentException::class,
-	"Invalid date '1985-02-29 00:00:0.00000'",
+	Throwable::class,
+	'The date 1985-02-29 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(0, 12, 9),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The date 0000-12-09 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 0, 9),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The date 1985-00-09 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 13, 9),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The date 1985-13-09 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 0),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The date 1985-12-00 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 32),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The date 1985-12-32 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 9, -1),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The time -1:00:00.00000 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 9, 60),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The time 60:00:00.00000 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 9, 0, -1),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The time 00:-1:00.00000 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 9, 0, 60),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The time 00:60:00.00000 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 9, 0, 0, -1),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The time 00:00:-1.00000 is not valid.',
 );
 
 Assert::exception(
 	fn() => DateTime::fromParts(1985, 12, 9, 0, 0, 60),
-	Nette\InvalidArgumentException::class,
+	Throwable::class,
+	'The time 00:00:60.00000 is not valid.',
 );