DateTime::from(null) fixed [Closes #211]

nette · Jan 14, 2020 · a27c1ea · a27c1ea
1 parent e3cea97
commit a27c1ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Utils/DateTime.php b/src/Utils/DateTime.php
@@ -55,7 +55,7 @@ public static function from($time)
 			return (new static('@' . $time))->setTimezone(new \DateTimeZone(date_default_timezone_get()));
 
 		} else { // textual or null
-			return new static($time);
+			return new static((string) $time);
 		}
 	}
 

diff --git a/tests/Utils/DateTime.from.phpt b/tests/Utils/DateTime.from.phpt
@@ -24,6 +24,8 @@ Assert::same(is_int(2544000000) ? 2544000000 : '2544000000', DateTime::from(2544
 
 Assert::same('1978-05-05 00:00:00', (string) DateTime::from('1978-05-05'));
 
+Assert::same((new \Datetime)->format('Y-m-d H:i:s'), (string) DateTime::from(null));
+
 Assert::type(DateTime::class, DateTime::from(new \DateTime('1978-05-05')));
 
 Assert::same('1978-05-05 12:00:00.123450', DateTime::from(new DateTime('1978-05-05 12:00:00.12345'))->format('Y-m-d H:i:s.u'));