From c24eecbbb3943fcdd134b2039850128d459cb859 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 4 Apr 2024 23:31:52 +0200 Subject: [PATCH] fix(DateTimeFormatter): Adjust invalid doc blocks Signed-off-by: Ferdinand Thiessen --- lib/private/DateTimeFormatter.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/private/DateTimeFormatter.php b/lib/private/DateTimeFormatter.php index 0c5b6a55882f2..da3f68f07b35b 100644 --- a/lib/private/DateTimeFormatter.php +++ b/lib/private/DateTimeFormatter.php @@ -136,14 +136,13 @@ public function formatDateRelativeDay($timestamp, $format = 'long', ?\DateTimeZo * Gives the relative date of the timestamp * Only works for past dates * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time - * @return string Dates returned are: + * @param \OCP\IL10N $l The locale to use + * @return string Formatted date span. Dates returned are: * < 1 month => Today, Yesterday, n days ago * < 13 month => last month, n months ago * >= 13 month => last year, n years ago - * @param \OCP\IL10N $l The locale to use - * @return string Formatted date span */ public function formatDateSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) { $l = $this->getLocale($l); @@ -220,15 +219,14 @@ public function formatTime($timestamp, $format = 'medium', ?\DateTimeZone $timeZ * * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time - * @return string Dates returned are: + * @param \OCP\IL10N $l The locale to use + * @return string Formatted time span. Dates returned are: * < 60 sec => seconds ago * < 1 hour => n minutes ago * < 1 day => n hours ago * < 1 month => Yesterday, n days ago * < 13 month => last month, n months ago * >= 13 month => last year, n years ago - * @param \OCP\IL10N $l The locale to use - * @return string Formatted time span */ public function formatTimeSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) { $l = $this->getLocale($l);