aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-11-01 10:54:32 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2018-11-02 19:20:37 +0100
commitbfb5ef4b296fdada6da2674c998bd3b7d8477574 (patch)
tree065afbd69f54c3ba4541e586d59f4cc518e915db
parent8f833a309a7c344cc04e85b0f7ab6f3f2403b2a2 (diff)
downloadnextcloud-server-bfb5ef4b296fdada6da2674c998bd3b7d8477574.tar.gz
nextcloud-server-bfb5ef4b296fdada6da2674c998bd3b7d8477574.zip
The identityproof manager should be in Server
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php8
-rw-r--r--lib/private/Server.php8
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 08ab09b1937..9acc5bd092e 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -152,14 +152,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c->query(OC\GlobalScale\Config::class);
});
- $this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
- return new \OC\Security\IdentityProof\Manager(
- $this->getServer()->query(\OC\Files\AppData\Factory::class),
- $this->getServer()->getCrypto(),
- $this->getServer()->getConfig()
- );
- });
-
$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 c1f6261419d..938c54b8a1c 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -1191,6 +1191,14 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerAlias(IDashboardManager::class, DashboardManager::class);
$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+ $this->registerService(\OC\Security\IdentityProof\Manager::class, function (Server $c) {
+ return new \OC\Security\IdentityProof\Manager(
+ $c->query(\OC\Files\AppData\Factory::class),
+ $c->getCrypto(),
+ $c->getConfig()
+ );
+ });
+
$this->connectDispatcher();
}