Move over the IConfig for globalscale
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
4e59c6f9b5
commit
32c93ee08e
|
@ -57,7 +57,6 @@ use OCP\AppFramework\Utility\IControllerMethodReflector;
|
||||||
use OCP\AppFramework\Utility\ITimeFactory;
|
use OCP\AppFramework\Utility\ITimeFactory;
|
||||||
use OCP\Files\Folder;
|
use OCP\Files\Folder;
|
||||||
use OCP\Files\IAppData;
|
use OCP\Files\IAppData;
|
||||||
use OCP\GlobalScale\IConfig;
|
|
||||||
use OCP\Group\ISubAdmin;
|
use OCP\Group\ISubAdmin;
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
use OCP\ILogger;
|
use OCP\ILogger;
|
||||||
|
@ -153,10 +152,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
|
||||||
return $c->getServer()->getThemingDefaults();
|
return $c->getServer()->getThemingDefaults();
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->registerService(IConfig::class, function ($c) {
|
|
||||||
return $c->query(OC\GlobalScale\Config::class);
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->registerService('Protocol', function ($c) {
|
$this->registerService('Protocol', function ($c) {
|
||||||
/** @var \OC\Server $server */
|
/** @var \OC\Server $server */
|
||||||
$server = $c->query('ServerContainer');
|
$server = $c->query('ServerContainer');
|
||||||
|
|
|
@ -1281,9 +1281,7 @@ class Server extends ServerContainer implements IServerContainer {
|
||||||
return new CloudIdManager();
|
return new CloudIdManager();
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->registerService(IConfig::class, function (Server $c) {
|
$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
|
||||||
return new GlobalScale\Config($c->getConfig());
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
|
$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
|
||||||
return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
|
return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
|
||||||
|
|
Loading…
Reference in New Issue