diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-03 12:03:09 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-03 12:03:09 +0200 |
| commit | 15a479fb9670e4695f8f23a6b9cc089a0c7c08a1 (patch) | |
| tree | 79ffcdfbb11159fd4a6674d8999b7e4eacc670e4 | |
| parent | 66bc0927243b9ede23a037436695605d531c3bd2 (diff) | |
| parent | 61ce4f4ef3d443c08629265ba032fdca3f311b4a (diff) | |
| download | nextcloud-server-15a479fb9670e4695f8f23a6b9cc089a0c7c08a1.tar.gz nextcloud-server-15a479fb9670e4695f8f23a6b9cc089a0c7c08a1.zip | |
Merge pull request #24408 from owncloud/improve-server-container
Improve server container
| -rw-r--r-- | lib/private/Server.php | 5 | ||||
| -rw-r--r-- | lib/public/IServerContainer.php | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index 7fe20561af9..bbe6b88876f 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -837,8 +837,7 @@ class Server extends ServerContainer implements IServerContainer { } /** - * For internal use only - * + * @internal For internal use only * @return \OC\SystemConfig */ public function getSystemConfig() { @@ -1180,7 +1179,7 @@ class Server extends ServerContainer implements IServerContainer { return $this->query('MountManager'); } - /* + /** * Get the MimeTypeDetector * * @return \OCP\Files\IMimeTypeDetector diff --git a/lib/public/IServerContainer.php b/lib/public/IServerContainer.php index de48daeef88..65754f993f8 100644 --- a/lib/public/IServerContainer.php +++ b/lib/public/IServerContainer.php @@ -519,4 +519,16 @@ interface IServerContainer { * @since 9.0.0 */ public function getContentSecurityPolicyManager(); + + /** + * @return \OCP\IDateTimeZone + * @since 8.0.0 + */ + public function getDateTimeZone(); + + /** + * @return \OCP\IDateTimeFormatter + * @since 8.0.0 + */ + public function getDateTimeFormatter(); } |