diff --git a/lib/private/Server.php b/lib/private/Server.php index 04ef2c6f50..1d2690a4d4 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -93,6 +93,7 @@ use OC\Files\Node\HookConnector; use OC\Files\Node\LazyRoot; use OC\Files\Node\Root; use OC\Files\Storage\StorageFactory; +use OC\Files\Type\Loader; use OC\Files\View; use OC\FullTextSearch\FullTextSearchManager; use OC\Http\Client\ClientService; @@ -121,7 +122,6 @@ use OC\Security\CredentialsManager; use OC\Security\Crypto; use OC\Security\CSP\ContentSecurityPolicyManager; use OC\Security\CSP\ContentSecurityPolicyNonceManager; -use OC\Security\CSRF\CsrfTokenGenerator; use OC\Security\CSRF\CsrfTokenManager; use OC\Security\CSRF\TokenStorage\SessionStorage; use OC\Security\Hasher; @@ -132,9 +132,7 @@ use OC\Share20\ProviderFactory; use OC\Share20\ShareHelper; use OC\SystemTag\ManagerFactory as SystemTagManagerFactory; use OC\Tagging\TagMapper; -use OC\Template\IconsCacher; use OC\Template\JSCombiner; -use OC\Template\SCSSCacher; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; use OCA\Theming\Util; @@ -258,6 +256,7 @@ class Server extends ServerContainer implements IServerContainer { // To find out if we are running from CLI or not $this->registerParameter('isCLI', \OC::$CLI); + $this->registerParameter('serverRoot', \OC::$SERVERROOT); $this->registerService(ContainerInterface::class, function (ContainerInterface $c) { return $c; @@ -267,15 +266,19 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CalendarManager', \OC\Calendar\Manager::class); $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class); $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class); $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('ContactsManager', \OCP\Contacts\IManager::class); $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class); @@ -293,6 +296,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getSession()->get('user_id') ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('PreviewManager', IPreview::class); $this->registerService(\OC\Preview\Watcher::class, function (Server $c) { @@ -318,6 +322,7 @@ class Server extends ServerContainer implements IServerContainer { new ArrayCache() ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('EncryptionManager', \OCP\Encryption\IManager::class); $this->registerService('EncryptionFileHelper', function (Server $c) { @@ -345,14 +350,11 @@ class Server extends ServerContainer implements IServerContainer { return new Encryption\Keys\Storage($view, $util); }); - $this->registerService('TagMapper', function (Server $c) { - return new TagMapper($c->getDatabaseConnection()); - }); + /** @deprecated 20.0.0 */ + $this->registerDeprecatedAlias('TagMapper', TagMapper::class); - $this->registerService(\OCP\ITagManager::class, function (Server $c) { - $tagMapper = $c->query('TagMapper'); - return new TagManager($tagMapper, $c->getUserSession()); - }); + $this->registerAlias(\OCP\ITagManager::class, TagManager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class); $this->registerService('SystemTagManagerFactory', function (Server $c) { @@ -363,6 +365,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService(ISystemTagManager::class, function (Server $c) { return $c->query('SystemTagManagerFactory')->getManager(); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class); $this->registerService(ISystemTagObjectMapper::class, function (Server $c) { @@ -394,6 +397,7 @@ class Server extends ServerContainer implements IServerContainer { ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class); $this->registerService(IRootFolder::class, function (Server $c) { @@ -401,8 +405,10 @@ class Server extends ServerContainer implements IServerContainer { return $c->query('RootFolder'); }); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('LazyRootFolder', IRootFolder::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class); $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class); @@ -464,6 +470,7 @@ class Server extends ServerContainer implements IServerContainer { }); return $groupManager; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class); $this->registerService(Store::class, function (Server $c) { @@ -477,10 +484,6 @@ class Server extends ServerContainer implements IServerContainer { return new Store($session, $logger, $tokenProvider); }); $this->registerAlias(IStore::class, Store::class); - $this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) { - $dbConnection = $c->getDatabaseConnection(); - return new Authentication\Token\DefaultTokenMapper($dbConnection); - }); $this->registerAlias(IProvider::class, Authentication\Token\Manager::class); $this->registerService(\OC\User\Session::class, function (Server $c) { @@ -607,29 +610,26 @@ class Server extends ServerContainer implements IServerContainer { return $userSession; }); $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('UserSession', \OC\User\Session::class); $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class); $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('NavigationManager', INavigationManager::class); - $this->registerService(\OC\AllConfig::class, function (Server $c) { - return new \OC\AllConfig( - $c->getSystemConfig() - ); - }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class); $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class); $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) { return new \OC\SystemConfig($config); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('SystemConfig', \OC\SystemConfig::class); - $this->registerService(\OC\AppConfig::class, function (Server $c) { - return new \OC\AppConfig($c->getDatabaseConnection()); - }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class); $this->registerAlias(IAppConfig::class, \OC\AppConfig::class); @@ -641,6 +641,7 @@ class Server extends ServerContainer implements IServerContainer { \OC::$SERVERROOT ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('L10NFactory', IFactory::class); $this->registerService(IURLGenerator::class, function (Server $c) { @@ -653,14 +654,18 @@ class Server extends ServerContainer implements IServerContainer { $request ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('URLGenerator', IURLGenerator::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('AppFetcher', AppFetcher::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class); $this->registerService(ICache::class, function ($c) { return new Cache\File(); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('UserCache', ICache::class); $this->registerService(Factory::class, function (Server $c) { @@ -686,6 +691,7 @@ class Server extends ServerContainer implements IServerContainer { } return $arrayCacheFactory; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('MemCacheFactory', Factory::class); $this->registerAlias(ICacheFactory::class, Factory::class); @@ -704,6 +710,7 @@ class Server extends ServerContainer implements IServerContainer { $l10n ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class); $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) { @@ -723,6 +730,7 @@ class Server extends ServerContainer implements IServerContainer { ); }); $this->registerAlias(IAvatarManager::class, AvatarManager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('AvatarManager', AvatarManager::class); $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class); @@ -737,6 +745,7 @@ class Server extends ServerContainer implements IServerContainer { return new Log($logger, $this->getSystemConfig(), null, $registry); }); $this->registerAlias(ILogger::class, \OC\Log::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Logger', \OC\Log::class); // PSR-3 logger $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class); @@ -745,14 +754,8 @@ class Server extends ServerContainer implements IServerContainer { return new LogFactory($c, $this->getSystemConfig()); }); - $this->registerService(IJobList::class, function (Server $c) { - $config = $c->getConfig(); - return new \OC\BackgroundJob\JobList( - $c->getDatabaseConnection(), - $config, - new TimeFactory() - ); - }); + $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('JobList', IJobList::class); $this->registerService(IRouter::class, function (Server $c) { @@ -765,11 +768,11 @@ class Server extends ServerContainer implements IServerContainer { } return $router; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Router', IRouter::class); - $this->registerService(ISearch::class, function ($c) { - return new Search(); - }); + $this->registerAlias(ISearch::class, Search::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Search', ISearch::class); $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) { @@ -779,24 +782,20 @@ class Server extends ServerContainer implements IServerContainer { ); }); - $this->registerService(\OCP\Security\ISecureRandom::class, function ($c) { - return new SecureRandom(); - }); + $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('SecureRandom', \OCP\Security\ISecureRandom::class); - $this->registerService(ICrypto::class, function (Server $c) { - return new Crypto($c->getConfig(), $c->getSecureRandom()); - }); + $this->registerAlias(ICrypto::class, Crypto::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Crypto', ICrypto::class); - $this->registerService(IHasher::class, function (Server $c) { - return new Hasher($c->getConfig()); - }); + $this->registerAlias(IHasher::class, Hasher::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Hasher', IHasher::class); - $this->registerService(ICredentialsManager::class, function (Server $c) { - return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection()); - }); + $this->registerAlias(ICredentialsManager::class, CredentialsManager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class); $this->registerService(IDBConnection::class, function (Server $c) { @@ -811,6 +810,7 @@ class Server extends ServerContainer implements IServerContainer { $connection->getConfiguration()->setSQLLogger($c->getQueryLogger()); return $connection; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('DatabaseConnection', IDBConnection::class); @@ -829,6 +829,7 @@ class Server extends ServerContainer implements IServerContainer { ) ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('HttpClientService', IClientService::class); $this->registerService(IEventLogger::class, function (Server $c) { $eventLogger = new EventLogger(); @@ -838,6 +839,7 @@ class Server extends ServerContainer implements IServerContainer { } return $eventLogger; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('EventLogger', IEventLogger::class); $this->registerService(IQueryLogger::class, function (Server $c) { @@ -848,14 +850,10 @@ class Server extends ServerContainer implements IServerContainer { } return $queryLogger; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('QueryLogger', IQueryLogger::class); - $this->registerService(TempManager::class, function (Server $c) { - return new TempManager( - $c->getLogger(), - $c->getConfig() - ); - }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('TempManager', TempManager::class); $this->registerAlias(ITempManager::class, TempManager::class); @@ -870,15 +868,12 @@ class Server extends ServerContainer implements IServerContainer { $c->getLogger() ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('AppManager', AppManager::class); $this->registerAlias(IAppManager::class, AppManager::class); - $this->registerService(IDateTimeZone::class, function (Server $c) { - return new DateTimeZone( - $c->getConfig(), - $c->getSession() - ); - }); + $this->registerAlias(IDateTimeZone::class, DateTimeZone::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class); $this->registerService(IDateTimeFormatter::class, function (Server $c) { @@ -889,6 +884,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getL10N('lib', $language) ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class); $this->registerService(IUserMountCache::class, function (Server $c) { @@ -897,6 +893,7 @@ class Server extends ServerContainer implements IServerContainer { $listener->listen($c->getUserManager()); return $mountCache; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class); $this->registerService(IMountProviderCollection::class, function (Server $c) { @@ -915,11 +912,11 @@ class Server extends ServerContainer implements IServerContainer { return $manager; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('MountConfigManager', IMountProviderCollection::class); - $this->registerService('IniWrapper', function ($c) { - return new IniGetWrapper(); - }); + /** @deprecated 20.0.0 */ + $this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class); $this->registerService('AsyncCommandBus', function (Server $c) { $busClass = $c->getConfig()->getSystemValue('commandbus'); if ($busClass) { @@ -936,17 +933,9 @@ class Server extends ServerContainer implements IServerContainer { } }); $this->registerAlias(IBus::class, 'AsyncCommandBus'); - $this->registerService('TrustedDomainHelper', function ($c) { - return new TrustedDomainHelper($this->getConfig()); - }); - $this->registerService(Throttler::class, function (Server $c) { - return new Throttler( - $c->getDatabaseConnection(), - new TimeFactory(), - $c->getLogger(), - $c->getConfig() - ); - }); + /** @deprecated 20.0.0 */ + $this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Throttler', Throttler::class); $this->registerService('IntegrityCodeChecker', function (Server $c) { // IConfig and IAppManager requires a working database. This code @@ -1004,6 +993,7 @@ class Server extends ServerContainer implements IServerContainer { $stream ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Request', \OCP\IRequest::class); $this->registerService(IMailer::class, function (Server $c) { @@ -1017,6 +1007,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getL10NFactory() ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Mailer', IMailer::class); $this->registerService('LDAPProvider', function (Server $c) { @@ -1050,11 +1041,11 @@ class Server extends ServerContainer implements IServerContainer { } return new NoopLockingProvider(); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class); - $this->registerService(IMountManager::class, function () { - return new \OC\Files\Mount\Manager(); - }); + $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('MountManager', IMountManager::class); $this->registerService(IMimeTypeDetector::class, function (Server $c) { @@ -1065,23 +1056,17 @@ class Server extends ServerContainer implements IServerContainer { \OC::$SERVERROOT . '/resources/config/' ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('MimeTypeDetector', IMimeTypeDetector::class); - $this->registerService(IMimeTypeLoader::class, function (Server $c) { - return new \OC\Files\Type\Loader( - $c->getDatabaseConnection() - ); - }); + $this->registerAlias(IMimeTypeLoader::class, Loader::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class); $this->registerService(BundleFetcher::class, function () { return new BundleFetcher($this->getL10N('lib')); }); - $this->registerService(\OCP\Notification\IManager::class, function (Server $c) { - return new Manager( - $c->query(IValidator::class), - $c->getLogger() - ); - }); + $this->registerAlias(\OCP\Notification\IManager::class, Manager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class); $this->registerService(CapabilitiesManager::class, function (Server $c) { @@ -1094,6 +1079,7 @@ class Server extends ServerContainer implements IServerContainer { }); return $manager; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class); $this->registerService(ICommentsManager::class, function (Server $c) { @@ -1117,8 +1103,10 @@ class Server extends ServerContainer implements IServerContainer { return $manager; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class); + $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults'); $this->registerService('ThemingDefaults', function (Server $c) { /* * Dark magic for autoloader. @@ -1147,19 +1135,6 @@ class Server extends ServerContainer implements IServerContainer { } return new \OC_Defaults(); }); - $this->registerService(SCSSCacher::class, function (Server $c) { - return new SCSSCacher( - $c->getLogger(), - $c->query(\OC\Files\AppData\Factory::class), - $c->getURLGenerator(), - $c->getConfig(), - $c->getThemingDefaults(), - \OC::$SERVERROOT, - $this->getMemCacheFactory(), - $c->query(IconsCacher::class), - new TimeFactory() - ); - }); $this->registerService(JSCombiner::class, function (Server $c) { return new JSCombiner( $c->getAppDataDir('js'), @@ -1170,6 +1145,7 @@ class Server extends ServerContainer implements IServerContainer { ); }); $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class); $this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class); @@ -1198,28 +1174,15 @@ class Server extends ServerContainer implements IServerContainer { $request ); }); - $this->registerService(CsrfTokenManager::class, function (Server $c) { - $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom()); - - return new CsrfTokenManager( - $tokenGenerator, - $c->query(SessionStorage::class) - ); - }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class); $this->registerService(SessionStorage::class, function (Server $c) { return new SessionStorage($c->getSession()); }); $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class); - $this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) { - return new ContentSecurityPolicyNonceManager( - $c->getCsrfTokenManager(), - $c->getRequest() - ); - }); - $this->registerService(\OCP\Share\IManager::class, function (Server $c) { $config = $c->getConfig(); $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class); @@ -1247,6 +1210,7 @@ class Server extends ServerContainer implements IServerContainer { return $manager; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class); $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) { @@ -1261,6 +1225,7 @@ class Server extends ServerContainer implements IServerContainer { return $instance; }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class); $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class); @@ -1310,9 +1275,11 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class); $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class); $this->registerService(Defaults::class, function (Server $c) { @@ -1320,6 +1287,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getThemingDefaults() ); }); + /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class); $this->registerService(\OCP\ISession::class, function (SimpleContainer $c) { @@ -1352,20 +1320,10 @@ class Server extends ServerContainer implements IServerContainer { return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService()); }); - $this->registerService(IContactsStore::class, function (Server $c) { - return new ContactsStore( - $c->getContactsManager(), - $c->getConfig(), - $c->getUserManager(), - $c->getGroupManager() - ); - }); $this->registerAlias(IContactsStore::class, ContactsStore::class); $this->registerAlias(IAccountManager::class, AccountManager::class); - $this->registerService(IStorageFactory::class, function () { - return new StorageFactory(); - }); + $this->registerAlias(IStorageFactory::class, StorageFactory::class); $this->registerAlias(IDashboardManager::class, DashboardManager::class); $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class); @@ -2165,7 +2123,7 @@ class Server extends ServerContainer implements IServerContainer { * @deprecated */ public function getContentSecurityPolicyNonceManager() { - return $this->query('ContentSecurityPolicyNonceManager'); + return $this->query(ContentSecurityPolicyNonceManager::class); } /**