DateTime: modify() and modifyClone() throw exception on error (#293)

nette · Aug 22, 2023 · 3e4da44 · 3e4da44
1 parent 4ce2098
commit 3e4da44
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Utils/DateTime.php b/src/Utils/DateTime.php
@@ -129,6 +129,16 @@ public function __toString(): string
 	}
 
 
+	public function modify(string $modifier): static
+	{
+		$datetime = @parent::modify($modifier); // @ is escalated to exception
+		if ($datetime === false) {
+			throw new Nette\InvalidArgumentException(Helpers::getLastError());
+		}
+		return $datetime;
+	}
+
+
 	/**
 	 * Creates a copy with a modified time.
 	 */

diff --git a/tests/Utils/DateTime.modifyClone.phpt b/tests/Utils/DateTime.modifyClone.phpt
@@ -25,3 +25,9 @@ $dolly2 = $date->modifyClone('+1 hour');
 Assert::type(DateTime::class, $dolly2);
 Assert::notSame($date, $dolly2);
 Assert::notSame((string) $date, (string) $dolly2);
+
+Assert::exception(
+	fn() => $date->modifyClone('xx'),
+	PHP_VERSION_ID >= 80300 ? DateMalformedStringException::class : Nette\InvalidArgumentException::class,
+	'DateTime::modify(): Failed to parse %a%',
+);