Merge pull request #28926 from owncloud/stable10-di-theme-service

[stable10] Added IThemeService to public API (DIContainer)
owncloud · Sep 6, 2017 · 4a82c4c · 4a82c4c
2 parents cfa97cc + c29a648
commit 4a82c4c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -337,6 +337,10 @@ public function __construct($appName, $urlParams = []){
 			);
 		});
 
+		$this->registerService('OCP\Theme\IThemeService', function($c) {
+			return $this->getServer()->getThemeService();
+		});
+
 
 		/**
 		 * Middleware

diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -92,6 +92,7 @@
 use OCP\IServerContainer;
 use OCP\ISession;
 use OCP\Security\IContentSecurityPolicyManager;
+use OCP\Theme\IThemeService;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use OC\Files\External\StoragesBackendService;
@@ -1508,4 +1509,10 @@ public function getShareManager() {
 		return $this->query('ShareManager');
 	}
 
+	/**
+	 * @return IThemeService
+	 */
+	public function getThemeService() {
+		return $this->query('\OCP\Theme\IThemeService');
+	}
 }
diff --git a/lib/public/IServerContainer.php b/lib/public/IServerContainer.php
@@ -531,4 +531,10 @@ public function getDateTimeZone();
 	 * @since 8.0.0
 	 */
 	public function getDateTimeFormatter();
+
+	/**
+	 * @return \OCP\Theme\IThemeService
+	 * @since 10.0.3
+	 */
+	public function getThemeService();
 }