From 770d12d1915dad746d75ba0b23235b75cbe7d1a2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 4 Sep 2020 16:39:01 +0200 Subject: [PATCH] Add missing alias for OCP\Settings\IManager and deprecate the old one Signed-off-by: Joas Schilling --- lib/private/Server.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/private/Server.php b/lib/private/Server.php index abb085d074..2f28e30359 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1226,15 +1226,8 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class); $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class); - $this->registerService('SettingsManager', function (Server $c) { - $manager = new \OC\Settings\Manager( - $c->getLogger(), - $c->getL10NFactory(), - $c->getURLGenerator(), - $c - ); - return $manager; - }); + $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class); + $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class); $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) { return new \OC\Files\AppData\Factory( $c->getRootFolder(), @@ -2198,7 +2191,7 @@ class Server extends ServerContainer implements IServerContainer { * @deprecated */ public function getSettingsManager() { - return $this->query('SettingsManager'); + return $this->query(\OC\Settings\Manager::class); } /**