]> source.dussan.org Git - nextcloud-server.git/commitdiff
Add missing alias for OCP\Settings\IManager and deprecate the old one 22597/head
authorJoas Schilling <coding@schilljs.com>
Fri, 4 Sep 2020 14:39:01 +0000 (16:39 +0200)
committerJoas Schilling <coding@schilljs.com>
Fri, 4 Sep 2020 14:39:01 +0000 (16:39 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
lib/private/Server.php

index abb085d0745a55031db6af838605e14c236b2cbf..2f28e303593dc7c21a8086d77eac5b6b3d834c40 100644 (file)
@@ -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);
        }
 
        /**