mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Roeland Jago Douma 2020-09-04 20:22:52 +02:00 committed by GitHub
parent 593d64d935 770d12d191
commit c538b1e4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Server.php
View 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);
}
/**