diff options
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r-- | lib/private/Server.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index 275caf306e2..b426c9c454d 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -117,6 +117,7 @@ use OC\Preview\GeneratorHelper; use OC\Remote\Api\ApiFactory; use OC\Remote\InstanceFactory; use OC\RichObjectStrings\Validator; +use OC\Route\Router; use OC\Security\Bruteforce\Throttler; use OC\Security\CertificateManager; use OC\Security\CredentialsManager; @@ -751,7 +752,7 @@ class Server extends ServerContainer implements IServerContainer { /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('JobList', IJobList::class); - $this->registerService(IRouter::class, function (Server $c) { + $this->registerService(Router::class, function (Server $c) { $cacheFactory = $c->get(ICacheFactory::class); $logger = $c->get(ILogger::class); if ($cacheFactory->isLocalCacheAvailable()) { @@ -761,6 +762,7 @@ class Server extends ServerContainer implements IServerContainer { } return $router; }); + $this->registerAlias(IRouter::class, Router::class); /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Router', IRouter::class); @@ -1247,7 +1249,7 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) { - return new CloudIdManager(); + return new CloudIdManager($c->get(\OCP\Contacts\IManager::class)); }); $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class); @@ -2275,7 +2277,7 @@ class Server extends ServerContainer implements IServerContainer { try { /** @var ILogger $logger */ $logger = $container->get(ILogger::class); - $logger->debug('The requested alias "' . $alias . '" is depreacted. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']); + $logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']); } catch (ContainerExceptionInterface $e) { // Could not get logger. Continue } |