From 32c93ee08ea8ac457de262b9f5ba7dbfbe765178 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 2 May 2020 20:10:59 +0200 Subject: [PATCH] Move over the IConfig for globalscale Signed-off-by: Roeland Jago Douma --- lib/private/AppFramework/DependencyInjection/DIContainer.php | 5 ----- lib/private/Server.php | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 5c7f2671ed8..12b0942220b 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -57,7 +57,6 @@ use OCP\AppFramework\Utility\IControllerMethodReflector; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\Folder; use OCP\Files\IAppData; -use OCP\GlobalScale\IConfig; use OCP\Group\ISubAdmin; use OCP\IL10N; use OCP\ILogger; @@ -153,10 +152,6 @@ class DIContainer extends SimpleContainer implements IAppContainer { return $c->getServer()->getThemingDefaults(); }); - $this->registerService(IConfig::class, function ($c) { - return $c->query(OC\GlobalScale\Config::class); - }); - $this->registerService('Protocol', function ($c) { /** @var \OC\Server $server */ $server = $c->query('ServerContainer'); diff --git a/lib/private/Server.php b/lib/private/Server.php index 4fe89e3098e..9c3c6391c34 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1281,9 +1281,7 @@ class Server extends ServerContainer implements IServerContainer { return new CloudIdManager(); }); - $this->registerService(IConfig::class, function (Server $c) { - return new GlobalScale\Config($c->getConfig()); - }); + $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class); $this->registerService(ICloudFederationProviderManager::class, function (Server $c) { return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger()); -- 2.39.5