Deprecate Util::formatDate()

Make DateTimeFormatter a service and adjust tests that have been inaccurate

1 files changed, 31 insertions, 0 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index ce21980c532..e0105506970 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -275,6 +275,12 @@ class Server extends SimpleContainer implements IServerContainer {
 			$groupManager = $c->getGroupManager();
 			return new \OC\App\AppManager($userSession, $appConfig, $groupManager);
 		});
+		$this->registerService('DateTimeFormatter', function(Server $c) {
+			$timeZone = $c->getTimeZone();
+			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
+
+			return new \OC\DateTimeFormatter($timeZone, $c->getL10N('lib', $language));
+		});
 		$this->registerService('MountConfigManager', function () {
 			$loader = \OC\Files\Filesystem::getLoader();
 			return new \OC\Files\Config\MountProviderCollection($loader);
@@ -687,6 +693,31 @@ class Server extends SimpleContainer implements IServerContainer {
 	}
 
 	/**
+	 * Get the timezone of the current user, based on his session information and config data
+	 *
+	 * @return \DateTimeZone
+	 */
+	public function getTimeZone() {
+		$timeZone = $this->getConfig()->getUserValue($this->getSession()->get('user_id'), 'core', 'timezone', null);
+		if ($timeZone === null) {
+			if ($this->getSession()->exists('timezone')) {
+				$offsetHours = $this->getSession()->get('timezone');
+				// Note: the timeZone name is the inverse to the offset,
+				// so a positive offset means negative timeZone
+				// and the other way around.
+				if ($offsetHours > 0) {
+					return new \DateTimeZone('Etc/GMT-' . $offsetHours);
+				} else {
+					return new \DateTimeZone('Etc/GMT+' . abs($offsetHours));
+				}
+			} else {
+				return new \DateTimeZone('UTC');
+			}
+		}
+		return new \DateTimeZone($timeZone);
+	}
+
+	/**
 	 * @return \OCP\Files\Config\IMountProviderCollection
 	 */
 	function getMountProviderCollection(){