mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move over the IConfig for globalscale 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2020-05-02 20:10:59 +02:00
parent 4e59c6f9b5
commit 32c93ee08e
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/AppFramework/DependencyInjection/DIContainer.php
View File

@ -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');

4
lib/private/Server.php
View File

@ -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());