Use proper method to format absolute timestamp

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

3 files changed, 3 insertions, 88 deletions

diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 7e083b2ba0e..3313ccdec91 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -679,29 +679,6 @@ class OC_Util {
 	}
 
 	/**
-	 * formats a timestamp in the "right" way
-	 *
-	 * @param int $timestamp
-	 * @param bool $dateOnly option to omit time from the result
-	 * @param DateTimeZone|string $timeZone where the given timestamp shall be converted to
-	 * @return string timestamp
-	 *
-	 * @deprecated Use \OC::$server->query('DateTimeFormatter') instead
-	 */
-	public static function formatDate($timestamp, $dateOnly = false, $timeZone = null) {
-		if ($timeZone !== null && !$timeZone instanceof \DateTimeZone) {
-			$timeZone = new \DateTimeZone($timeZone);
-		}
-
-		/** @var \OC\DateTimeFormatter $formatter */
-		$formatter = \OC::$server->query('DateTimeFormatter');
-		if ($dateOnly) {
-			return $formatter->formatDate($timestamp, 'long', $timeZone);
-		}
-		return $formatter->formatDateTime($timestamp, 'long', 'long', $timeZone);
-	}
-
-	/**
 	 * check if the current server configuration is suitable for ownCloud
 	 *
 	 * @param \OC\SystemConfig $config
diff --git a/settings/templates/settings/admin/server.php b/settings/templates/settings/admin/server.php
index 4350a7105c8..d467577f610 100644
--- a/settings/templates/settings/admin/server.php
+++ b/settings/templates/settings/admin/server.php
@@ -159,7 +159,9 @@
 	<p class="cronlog inlineblock">
 		<?php if ($_['lastcron'] !== false):
 			$relative_time = relative_modified_date($_['lastcron']);
-			$absolute_time = OC_Util::formatDate($_['lastcron']);
+
+			$formatter = \OC::$server->getDateTimeFormatter();
+			$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
 			if (time() - $_['lastcron'] <= 3600): ?>
 				<span class="status success"></span>
 				<span class="crondate" title="<?php p($absolute_time);?>">
diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php
index 037736bf00f..18d065c68d6 100644
--- a/tests/lib/UtilTest.php
+++ b/tests/lib/UtilTest.php
@@ -38,70 +38,6 @@ class UtilTest extends \Test\TestCase {
 		$this->assertTrue(is_string($edition));
 	}
 
-	/**
-	 * @group DB
-	 */
-	function testFormatDate() {
-		date_default_timezone_set("UTC");
-
-		$result = OC_Util::formatDate(1350129205);
-		$expected = 'October 13, 2012 at 11:53:25 AM GMT+0';
-		$this->assertEquals($expected, $result);
-
-		$result = OC_Util::formatDate(1102831200, true);
-		$expected = 'December 12, 2004';
-		$this->assertEquals($expected, $result);
-	}
-
-	/**
-	 * @group DB
-	 */
-	function testFormatDateWithTZ() {
-		date_default_timezone_set("UTC");
-
-		$result = OC_Util::formatDate(1350129205, false, 'Europe/Berlin');
-		$expected = 'October 13, 2012 at 1:53:25 PM GMT+2';
-		$this->assertEquals($expected, $result);
-	}
-
-	/**
-	 * @expectedException \Exception
-	 */
-	function testFormatDateWithInvalidTZ() {
-		OC_Util::formatDate(1350129205, false, 'Mordor/Barad-dûr');
-	}
-
-	public function formatDateWithTZFromSessionData() {
-		return array(
-			array(3, 'October 13, 2012 at 2:53:25 PM GMT+3', 'Etc/GMT-3'),
-			array(15, 'October 13, 2012 at 11:53:25 AM GMT+0', 'UTC'),
-			array(-13, 'October 13, 2012 at 11:53:25 AM GMT+0', 'UTC'),
-			array(9.5, 'October 13, 2012 at 9:23:25 PM GMT+9:30', 'Australia/Darwin'),
-			array(-4.5, 'October 13, 2012 at 7:23:25 AM GMT-4:30', 'America/Caracas'),
-			array(15.5, 'October 13, 2012 at 11:53:25 AM GMT+0', 'UTC'),
-		);
-	}
-
-	/**
-	 * @dataProvider formatDateWithTZFromSessionData
-	 * @group DB
-	 */
-	function testFormatDateWithTZFromSession($offset, $expected, $expectedTimeZone) {
-		date_default_timezone_set("UTC");
-
-		\OC::$server->getSession()->set('timezone', $offset);
-
-		$selectedTimeZone = \OC::$server->getDateTimeZone()->getTimeZone(1350129205);
-		$this->assertEquals($expectedTimeZone, $selectedTimeZone->getName());
-		$newDateTimeFormatter = new \OC\DateTimeFormatter($selectedTimeZone, \OC::$server->getL10N('lib', 'en'));
-		$this->overwriteService('DateTimeFormatter', $newDateTimeFormatter);
-
-		$result = OC_Util::formatDate(1350129205, false);
-		$this->assertEquals($expected, $result);
-
-		$this->restoreService('DateTimeFormatter');
-	}
-
 	function testSanitizeHTML() {
 		$badArray = [
 			'While it is unusual to pass an array',