Move over the IConfig for globalscale

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 5c7f2671ed8b0d2864ce9b3ffd65bdb32f6d3f3f..12b0942220b87fa3b07caf525f7b3bed1327d5ef 100644 (file)
--- 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 4fe89e3098e3e7805d77a2853fa0b1f680c7e30d..9c3c6391c342231bd6c6eaa553e4d737527f3fdc 100644 (file)
--- 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());