Skip to content
Snippets Groups Projects
Unverified Commit c538b1e4 authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

Merge pull request #22597 from nextcloud/techdebt/noid/allow-to-di-the-settings-manager

Add missing alias for OCP\Settings\IManager and deprecate the old one
parents 593d64d9 770d12d1
No related branches found
No related tags found
No related merge requests found
...@@ -1226,15 +1226,8 @@ class Server extends ServerContainer implements IServerContainer { ...@@ -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\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class); $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
$this->registerService('SettingsManager', function (Server $c) { $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
$manager = new \OC\Settings\Manager( $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
$c->getLogger(),
$c->getL10NFactory(),
$c->getURLGenerator(),
$c
);
return $manager;
});
$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) { $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
return new \OC\Files\AppData\Factory( return new \OC\Files\AppData\Factory(
$c->getRootFolder(), $c->getRootFolder(),
...@@ -2198,7 +2191,7 @@ class Server extends ServerContainer implements IServerContainer { ...@@ -2198,7 +2191,7 @@ class Server extends ServerContainer implements IServerContainer {
* @deprecated * @deprecated
*/ */
public function getSettingsManager() { public function getSettingsManager() {
return $this->query('SettingsManager'); return $this->query(\OC\Settings\Manager::class);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment