aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/DateTimeFormatter.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/DateTimeFormatter.php')
-rw-r--r--lib/private/DateTimeFormatter.php181
1 files changed, 81 insertions, 100 deletions
diff --git a/lib/private/DateTimeFormatter.php b/lib/private/DateTimeFormatter.php
index 1c8b4f6d3ab..2882a7d8cd7 100644
--- a/lib/private/DateTimeFormatter.php
+++ b/lib/private/DateTimeFormatter.php
@@ -1,26 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author dartcafe <github@dartcafe.de>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OC;
@@ -45,8 +28,8 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Get TimeZone to use
*
- * @param \DateTimeZone $timeZone The timezone to use
- * @return \DateTimeZone The timezone to use, falling back to the current user's timezone
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @return \DateTimeZone The timezone to use, falling back to the current user's timezone
*/
protected function getTimeZone($timeZone = null) {
if ($timeZone === null) {
@@ -59,8 +42,8 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Get \OCP\IL10N to use
*
- * @param \OCP\IL10N $l The locale to use
- * @return \OCP\IL10N The locale to use, falling back to the current user's locale
+ * @param \OCP\IL10N $l The locale to use
+ * @return \OCP\IL10N The locale to use, falling back to the current user's locale
*/
protected function getLocale($l = null) {
if ($l === null) {
@@ -74,10 +57,10 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
* Generates a DateTime object with the given timestamp and TimeZone
*
* @param mixed $timestamp
- * @param \DateTimeZone $timeZone The timezone to use
+ * @param \DateTimeZone $timeZone The timezone to use
* @return \DateTime
*/
- protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
+ protected function getDateTime($timestamp, ?\DateTimeZone $timeZone = null) {
if ($timestamp === null) {
return new \DateTime('now', $timeZone);
} elseif (!$timestamp instanceof \DateTime) {
@@ -94,38 +77,38 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $format Either 'full', 'long', 'medium' or 'short'
- * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
- * long: e.g. 'MMMM d, y' => 'August 20, 2014'
- * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
- * short: e.g. 'M/d/yy' => '8/20/14'
- * The exact format is dependent on the language
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $format Either 'full', 'long', 'medium' or 'short'
+ * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
+ * long: e.g. 'MMMM d, y' => 'August 20, 2014'
+ * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
+ * short: e.g. 'M/d/yy' => '8/20/14'
+ * The exact format is dependent on the language
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date string
*/
- public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+ public function formatDate($timestamp, $format = 'long', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
return $this->format($timestamp, 'date', $format, $timeZone, $l);
}
/**
* Formats the date of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $format Either 'full', 'long', 'medium' or 'short'
- * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
- * long: e.g. 'MMMM d, y' => 'August 20, 2014'
- * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
- * short: e.g. 'M/d/yy' => '8/20/14'
- * The exact format is dependent on the language
- * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $format Either 'full', 'long', 'medium' or 'short'
+ * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014'
+ * long: e.g. 'MMMM d, y' => 'August 20, 2014'
+ * medium: e.g. 'MMM d, y' => 'Aug 20, 2014'
+ * short: e.g. 'M/d/yy' => '8/20/14'
+ * The exact format is dependent on the language
+ * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted relative date string
*/
- public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
- if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
+ public function formatDateRelativeDay($timestamp, $format = 'long', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
+ if (!str_ends_with($format, '^') && !str_ends_with($format, '*')) {
$format .= '^';
}
@@ -136,16 +119,15 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
* 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 $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
- * @return string 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
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
+ * @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
*/
- public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+ public function formatDateSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) {
$l = $this->getLocale($l);
$timestamp = $this->getDateTime($timestamp);
$timestamp->setTime(0, 0, 0);
@@ -200,37 +182,36 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $format Either 'full', 'long', 'medium' or 'short'
- * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00'
- * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT'
- * medium: e.g. 'h:mm:ss a' => '11:42:13 AM'
- * short: e.g. 'h:mm a' => '11:42 AM'
- * The exact format is dependent on the language
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $format Either 'full', 'long', 'medium' or 'short'
+ * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00'
+ * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT'
+ * medium: e.g. 'h:mm:ss a' => '11:42:13 AM'
+ * short: e.g. 'h:mm a' => '11:42 AM'
+ * The exact format is dependent on the language
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted time string
*/
- public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+ public function formatTime($timestamp, $format = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
return $this->format($timestamp, 'time', $format, $timeZone, $l);
}
/**
* Gives the relative past time of the timestamp
*
- * @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:
- * < 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
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time
+ * @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
*/
- public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+ public function formatTimeSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) {
$l = $this->getLocale($l);
$timestamp = $this->getDateTime($timestamp);
if ($baseTimestamp === null) {
@@ -266,30 +247,30 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date and time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $formatDate See formatDate() for description
- * @param string $formatTime See formatTime() for description
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $formatDate See formatDate() for description
+ * @param string $formatTime See formatTime() for description
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date and time string
*/
- public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+ public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
}
/**
* Formats the date and time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $formatDate See formatDate() for description
- * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
- * @param string $formatTime See formatTime() for description
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $formatDate See formatDate() for description
+ * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+ * @param string $formatTime See formatTime() for description
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted relative date and time string
*/
- public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
- if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
+ public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
+ if (!str_ends_with($formatDate, '^') && !str_ends_with($formatDate, '*')) {
$formatDate .= '^';
}
@@ -299,14 +280,14 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
/**
* Formats the date and time of the given timestamp
*
- * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
- * @param string $type One of 'date', 'datetime' or 'time'
- * @param string $format Format string
- * @param \DateTimeZone $timeZone The timezone to use
- * @param \OCP\IL10N $l The locale to use
+ * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object
+ * @param string $type One of 'date', 'datetime' or 'time'
+ * @param string $format Format string
+ * @param \DateTimeZone $timeZone The timezone to use
+ * @param \OCP\IL10N $l The locale to use
* @return string Formatted date and time string
*/
- protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+ protected function format($timestamp, $type, $format, ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) {
$l = $this->getLocale($l);
$timeZone = $this->getTimeZone($timeZone);
$timestamp = $this->getDateTime($timestamp, $timeZone);
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 20:57:54 +0000