Merge pull request #11719 from nextcloud/techdebt/noid/allow-to-mock-new-datetime

Allow to inject/mock `new \DateTime()` similar to time()

2 files changed, 19 insertions, 2 deletions

diff --git a/lib/private/AppFramework/Utility/TimeFactory.php b/lib/private/AppFramework/Utility/TimeFactory.php
index fc3bf72609f..4526f9b1abb 100644
--- a/lib/private/AppFramework/Utility/TimeFactory.php
+++ b/lib/private/AppFramework/Utility/TimeFactory.php
@@ -37,9 +37,18 @@ class TimeFactory implements ITimeFactory {
 	/**
 	 * @return int the result of a call to time()
 	 */
-	public function getTime() : int {
+	public function getTime(): int {
 		return time();
 	}
 
+	/**
+	 * @param string $time
+	 * @param \DateTimeZone $timezone
+	 * @return \DateTime
+	 * @since 15.0.0
+	 */
+	public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime {
+		return new \DateTime($time, $timezone);
+	}
 
 }
diff --git a/lib/public/AppFramework/Utility/ITimeFactory.php b/lib/public/AppFramework/Utility/ITimeFactory.php
index 7951d6ad8e6..0367f037a6e 100644
--- a/lib/public/AppFramework/Utility/ITimeFactory.php
+++ b/lib/public/AppFramework/Utility/ITimeFactory.php
@@ -35,6 +35,14 @@ interface ITimeFactory {
 	 * @return int the result of a call to time()
 	 * @since 8.0.0
 	 */
-	public function getTime() : int;
+	public function getTime(): int;
+
+	/**
+	 * @param string $time
+	 * @param \DateTimeZone $timezone
+	 * @return \DateTime
+	 * @since 15.0.0
+	 */
+	public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime;
 
 }