Merge pull request #12881 from owncloud/issue/12874-interface-timezone

Move timezone logic out of server.php

4 files changed, 104 insertions, 24 deletions

diff --git a/lib/private/datetimezone.php b/lib/private/datetimezone.php
new file mode 100644
index 00000000000..e4a0af4fc69
--- /dev/null
+++ b/lib/private/datetimezone.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+
+use OCP\IConfig;
+use OCP\IDateTimeZone;
+use OCP\ISession;
+
+class DateTimeZone implements IDateTimeZone {
+	/** @var IConfig */
+	protected $config;
+
+	/** @var ISession */
+	protected $session;
+
+	/**
+	 * Constructor
+	 *
+	 * @param IConfig $config
+	 * @param ISession $session
+	 */
+	public function __construct(IConfig $config, ISession $session) {
+		$this->config = $config;
+		$this->session = $session;
+	}
+
+	/**
+	 * Get the timezone of the current user, based on his session information and config data
+	 *
+	 * @return \DateTimeZone
+	 */
+	public function getTimeZone() {
+		$timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
+		if ($timeZone === null) {
+			if ($this->session->exists('timezone')) {
+				$offsetHours = $this->session->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);
+	}
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index 6066e2fa35e..f4c20576ebb 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -274,11 +274,19 @@ class Server extends SimpleContainer implements IServerContainer {
 			$groupManager = $c->getGroupManager();
 			return new \OC\App\AppManager($userSession, $appConfig, $groupManager);
 		});
+		$this->registerService('DateTimeZone', function(Server $c) {
+			return new DateTimeZone(
+				$c->getConfig(),
+				$c->getSession()
+			);
+		});
 		$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));
+			return new DateTimeFormatter(
+				$c->getDateTimeZone()->getTimeZone(),
+				$c->getL10N('lib', $language)
+			);
 		});
 		$this->registerService('MountConfigManager', function () {
 			$loader = \OC\Files\Filesystem::getLoader();
@@ -696,28 +704,17 @@ class Server extends SimpleContainer implements IServerContainer {
 	}
 
 	/**
-	 * Get the timezone of the current user, based on his session information and config data
-	 *
-	 * @return \DateTimeZone
+	 * @return \OCP\IDateTimeZone
 	 */
-	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);
+	public function getDateTimeZone() {
+		return $this->query('DateTimeZone');
+	}
+
+	/**
+	 * @return \OCP\IDateTimeFormatter
+	 */
+	public function getDateTimeFormatter() {
+		return $this->query('DateTimeFormatter');
 	}
 
 	/**
diff --git a/lib/public/idatetimezone.php b/lib/public/idatetimezone.php
new file mode 100644
index 00000000000..fb4c89538d5
--- /dev/null
+++ b/lib/public/idatetimezone.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP;
+
+
+interface IDateTimeZone {
+	/**
+	 * @return \DateTimeZone
+	 */
+	public function getTimeZone();
+}
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 1a2cb09f38d..25c9e31beaf 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -57,7 +57,7 @@ class Test_Util extends \Test\TestCase {
 
 		$oldDateTimeFormatter = \OC::$server->query('DateTimeFormatter');
 		\OC::$server->getSession()->set('timezone', 3);
-		$newDateTimeFormatter = new \OC\DateTimeFormatter(\OC::$server->getTimeZone(), new \OC_L10N('lib', 'en'));
+		$newDateTimeFormatter = new \OC\DateTimeFormatter(\OC::$server->getDateTimeZone()->getTimeZone(), new \OC_L10N('lib', 'en'));
 		$this->setDateFormatter($newDateTimeFormatter);
 
 		$result = OC_Util::formatDate(1350129205, false);