nextcloud / server

lib/private/Server.php

Indentation +1433 added lines, -1433 removed lines

@@ -248,1474 +248,1474 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// 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;
-		});
-		$this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
-			return $c;
-		});
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				)
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerService(ICache::class, function ($c) {
-			return new Cache\File();
-		});
-
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
-				$profiler,
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			/** @var ServerVersion $serverVersion */
-			$serverVersion = $c->get(ServerVersion::class);
-
-			if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$logQuery = $config->getValue('log_query');
-				$prefixClosure = function () use ($logQuery, $serverVersion): ?string {
-					if (!$logQuery) {
-						try {
-							$v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions();
-						} catch (\Doctrine\DBAL\Exception $e) {
-							// Database service probably unavailable
-							// Probably related to https://github.com/nextcloud/server/issues/37424
-							return null;
-						}
-					} else {
-						// If the log_query is enabled, we can not get the app versions
-						// as that does a query, which will be logged and the logging
-						// depends on redis and here we are back again in the same function.
-						$v = [
-							'log_query' => 'enabled',
-						];
-					}
-					$v['core'] = implode(',', $serverVersion->getVersion());
-					$version = implode(',', $v);
-					$instanceId = \OC_Util::getInstanceId();
-					$path = \OC::$SERVERROOT;
-					return md5($instanceId . '-' . $version . '-' . $path);
-				};
-				return new \OC\Memcache\Factory($prefixClosure,
-					$c->get(LoggerInterface::class),
-					$profiler,
-					/** @psalm-taint-escape callable */
-					$config->getValue('memcache.local', null),
-					/** @psalm-taint-escape callable */
-					$config->getValue('memcache.distributed', null),
-					/** @psalm-taint-escape callable */
-					$config->getValue('memcache.locking', null),
-					/** @psalm-taint-escape callable */
-					$config->getValue('redis_log_file')
-				);
-			}
-			return $arrayCacheFactory;
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n
-			);
-		});
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
-
-		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-
-		$this->registerService(AppManager::class, function (ContainerInterface $c) {
-			// TODO: use auto-wiring
-			return new \OC\App\AppManager(
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IGroupManager::class),
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class),
-				$c->get(ServerVersion::class),
-			);
-		});
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = $c->get(UserMountCache::class);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				new AppLocator(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class)
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(SystemConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::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(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$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 (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-			);
-		});
-
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // 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;
+        });
+        $this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+            return $c;
+        });
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                ),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                )
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(\OCP\Encryption\IManager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+        $this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+        $this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerService(ICache::class, function ($c) {
+            return new Cache\File();
+        });
+
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
+                $profiler,
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            /** @var ServerVersion $serverVersion */
+            $serverVersion = $c->get(ServerVersion::class);
+
+            if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $logQuery = $config->getValue('log_query');
+                $prefixClosure = function () use ($logQuery, $serverVersion): ?string {
+                    if (!$logQuery) {
+                        try {
+                            $v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions();
+                        } catch (\Doctrine\DBAL\Exception $e) {
+                            // Database service probably unavailable
+                            // Probably related to https://github.com/nextcloud/server/issues/37424
+                            return null;
+                        }
+                    } else {
+                        // If the log_query is enabled, we can not get the app versions
+                        // as that does a query, which will be logged and the logging
+                        // depends on redis and here we are back again in the same function.
+                        $v = [
+                            'log_query' => 'enabled',
+                        ];
+                    }
+                    $v['core'] = implode(',', $serverVersion->getVersion());
+                    $version = implode(',', $v);
+                    $instanceId = \OC_Util::getInstanceId();
+                    $path = \OC::$SERVERROOT;
+                    return md5($instanceId . '-' . $version . '-' . $path);
+                };
+                return new \OC\Memcache\Factory($prefixClosure,
+                    $c->get(LoggerInterface::class),
+                    $profiler,
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('memcache.local', null),
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('memcache.distributed', null),
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('memcache.locking', null),
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('redis_log_file')
+                );
+            }
+            return $arrayCacheFactory;
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n
+            );
+        });
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
+
+        /** Only used by the PsrLoggerAdapter should not be used by apps */
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+
+        $this->registerService(AppManager::class, function (ContainerInterface $c) {
+            // TODO: use auto-wiring
+            return new \OC\App\AppManager(
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IGroupManager::class),
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class),
+                $c->get(ServerVersion::class),
+            );
+        });
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = $c->get(UserMountCache::class);
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                new AppLocator(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class)
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(SystemConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::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(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $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 (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+            );
+        });
+
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(Installer::class, function (ContainerInterface $c) {
-			return new Installer(
-				$c->get(AppFetcher::class),
-				$c->get(IClientService::class),
-				$c->get(ITempManager::class),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				\OC::$CLI
-			);
-		});
+        $this->registerService(Installer::class, function (ContainerInterface $c) {
+            return new Installer(
+                $c->get(AppFetcher::class),
+                $c->get(IClientService::class),
+                $c->get(ITempManager::class),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                \OC::$CLI
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		$this->registerAlias(IOCMProvider::class, OCMProvider::class);
+        $this->registerAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
-
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
-
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
-
-		$this->connectDispatcher();
-	}
-
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
-
-	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
-			try {
-				/** @var LoggerInterface $logger */
-				$logger = $container->get(LoggerInterface::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
-			} catch (ContainerExceptionInterface $e) {
-				// Could not get logger. Continue
-			}
-
-			return $container->get($target);
-		}, false);
-	}
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
+
+        $this->connectDispatcher();
+    }
+
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
+
+    private function registerDeprecatedAlias(string $alias, string $target) {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+            try {
+                /** @var LoggerInterface $logger */
+                $logger = $container->get(LoggerInterface::class);
+                $logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+            } catch (ContainerExceptionInterface $e) {
+                // Could not get logger. Continue
+            }
+
+            return $container->get($target);
+        }, false);
+    }
 }

lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php

Indentation +117 added lines, -117 removed lines

@@ -17,124 +17,124 @@
  * @psalm-type ObjectStoreConfig array{class: class-string<IObjectStore>, arguments: array{multibucket: bool, ...}}
  */
 class PrimaryObjectStoreConfig {
-	public function __construct(
-		private readonly IConfig $config,
-		private readonly IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * @param ObjectStoreConfig $config
-	 */
-	public function buildObjectStore(array $config): IObjectStore {
-		return new $config['class']($config['arguments']);
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	public function getObjectStoreConfigForRoot(): ?array {
-		$config = $this->getObjectStoreConfig();
-
-		if ($config && $config['arguments']['multibucket']) {
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-
-			// put the root FS always in first bucket for multibucket configuration
-			$config['arguments']['bucket'] .= '0';
-		}
-		return $config;
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	public function getObjectStoreConfigForUser(IUser $user): ?array {
-		$config = $this->getObjectStoreConfig();
-
-		if ($config && $config['arguments']['multibucket']) {
-			$config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
-		}
-		return $config;
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	private function getObjectStoreConfig(): ?array {
-		$objectStore = $this->config->getSystemValue('objectstore', null);
-		$objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
-
-		// new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
-		if ($objectStoreMultiBucket) {
-			$objectStoreMultiBucket['arguments']['multibucket'] = true;
-			return $this->validateObjectStoreConfig($objectStoreMultiBucket);
-		} elseif ($objectStore) {
-			return $this->validateObjectStoreConfig($objectStore);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return ObjectStoreConfig
-	 */
-	private function validateObjectStoreConfig(array $config) {
-		if (!isset($config['class'])) {
-			throw new \Exception('No class configured for object store');
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		$class = $config['class'];
-		$arguments = $config['arguments'];
-		if (!is_array($arguments)) {
-			throw new \Exception('Configured object store arguments are not an array');
-		}
-		if (!isset($arguments['multibucket'])) {
-			$arguments['multibucket'] = false;
-		}
-		if (!is_bool($arguments['multibucket'])) {
-			throw new \Exception('arguments.multibucket must be a boolean in object store configuration');
-		}
-
-		if (!is_string($class)) {
-			throw new \Exception('Configured class for object store is not a string');
-		}
-
-		if (str_starts_with($class, 'OCA\\') && substr_count($class, '\\') >= 2) {
-			[$appId] = explode('\\', $class);
-			$this->appManager->loadApp(strtolower($appId));
-		}
-
-		if (!is_a($class, IObjectStore::class, true)) {
-			throw new \Exception('Configured class for object store is not an object store');
-		}
-		return [
-			'class' => $class,
-			'arguments' => $arguments,
-		];
-	}
-
-	private function getBucketForUser(IUser $user, array $config): string {
-		$bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
-
-		if ($bucket === null) {
-			/*
+    public function __construct(
+        private readonly IConfig $config,
+        private readonly IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * @param ObjectStoreConfig $config
+     */
+    public function buildObjectStore(array $config): IObjectStore {
+        return new $config['class']($config['arguments']);
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    public function getObjectStoreConfigForRoot(): ?array {
+        $config = $this->getObjectStoreConfig();
+
+        if ($config && $config['arguments']['multibucket']) {
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+
+            // put the root FS always in first bucket for multibucket configuration
+            $config['arguments']['bucket'] .= '0';
+        }
+        return $config;
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    public function getObjectStoreConfigForUser(IUser $user): ?array {
+        $config = $this->getObjectStoreConfig();
+
+        if ($config && $config['arguments']['multibucket']) {
+            $config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
+        }
+        return $config;
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    private function getObjectStoreConfig(): ?array {
+        $objectStore = $this->config->getSystemValue('objectstore', null);
+        $objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
+
+        // new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
+        if ($objectStoreMultiBucket) {
+            $objectStoreMultiBucket['arguments']['multibucket'] = true;
+            return $this->validateObjectStoreConfig($objectStoreMultiBucket);
+        } elseif ($objectStore) {
+            return $this->validateObjectStoreConfig($objectStore);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @return ObjectStoreConfig
+     */
+    private function validateObjectStoreConfig(array $config) {
+        if (!isset($config['class'])) {
+            throw new \Exception('No class configured for object store');
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        $class = $config['class'];
+        $arguments = $config['arguments'];
+        if (!is_array($arguments)) {
+            throw new \Exception('Configured object store arguments are not an array');
+        }
+        if (!isset($arguments['multibucket'])) {
+            $arguments['multibucket'] = false;
+        }
+        if (!is_bool($arguments['multibucket'])) {
+            throw new \Exception('arguments.multibucket must be a boolean in object store configuration');
+        }
+
+        if (!is_string($class)) {
+            throw new \Exception('Configured class for object store is not a string');
+        }
+
+        if (str_starts_with($class, 'OCA\\') && substr_count($class, '\\') >= 2) {
+            [$appId] = explode('\\', $class);
+            $this->appManager->loadApp(strtolower($appId));
+        }
+
+        if (!is_a($class, IObjectStore::class, true)) {
+            throw new \Exception('Configured class for object store is not an object store');
+        }
+        return [
+            'class' => $class,
+            'arguments' => $arguments,
+        ];
+    }
+
+    private function getBucketForUser(IUser $user, array $config): string {
+        $bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
+
+        if ($bucket === null) {
+            /*
 			 * Use any provided bucket argument as prefix
 			 * and add the mapping from username => bucket
 			 */
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-			$mapper = new Mapper($user, $this->config);
-			$numBuckets = isset($config['arguments']['num_buckets']) ? $config['arguments']['num_buckets'] : 64;
-			$bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);
-
-			$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $bucket);
-		}
-
-		return $bucket;
-	}
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+            $mapper = new Mapper($user, $this->config);
+            $numBuckets = isset($config['arguments']['num_buckets']) ? $config['arguments']['num_buckets'] : 64;
+            $bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);
+
+            $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $bucket);
+        }
+
+        return $bucket;
+    }
 }

lib/private/Files/Mount/RootMountProvider.php

Indentation +30 added lines, -30 removed lines

@@ -17,34 +17,34 @@
 use OCP\IConfig;
 
 class RootMountProvider implements IRootMountProvider {
-	private PrimaryObjectStoreConfig $objectStoreConfig;
-	private IConfig $config;
-
-	public function __construct(PrimaryObjectStoreConfig $objectStoreConfig, IConfig $config) {
-		$this->objectStoreConfig = $objectStoreConfig;
-		$this->config = $config;
-	}
-
-	public function getRootMounts(IStorageFactory $loader): array {
-		$objectStoreConfig = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-
-		if ($objectStoreConfig) {
-			return [$this->getObjectStoreRootMount($loader, $objectStoreConfig)];
-		} else {
-			return [$this->getLocalRootMount($loader)];
-		}
-	}
-
-	private function getLocalRootMount(IStorageFactory $loader): MountPoint {
-		$configDataDirectory = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
-		return new MountPoint(LocalRootStorage::class, '/', ['datadir' => $configDataDirectory], $loader, null, null, self::class);
-	}
-
-	private function getObjectStoreRootMount(IStorageFactory $loader, array $objectStoreConfig): MountPoint {
-		$arguments = array_merge($objectStoreConfig['arguments'], [
-			'objectstore' => $this->objectStoreConfig->buildObjectStore($objectStoreConfig),
-		]);
-
-		return new MountPoint(ObjectStoreStorage::class, '/', $arguments, $loader, null, null, self::class);
-	}
+    private PrimaryObjectStoreConfig $objectStoreConfig;
+    private IConfig $config;
+
+    public function __construct(PrimaryObjectStoreConfig $objectStoreConfig, IConfig $config) {
+        $this->objectStoreConfig = $objectStoreConfig;
+        $this->config = $config;
+    }
+
+    public function getRootMounts(IStorageFactory $loader): array {
+        $objectStoreConfig = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+
+        if ($objectStoreConfig) {
+            return [$this->getObjectStoreRootMount($loader, $objectStoreConfig)];
+        } else {
+            return [$this->getLocalRootMount($loader)];
+        }
+    }
+
+    private function getLocalRootMount(IStorageFactory $loader): MountPoint {
+        $configDataDirectory = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+        return new MountPoint(LocalRootStorage::class, '/', ['datadir' => $configDataDirectory], $loader, null, null, self::class);
+    }
+
+    private function getObjectStoreRootMount(IStorageFactory $loader, array $objectStoreConfig): MountPoint {
+        $arguments = array_merge($objectStoreConfig['arguments'], [
+            'objectstore' => $this->objectStoreConfig->buildObjectStore($objectStoreConfig),
+        ]);
+
+        return new MountPoint(ObjectStoreStorage::class, '/', $arguments, $loader, null, null, self::class);
+    }
 }

lib/private/Files/Mount/ObjectHomeMountProvider.php

Indentation +22 added lines, -22 removed lines

@@ -18,28 +18,28 @@
  * Mount provider for object store home storages
  */
 class ObjectHomeMountProvider implements IHomeMountProvider {
-	public function __construct(
-		private PrimaryObjectStoreConfig $objectStoreConfig,
-	) {
-	}
+    public function __construct(
+        private PrimaryObjectStoreConfig $objectStoreConfig,
+    ) {
+    }
 
-	/**
-	 * Get the home mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return ?IMountPoint
-	 */
-	public function getHomeMountForUser(IUser $user, IStorageFactory $loader): ?IMountPoint {
-		$objectStoreConfig = $this->objectStoreConfig->getObjectStoreConfigForUser($user);
-		if ($objectStoreConfig === null) {
-			return null;
-		}
-		$arguments = array_merge($objectStoreConfig['arguments'], [
-			'objectstore' => $this->objectStoreConfig->buildObjectStore($objectStoreConfig),
-			'user' => $user,
-		]);
+    /**
+     * Get the home mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return ?IMountPoint
+     */
+    public function getHomeMountForUser(IUser $user, IStorageFactory $loader): ?IMountPoint {
+        $objectStoreConfig = $this->objectStoreConfig->getObjectStoreConfigForUser($user);
+        if ($objectStoreConfig === null) {
+            return null;
+        }
+        $arguments = array_merge($objectStoreConfig['arguments'], [
+            'objectstore' => $this->objectStoreConfig->buildObjectStore($objectStoreConfig),
+            'user' => $user,
+        ]);
 
-		return new HomeMountPoint($user, HomeObjectStoreStorage::class, '/' . $user->getUID(), $arguments, $loader, null, null, self::class);
-	}
+        return new HomeMountPoint($user, HomeObjectStoreStorage::class, '/' . $user->getUID(), $arguments, $loader, null, null, self::class);
+    }
 }

tests/lib/Files/Mount/RootMountProviderTest.php

Indentation +93 added lines, -93 removed lines

@@ -22,106 +22,106 @@
  * @group DB
  */
 class RootMountProviderTest extends TestCase {
-	private StorageFactory $loader;
+    private StorageFactory $loader;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->loader = new StorageFactory();
-	}
+        $this->loader = new StorageFactory();
+    }
 
-	private function getConfig(array $systemConfig): IConfig {
-		$config = $this->createMock(IConfig::class);
-		$config->method('getSystemValue')
-			->willReturnCallback(function (string $key, $default) use ($systemConfig) {
-				return $systemConfig[$key] ?? $default;
-			});
-		return $config;
-	}
+    private function getConfig(array $systemConfig): IConfig {
+        $config = $this->createMock(IConfig::class);
+        $config->method('getSystemValue')
+            ->willReturnCallback(function (string $key, $default) use ($systemConfig) {
+                return $systemConfig[$key] ?? $default;
+            });
+        return $config;
+    }
 
-	private function getProvider(array $systemConfig): RootMountProvider {
-		$config = $this->getConfig($systemConfig);
-		$objectStoreConfig = new PrimaryObjectStoreConfig($config, $this->createMock(IAppManager::class));
-		return new RootMountProvider($objectStoreConfig, $config);
-	}
+    private function getProvider(array $systemConfig): RootMountProvider {
+        $config = $this->getConfig($systemConfig);
+        $objectStoreConfig = new PrimaryObjectStoreConfig($config, $this->createMock(IAppManager::class));
+        return new RootMountProvider($objectStoreConfig, $config);
+    }
 
-	public function testLocal(): void {
-		$provider = $this->getProvider([
-			'datadirectory' => '/data',
-		]);
-		$mounts = $provider->getRootMounts($this->loader);
-		$this->assertCount(1, $mounts);
-		$mount = $mounts[0];
-		$this->assertEquals('/', $mount->getMountPoint());
-		/** @var LocalRootStorage $storage */
-		$storage = $mount->getStorage();
-		$this->assertInstanceOf(LocalRootStorage::class, $storage);
-		$this->assertEquals('/data/', $storage->getSourcePath(''));
-	}
+    public function testLocal(): void {
+        $provider = $this->getProvider([
+            'datadirectory' => '/data',
+        ]);
+        $mounts = $provider->getRootMounts($this->loader);
+        $this->assertCount(1, $mounts);
+        $mount = $mounts[0];
+        $this->assertEquals('/', $mount->getMountPoint());
+        /** @var LocalRootStorage $storage */
+        $storage = $mount->getStorage();
+        $this->assertInstanceOf(LocalRootStorage::class, $storage);
+        $this->assertEquals('/data/', $storage->getSourcePath(''));
+    }
 
-	public function testObjectStore(): void {
-		$provider = $this->getProvider([
-			'objectstore' => [
-				'class' => "OC\Files\ObjectStore\S3",
-				'arguments' => [
-					'bucket' => 'nextcloud',
-					'autocreate' => true,
-					'key' => 'minio',
-					'secret' => 'minio123',
-					'hostname' => 'localhost',
-					'port' => 9000,
-					'use_ssl' => false,
-					'use_path_style' => true,
-					'uploadPartSize' => 52428800,
-				],
-			],
-		]);
-		$mounts = $provider->getRootMounts($this->loader);
-		$this->assertCount(1, $mounts);
-		$mount = $mounts[0];
-		$this->assertEquals('/', $mount->getMountPoint());
-		/** @var ObjectStoreStorage $storage */
-		$storage = $mount->getStorage();
-		$this->assertInstanceOf(ObjectStoreStorage::class, $storage);
+    public function testObjectStore(): void {
+        $provider = $this->getProvider([
+            'objectstore' => [
+                'class' => "OC\Files\ObjectStore\S3",
+                'arguments' => [
+                    'bucket' => 'nextcloud',
+                    'autocreate' => true,
+                    'key' => 'minio',
+                    'secret' => 'minio123',
+                    'hostname' => 'localhost',
+                    'port' => 9000,
+                    'use_ssl' => false,
+                    'use_path_style' => true,
+                    'uploadPartSize' => 52428800,
+                ],
+            ],
+        ]);
+        $mounts = $provider->getRootMounts($this->loader);
+        $this->assertCount(1, $mounts);
+        $mount = $mounts[0];
+        $this->assertEquals('/', $mount->getMountPoint());
+        /** @var ObjectStoreStorage $storage */
+        $storage = $mount->getStorage();
+        $this->assertInstanceOf(ObjectStoreStorage::class, $storage);
 
-		$class = new \ReflectionClass($storage);
-		$prop = $class->getProperty('objectStore');
-		$prop->setAccessible(true);
-		/** @var S3 $objectStore */
-		$objectStore = $prop->getValue($storage);
-		$this->assertEquals('nextcloud', $objectStore->getBucket());
-	}
+        $class = new \ReflectionClass($storage);
+        $prop = $class->getProperty('objectStore');
+        $prop->setAccessible(true);
+        /** @var S3 $objectStore */
+        $objectStore = $prop->getValue($storage);
+        $this->assertEquals('nextcloud', $objectStore->getBucket());
+    }
 
-	public function testObjectStoreMultiBucket(): void {
-		$provider = $this->getProvider([
-			'objectstore_multibucket' => [
-				'class' => "OC\Files\ObjectStore\S3",
-				'arguments' => [
-					'bucket' => 'nextcloud',
-					'autocreate' => true,
-					'key' => 'minio',
-					'secret' => 'minio123',
-					'hostname' => 'localhost',
-					'port' => 9000,
-					'use_ssl' => false,
-					'use_path_style' => true,
-					'uploadPartSize' => 52428800,
-				],
-			],
-		]);
-		$mounts = $provider->getRootMounts($this->loader);
-		$this->assertCount(1, $mounts);
-		$mount = $mounts[0];
-		$this->assertEquals('/', $mount->getMountPoint());
-		/** @var ObjectStoreStorage $storage */
-		$storage = $mount->getStorage();
-		$this->assertInstanceOf(ObjectStoreStorage::class, $storage);
+    public function testObjectStoreMultiBucket(): void {
+        $provider = $this->getProvider([
+            'objectstore_multibucket' => [
+                'class' => "OC\Files\ObjectStore\S3",
+                'arguments' => [
+                    'bucket' => 'nextcloud',
+                    'autocreate' => true,
+                    'key' => 'minio',
+                    'secret' => 'minio123',
+                    'hostname' => 'localhost',
+                    'port' => 9000,
+                    'use_ssl' => false,
+                    'use_path_style' => true,
+                    'uploadPartSize' => 52428800,
+                ],
+            ],
+        ]);
+        $mounts = $provider->getRootMounts($this->loader);
+        $this->assertCount(1, $mounts);
+        $mount = $mounts[0];
+        $this->assertEquals('/', $mount->getMountPoint());
+        /** @var ObjectStoreStorage $storage */
+        $storage = $mount->getStorage();
+        $this->assertInstanceOf(ObjectStoreStorage::class, $storage);
 
-		$class = new \ReflectionClass($storage);
-		$prop = $class->getProperty('objectStore');
-		$prop->setAccessible(true);
-		/** @var S3 $objectStore */
-		$objectStore = $prop->getValue($storage);
-		$this->assertEquals('nextcloud0', $objectStore->getBucket());
-	}
+        $class = new \ReflectionClass($storage);
+        $prop = $class->getProperty('objectStore');
+        $prop->setAccessible(true);
+        /** @var S3 $objectStore */
+        $objectStore = $prop->getValue($storage);
+        $this->assertEquals('nextcloud0', $objectStore->getBucket());
+    }
 }

tests/lib/Files/Mount/ObjectHomeMountProviderTest.php

Indentation +242 added lines, -242 removed lines

@@ -15,257 +15,257 @@
 use OCP\IUser;
 
 class ObjectHomeMountProviderTest extends \Test\TestCase {
-	/** @var ObjectHomeMountProvider */
-	protected $provider;
-
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
-
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-	protected $user;
-
-	/** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $loader;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->user = $this->createMock(IUser::class);
-		$this->loader = $this->createMock(IStorageFactory::class);
-
-		$objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->createMock(IAppManager::class));
-		$this->provider = new ObjectHomeMountProvider($objectStoreConfig);
-	}
-
-	public function testSingleBucket(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar'
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'multibucket' => false], $objectStore->getArguments());
-	}
-
-	public function testMultiBucket(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar'
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$this->config->method('getUserValue')
-			->willReturn(null);
-
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with(
-				$this->equalTo('uid'),
-				$this->equalTo('homeobjectstore'),
-				$this->equalTo('bucket'),
-				$this->equalTo('49'),
-				$this->equalTo(null)
-			);
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'bucket' => 49, 'multibucket' => true], $objectStore->getArguments());
-	}
-
-	public function testMultiBucketWithPrefix(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar',
-							'bucket' => 'myBucketPrefix',
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$this->config
-			->method('getUserValue')
-			->willReturn(null);
-
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with(
-				$this->equalTo('uid'),
-				$this->equalTo('homeobjectstore'),
-				$this->equalTo('bucket'),
-				$this->equalTo('myBucketPrefix49'),
-				$this->equalTo(null)
-			);
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'bucket' => 'myBucketPrefix49', 'multibucket' => true], $objectStore->getArguments());
-	}
-
-	public function testMultiBucketBucketAlreadySet(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar',
-							'bucket' => 'myBucketPrefix',
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$this->config
-			->method('getUserValue')
-			->willReturnCallback(function ($uid, $app, $key, $default) {
-				if ($uid === 'uid' && $app === 'homeobjectstore' && $key === 'bucket') {
-					return 'awesomeBucket1';
-				} else {
-					return $default;
-				}
-			});
-
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'bucket' => 'awesomeBucket1', 'multibucket' => true], $objectStore->getArguments());
-	}
-
-	public function testMultiBucketConfigFirst(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar',
-							'bucket' => 'myBucketPrefix',
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
-	}
-
-	public function testMultiBucketConfigFirstFallBackSingle(): void {
-		$this->config
-			->method('getSystemValue')->willReturnMap([
-				['objectstore_multibucket', null, null],
-				['objectstore', null, [
-					'class' => 'Test\Files\Mount\FakeObjectStore',
-					'arguments' => [
-						'foo' => 'bar',
-						'bucket' => 'myBucketPrefix',
-					],
-				]],
-			]);
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
-	}
-
-	public function testNoObjectStore(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				return $default;
-			});
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$this->assertNull($mount);
-	}
+    /** @var ObjectHomeMountProvider */
+    protected $provider;
+
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
+
+    /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
+    protected $user;
+
+    /** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $loader;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->user = $this->createMock(IUser::class);
+        $this->loader = $this->createMock(IStorageFactory::class);
+
+        $objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->createMock(IAppManager::class));
+        $this->provider = new ObjectHomeMountProvider($objectStoreConfig);
+    }
+
+    public function testSingleBucket(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar'
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'multibucket' => false], $objectStore->getArguments());
+    }
+
+    public function testMultiBucket(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar'
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $this->config->method('getUserValue')
+            ->willReturn(null);
+
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with(
+                $this->equalTo('uid'),
+                $this->equalTo('homeobjectstore'),
+                $this->equalTo('bucket'),
+                $this->equalTo('49'),
+                $this->equalTo(null)
+            );
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'bucket' => 49, 'multibucket' => true], $objectStore->getArguments());
+    }
+
+    public function testMultiBucketWithPrefix(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar',
+                            'bucket' => 'myBucketPrefix',
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $this->config
+            ->method('getUserValue')
+            ->willReturn(null);
+
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with(
+                $this->equalTo('uid'),
+                $this->equalTo('homeobjectstore'),
+                $this->equalTo('bucket'),
+                $this->equalTo('myBucketPrefix49'),
+                $this->equalTo(null)
+            );
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'bucket' => 'myBucketPrefix49', 'multibucket' => true], $objectStore->getArguments());
+    }
+
+    public function testMultiBucketBucketAlreadySet(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar',
+                            'bucket' => 'myBucketPrefix',
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $this->config
+            ->method('getUserValue')
+            ->willReturnCallback(function ($uid, $app, $key, $default) {
+                if ($uid === 'uid' && $app === 'homeobjectstore' && $key === 'bucket') {
+                    return 'awesomeBucket1';
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'bucket' => 'awesomeBucket1', 'multibucket' => true], $objectStore->getArguments());
+    }
+
+    public function testMultiBucketConfigFirst(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar',
+                            'bucket' => 'myBucketPrefix',
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
+    }
+
+    public function testMultiBucketConfigFirstFallBackSingle(): void {
+        $this->config
+            ->method('getSystemValue')->willReturnMap([
+                ['objectstore_multibucket', null, null],
+                ['objectstore', null, [
+                    'class' => 'Test\Files\Mount\FakeObjectStore',
+                    'arguments' => [
+                        'foo' => 'bar',
+                        'bucket' => 'myBucketPrefix',
+                    ],
+                ]],
+            ]);
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
+    }
+
+    public function testNoObjectStore(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                return $default;
+            });
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $this->assertNull($mount);
+    }
 }
 
 class FakeObjectStore implements IObjectStore {
-	private $arguments;
+    private $arguments;
 
-	public function __construct(array $arguments) {
-		$this->arguments = $arguments;
-	}
+    public function __construct(array $arguments) {
+        $this->arguments = $arguments;
+    }
 
-	public function getArguments() {
-		return $this->arguments;
-	}
+    public function getArguments() {
+        return $this->arguments;
+    }
 
-	public function getStorageId() {
-	}
+    public function getStorageId() {
+    }
 
-	public function readObject($urn) {
-	}
+    public function readObject($urn) {
+    }
 
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-	}
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+    }
 
-	public function deleteObject($urn) {
-	}
+    public function deleteObject($urn) {
+    }
 
-	public function objectExists($urn) {
-	}
+    public function objectExists($urn) {
+    }
 
-	public function copyObject($from, $to) {
-	}
+    public function copyObject($from, $to) {
+    }
 }

tests/lib/TestCase.php

Indentation +574 added lines, -574 removed lines

@@ -28,582 +28,582 @@
 use OCP\Security\ISecureRandom;
 
 if (version_compare(\PHPUnit\Runner\Version::id(), 10, '>=')) {
-	trait OnNotSuccessfulTestTrait {
-		protected function onNotSuccessfulTest(\Throwable $t): never {
-			$this->restoreAllServices();
-
-			// restore database connection
-			if (!$this->IsDatabaseAccessAllowed()) {
-				\OC::$server->registerService(IDBConnection::class, function () {
-					return self::$realDatabase;
-				});
-			}
-
-			parent::onNotSuccessfulTest($t);
-		}
-	}
+    trait OnNotSuccessfulTestTrait {
+        protected function onNotSuccessfulTest(\Throwable $t): never {
+            $this->restoreAllServices();
+
+            // restore database connection
+            if (!$this->IsDatabaseAccessAllowed()) {
+                \OC::$server->registerService(IDBConnection::class, function () {
+                    return self::$realDatabase;
+                });
+            }
+
+            parent::onNotSuccessfulTest($t);
+        }
+    }
 } else {
-	trait OnNotSuccessfulTestTrait {
-		protected function onNotSuccessfulTest(\Throwable $t): void {
-			$this->restoreAllServices();
-
-			// restore database connection
-			if (!$this->IsDatabaseAccessAllowed()) {
-				\OC::$server->registerService(IDBConnection::class, function () {
-					return self::$realDatabase;
-				});
-			}
-
-			parent::onNotSuccessfulTest($t);
-		}
-	}
+    trait OnNotSuccessfulTestTrait {
+        protected function onNotSuccessfulTest(\Throwable $t): void {
+            $this->restoreAllServices();
+
+            // restore database connection
+            if (!$this->IsDatabaseAccessAllowed()) {
+                \OC::$server->registerService(IDBConnection::class, function () {
+                    return self::$realDatabase;
+                });
+            }
+
+            parent::onNotSuccessfulTest($t);
+        }
+    }
 }
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase {
-	/** @var \OC\Command\QueueBus */
-	private $commandBus;
-
-	/** @var IDBConnection */
-	protected static $realDatabase = null;
-
-	/** @var bool */
-	private static $wasDatabaseAllowed = false;
-
-	/** @var array */
-	protected $services = [];
-
-	use OnNotSuccessfulTestTrait;
-
-	/**
-	 * @param string $name
-	 * @param mixed $newService
-	 * @return bool
-	 */
-	public function overwriteService(string $name, $newService): bool {
-		if (isset($this->services[$name])) {
-			return false;
-		}
-
-		$this->services[$name] = \OC::$server->query($name);
-		$container = \OC::$server->getAppContainerForService($name);
-		$container = $container ?? \OC::$server;
-
-		$container->registerService($name, function () use ($newService) {
-			return $newService;
-		});
-
-		return true;
-	}
-
-	/**
-	 * @param string $name
-	 * @return bool
-	 */
-	public function restoreService(string $name): bool {
-		if (isset($this->services[$name])) {
-			$oldService = $this->services[$name];
-
-			$container = \OC::$server->getAppContainerForService($name);
-			$container = $container ?? \OC::$server;
-
-			$container->registerService($name, function () use ($oldService) {
-				return $oldService;
-			});
-
-
-			unset($this->services[$name]);
-			return true;
-		}
-
-		return false;
-	}
-
-	public function restoreAllServices() {
-		if (!empty($this->services)) {
-			if (!empty($this->services)) {
-				foreach ($this->services as $name => $service) {
-					$this->restoreService($name);
-				}
-			}
-		}
-	}
-
-	protected function getTestTraits() {
-		$traits = [];
-		$class = $this;
-		do {
-			$traits = array_merge(class_uses($class), $traits);
-		} while ($class = get_parent_class($class));
-		foreach ($traits as $trait => $same) {
-			$traits = array_merge(class_uses($trait), $traits);
-		}
-		$traits = array_unique($traits);
-		return array_filter($traits, function ($trait) {
-			return substr($trait, 0, 5) === 'Test\\';
-		});
-	}
-
-	protected function setUp(): void {
-		// overwrite the command bus with one we can run ourselves
-		$this->commandBus = new QueueBus();
-		$this->overwriteService('AsyncCommandBus', $this->commandBus);
-		$this->overwriteService(IBus::class, $this->commandBus);
-
-		// detect database access
-		self::$wasDatabaseAllowed = true;
-		if (!$this->IsDatabaseAccessAllowed()) {
-			self::$wasDatabaseAllowed = false;
-			if (is_null(self::$realDatabase)) {
-				self::$realDatabase = \OC::$server->getDatabaseConnection();
-			}
-			\OC::$server->registerService(IDBConnection::class, function () {
-				$this->fail('Your test case is not allowed to access the database.');
-			});
-		}
-
-		$traits = $this->getTestTraits();
-		foreach ($traits as $trait) {
-			$methodName = 'setUp' . basename(str_replace('\\', '/', $trait));
-			if (method_exists($this, $methodName)) {
-				call_user_func([$this, $methodName]);
-			}
-		}
-	}
-
-	protected function tearDown(): void {
-		$this->restoreAllServices();
-
-		// restore database connection
-		if (!$this->IsDatabaseAccessAllowed()) {
-			\OC::$server->registerService(IDBConnection::class, function () {
-				return self::$realDatabase;
-			});
-		}
-
-		// further cleanup
-		$hookExceptions = \OC_Hook::$thrownExceptions;
-		\OC_Hook::$thrownExceptions = [];
-		\OC::$server->get(ILockingProvider::class)->releaseAll();
-		if (!empty($hookExceptions)) {
-			throw $hookExceptions[0];
-		}
-
-		// fail hard if xml errors have not been cleaned up
-		$errors = libxml_get_errors();
-		libxml_clear_errors();
-		if (!empty($errors)) {
-			self::assertEquals([], $errors, 'There have been xml parsing errors');
-		}
-
-		if ($this->IsDatabaseAccessAllowed()) {
-			\OC\Files\Cache\Storage::getGlobalCache()->clearCache();
-		}
-
-		// tearDown the traits
-		$traits = $this->getTestTraits();
-		foreach ($traits as $trait) {
-			$methodName = 'tearDown' . basename(str_replace('\\', '/', $trait));
-			if (method_exists($this, $methodName)) {
-				call_user_func([$this, $methodName]);
-			}
-		}
-	}
-
-	/**
-	 * Allows us to test private methods/properties
-	 *
-	 * @param $object
-	 * @param $methodName
-	 * @param array $parameters
-	 * @return mixed
-	 */
-	protected static function invokePrivate($object, $methodName, array $parameters = []) {
-		if (is_string($object)) {
-			$className = $object;
-		} else {
-			$className = get_class($object);
-		}
-		$reflection = new \ReflectionClass($className);
-
-		if ($reflection->hasMethod($methodName)) {
-			$method = $reflection->getMethod($methodName);
-
-			$method->setAccessible(true);
-
-			return $method->invokeArgs($object, $parameters);
-		} elseif ($reflection->hasProperty($methodName)) {
-			$property = $reflection->getProperty($methodName);
-
-			$property->setAccessible(true);
-
-			if (!empty($parameters)) {
-				if ($property->isStatic()) {
-					$property->setValue(null, array_pop($parameters));
-				} else {
-					$property->setValue($object, array_pop($parameters));
-				}
-			}
-
-			if (is_object($object)) {
-				return $property->getValue($object);
-			}
-
-			return $property->getValue();
-		} elseif ($reflection->hasConstant($methodName)) {
-			return $reflection->getConstant($methodName);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns a unique identifier as uniqid() is not reliable sometimes
-	 *
-	 * @param string $prefix
-	 * @param int $length
-	 * @return string
-	 */
-	protected static function getUniqueID($prefix = '', $length = 13) {
-		return $prefix . \OC::$server->get(ISecureRandom::class)->generate(
-			$length,
-			// Do not use dots and slashes as we use the value for file names
-			ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
-		);
-	}
-
-	/**
-	 * Filter methods
-	 *
-	 * Returns all methods of the given class,
-	 * that are public or abstract and not in the ignoreMethods list,
-	 * to be able to fill onlyMethods() with an inverted list.
-	 *
-	 * @param string $className
-	 * @param string[] $filterMethods
-	 * @return string[]
-	 */
-	public function filterClassMethods(string $className, array $filterMethods): array {
-		$class = new \ReflectionClass($className);
-
-		$methods = [];
-		foreach ($class->getMethods() as $method) {
-			if (($method->isPublic() || $method->isAbstract()) && !in_array($method->getName(), $filterMethods, true)) {
-				$methods[] = $method->getName();
-			}
-		}
-
-		return $methods;
-	}
-
-	public static function tearDownAfterClass(): void {
-		if (!self::$wasDatabaseAllowed && self::$realDatabase !== null) {
-			// in case an error is thrown in a test, PHPUnit jumps straight to tearDownAfterClass,
-			// so we need the database again
-			\OC::$server->registerService(IDBConnection::class, function () {
-				return self::$realDatabase;
-			});
-		}
-		$dataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data-autotest');
-		if (self::$wasDatabaseAllowed && \OC::$server->getDatabaseConnection()) {
-			$db = \OC::$server->getDatabaseConnection();
-			if ($db->inTransaction()) {
-				$db->rollBack();
-				throw new \Exception('There was a transaction still in progress and needed to be rolled back. Please fix this in your test.');
-			}
-			$queryBuilder = $db->getQueryBuilder();
-
-			self::tearDownAfterClassCleanShares($queryBuilder);
-			self::tearDownAfterClassCleanStorages($queryBuilder);
-			self::tearDownAfterClassCleanFileCache($queryBuilder);
-		}
-		self::tearDownAfterClassCleanStrayDataFiles($dataDir);
-		self::tearDownAfterClassCleanStrayHooks();
-		self::tearDownAfterClassCleanStrayLocks();
-
-		/** @var SetupManager $setupManager */
-		$setupManager = \OC::$server->get(SetupManager::class);
-		$setupManager->tearDown();
-
-		/** @var MountProviderCollection $mountProviderCollection */
-		$mountProviderCollection = \OC::$server->get(MountProviderCollection::class);
-		$mountProviderCollection->clearProviders();
-
-		/** @var IConfig $config */
-		$config = \OC::$server->get(IConfig::class);
-		$mountProviderCollection->registerProvider(new CacheMountProvider($config));
-		$mountProviderCollection->registerHomeProvider(new LocalHomeMountProvider());
-		$objectStoreConfig = \OC::$server->get(PrimaryObjectStoreConfig::class);
-		$mountProviderCollection->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-
-		$setupManager->setupRoot();
-
-		parent::tearDownAfterClass();
-	}
-
-	/**
-	 * Remove all entries from the share table
-	 *
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	protected static function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) {
-		$queryBuilder->delete('share')
-			->execute();
-	}
-
-	/**
-	 * Remove all entries from the storages table
-	 *
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	protected static function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) {
-		$queryBuilder->delete('storages')
-			->execute();
-	}
-
-	/**
-	 * Remove all entries from the filecache table
-	 *
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	protected static function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) {
-		$queryBuilder->delete('filecache')
-			->runAcrossAllShards()
-			->execute();
-	}
-
-	/**
-	 * Remove all unused files from the data dir
-	 *
-	 * @param string $dataDir
-	 */
-	protected static function tearDownAfterClassCleanStrayDataFiles($dataDir) {
-		$knownEntries = [
-			'nextcloud.log' => true,
-			'audit.log' => true,
-			'owncloud.db' => true,
-			'.ocdata' => true,
-			'..' => true,
-			'.' => true,
-		];
-
-		if ($dh = opendir($dataDir)) {
-			while (($file = readdir($dh)) !== false) {
-				if (!isset($knownEntries[$file])) {
-					self::tearDownAfterClassCleanStrayDataUnlinkDir($dataDir . '/' . $file);
-				}
-			}
-			closedir($dh);
-		}
-	}
-
-	/**
-	 * Recursive delete files and folders from a given directory
-	 *
-	 * @param string $dir
-	 */
-	protected static function tearDownAfterClassCleanStrayDataUnlinkDir($dir) {
-		if ($dh = @opendir($dir)) {
-			while (($file = readdir($dh)) !== false) {
-				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-					continue;
-				}
-				$path = $dir . '/' . $file;
-				if (is_dir($path)) {
-					self::tearDownAfterClassCleanStrayDataUnlinkDir($path);
-				} else {
-					@unlink($path);
-				}
-			}
-			closedir($dh);
-		}
-		@rmdir($dir);
-	}
-
-	/**
-	 * Clean up the list of hooks
-	 */
-	protected static function tearDownAfterClassCleanStrayHooks() {
-		\OC_Hook::clear();
-	}
-
-	/**
-	 * Clean up the list of locks
-	 */
-	protected static function tearDownAfterClassCleanStrayLocks() {
-		\OC::$server->get(ILockingProvider::class)->releaseAll();
-	}
-
-	/**
-	 * Login and setup FS as a given user,
-	 * sets the given user as the current user.
-	 *
-	 * @param string $user user id or empty for a generic FS
-	 */
-	protected static function loginAsUser($user = '') {
-		self::logout();
-		\OC\Files\Filesystem::tearDown();
-		\OC_User::setUserId($user);
-		$userObject = \OC::$server->getUserManager()->get($user);
-		if (!is_null($userObject)) {
-			$userObject->updateLastLoginTimestamp();
-		}
-		\OC_Util::setupFS($user);
-		if (\OC::$server->getUserManager()->userExists($user)) {
-			\OC::$server->getUserFolder($user);
-		}
-	}
-
-	/**
-	 * Logout the current user and tear down the filesystem.
-	 */
-	protected static function logout() {
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		// needed for fully logout
-		\OC::$server->getUserSession()->setUser(null);
-	}
-
-	/**
-	 * Run all commands pushed to the bus
-	 */
-	protected function runCommands() {
-		// get the user for which the fs is setup
-		$view = Filesystem::getView();
-		if ($view) {
-			[, $user] = explode('/', $view->getRoot());
-		} else {
-			$user = null;
-		}
-
-		\OC_Util::tearDownFS(); // command can't reply on the fs being setup
-		$this->commandBus->run();
-		\OC_Util::tearDownFS();
-
-		if ($user) {
-			\OC_Util::setupFS($user);
-		}
-	}
-
-	/**
-	 * Check if the given path is locked with a given type
-	 *
-	 * @param \OC\Files\View $view view
-	 * @param string $path path to check
-	 * @param int $type lock type
-	 * @param bool $onMountPoint true to check the mount point instead of the
-	 *                           mounted storage
-	 *
-	 * @return boolean true if the file is locked with the
-	 *                 given type, false otherwise
-	 */
-	protected function isFileLocked($view, $path, $type, $onMountPoint = false) {
-		// Note: this seems convoluted but is necessary because
-		// the format of the lock key depends on the storage implementation
-		// (in our case mostly md5)
-
-		if ($type === \OCP\Lock\ILockingProvider::LOCK_SHARED) {
-			// to check if the file has a shared lock, try acquiring an exclusive lock
-			$checkType = \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE;
-		} else {
-			// a shared lock cannot be set if exclusive lock is in place
-			$checkType = \OCP\Lock\ILockingProvider::LOCK_SHARED;
-		}
-		try {
-			$view->lockFile($path, $checkType, $onMountPoint);
-			// no exception, which means the lock of $type is not set
-			// clean up
-			$view->unlockFile($path, $checkType, $onMountPoint);
-			return false;
-		} catch (\OCP\Lock\LockedException $e) {
-			// we could not acquire the counter-lock, which means
-			// the lock of $type was in place
-			return true;
-		}
-	}
-
-	protected function getGroupAnnotations(): array {
-		if (method_exists($this, 'getAnnotations')) {
-			$annotations = $this->getAnnotations();
-			return $annotations['class']['group'] ?? [];
-		}
-
-		$r = new \ReflectionClass($this);
-		$doc = $r->getDocComment();
-		preg_match_all('#@group\s+(.*?)\n#s', $doc, $annotations);
-		return $annotations[1] ?? [];
-	}
-
-	protected function IsDatabaseAccessAllowed() {
-		$annotations = $this->getGroupAnnotations();
-		if (isset($annotations)) {
-			if (in_array('DB', $annotations) || in_array('SLOWDB', $annotations)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $expectedHtml
-	 * @param string $template
-	 * @param array $vars
-	 */
-	protected function assertTemplate($expectedHtml, $template, $vars = []) {
-		$requestToken = 12345;
-		/** @var Defaults|\PHPUnit\Framework\MockObject\MockObject $l10n */
-		$theme = $this->getMockBuilder('\OCP\Defaults')
-			->disableOriginalConstructor()->getMock();
-		$theme->expects($this->any())
-			->method('getName')
-			->willReturn('Nextcloud');
-		/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */
-		$l10n = $this->getMockBuilder(IL10N::class)
-			->disableOriginalConstructor()->getMock();
-		$l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-
-		$t = new Base($template, $requestToken, $l10n, $theme);
-		$buf = $t->fetchPage($vars);
-		$this->assertHtmlStringEqualsHtmlString($expectedHtml, $buf);
-	}
-
-	/**
-	 * @param string $expectedHtml
-	 * @param string $actualHtml
-	 * @param string $message
-	 */
-	protected function assertHtmlStringEqualsHtmlString($expectedHtml, $actualHtml, $message = '') {
-		$expected = new DOMDocument();
-		$expected->preserveWhiteSpace = false;
-		$expected->formatOutput = true;
-		$expected->loadHTML($expectedHtml);
-
-		$actual = new DOMDocument();
-		$actual->preserveWhiteSpace = false;
-		$actual->formatOutput = true;
-		$actual->loadHTML($actualHtml);
-		$this->removeWhitespaces($actual);
-
-		$expectedHtml1 = $expected->saveHTML();
-		$actualHtml1 = $actual->saveHTML();
-		self::assertEquals($expectedHtml1, $actualHtml1, $message);
-	}
-
-
-	private function removeWhitespaces(DOMNode $domNode) {
-		foreach ($domNode->childNodes as $node) {
-			if ($node->hasChildNodes()) {
-				$this->removeWhitespaces($node);
-			} else {
-				if ($node instanceof \DOMText && $node->isWhitespaceInElementContent()) {
-					$domNode->removeChild($node);
-				}
-			}
-		}
-	}
+    /** @var \OC\Command\QueueBus */
+    private $commandBus;
+
+    /** @var IDBConnection */
+    protected static $realDatabase = null;
+
+    /** @var bool */
+    private static $wasDatabaseAllowed = false;
+
+    /** @var array */
+    protected $services = [];
+
+    use OnNotSuccessfulTestTrait;
+
+    /**
+     * @param string $name
+     * @param mixed $newService
+     * @return bool
+     */
+    public function overwriteService(string $name, $newService): bool {
+        if (isset($this->services[$name])) {
+            return false;
+        }
+
+        $this->services[$name] = \OC::$server->query($name);
+        $container = \OC::$server->getAppContainerForService($name);
+        $container = $container ?? \OC::$server;
+
+        $container->registerService($name, function () use ($newService) {
+            return $newService;
+        });
+
+        return true;
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function restoreService(string $name): bool {
+        if (isset($this->services[$name])) {
+            $oldService = $this->services[$name];
+
+            $container = \OC::$server->getAppContainerForService($name);
+            $container = $container ?? \OC::$server;
+
+            $container->registerService($name, function () use ($oldService) {
+                return $oldService;
+            });
+
+
+            unset($this->services[$name]);
+            return true;
+        }
+
+        return false;
+    }
+
+    public function restoreAllServices() {
+        if (!empty($this->services)) {
+            if (!empty($this->services)) {
+                foreach ($this->services as $name => $service) {
+                    $this->restoreService($name);
+                }
+            }
+        }
+    }
+
+    protected function getTestTraits() {
+        $traits = [];
+        $class = $this;
+        do {
+            $traits = array_merge(class_uses($class), $traits);
+        } while ($class = get_parent_class($class));
+        foreach ($traits as $trait => $same) {
+            $traits = array_merge(class_uses($trait), $traits);
+        }
+        $traits = array_unique($traits);
+        return array_filter($traits, function ($trait) {
+            return substr($trait, 0, 5) === 'Test\\';
+        });
+    }
+
+    protected function setUp(): void {
+        // overwrite the command bus with one we can run ourselves
+        $this->commandBus = new QueueBus();
+        $this->overwriteService('AsyncCommandBus', $this->commandBus);
+        $this->overwriteService(IBus::class, $this->commandBus);
+
+        // detect database access
+        self::$wasDatabaseAllowed = true;
+        if (!$this->IsDatabaseAccessAllowed()) {
+            self::$wasDatabaseAllowed = false;
+            if (is_null(self::$realDatabase)) {
+                self::$realDatabase = \OC::$server->getDatabaseConnection();
+            }
+            \OC::$server->registerService(IDBConnection::class, function () {
+                $this->fail('Your test case is not allowed to access the database.');
+            });
+        }
+
+        $traits = $this->getTestTraits();
+        foreach ($traits as $trait) {
+            $methodName = 'setUp' . basename(str_replace('\\', '/', $trait));
+            if (method_exists($this, $methodName)) {
+                call_user_func([$this, $methodName]);
+            }
+        }
+    }
+
+    protected function tearDown(): void {
+        $this->restoreAllServices();
+
+        // restore database connection
+        if (!$this->IsDatabaseAccessAllowed()) {
+            \OC::$server->registerService(IDBConnection::class, function () {
+                return self::$realDatabase;
+            });
+        }
+
+        // further cleanup
+        $hookExceptions = \OC_Hook::$thrownExceptions;
+        \OC_Hook::$thrownExceptions = [];
+        \OC::$server->get(ILockingProvider::class)->releaseAll();
+        if (!empty($hookExceptions)) {
+            throw $hookExceptions[0];
+        }
+
+        // fail hard if xml errors have not been cleaned up
+        $errors = libxml_get_errors();
+        libxml_clear_errors();
+        if (!empty($errors)) {
+            self::assertEquals([], $errors, 'There have been xml parsing errors');
+        }
+
+        if ($this->IsDatabaseAccessAllowed()) {
+            \OC\Files\Cache\Storage::getGlobalCache()->clearCache();
+        }
+
+        // tearDown the traits
+        $traits = $this->getTestTraits();
+        foreach ($traits as $trait) {
+            $methodName = 'tearDown' . basename(str_replace('\\', '/', $trait));
+            if (method_exists($this, $methodName)) {
+                call_user_func([$this, $methodName]);
+            }
+        }
+    }
+
+    /**
+     * Allows us to test private methods/properties
+     *
+     * @param $object
+     * @param $methodName
+     * @param array $parameters
+     * @return mixed
+     */
+    protected static function invokePrivate($object, $methodName, array $parameters = []) {
+        if (is_string($object)) {
+            $className = $object;
+        } else {
+            $className = get_class($object);
+        }
+        $reflection = new \ReflectionClass($className);
+
+        if ($reflection->hasMethod($methodName)) {
+            $method = $reflection->getMethod($methodName);
+
+            $method->setAccessible(true);
+
+            return $method->invokeArgs($object, $parameters);
+        } elseif ($reflection->hasProperty($methodName)) {
+            $property = $reflection->getProperty($methodName);
+
+            $property->setAccessible(true);
+
+            if (!empty($parameters)) {
+                if ($property->isStatic()) {
+                    $property->setValue(null, array_pop($parameters));
+                } else {
+                    $property->setValue($object, array_pop($parameters));
+                }
+            }
+
+            if (is_object($object)) {
+                return $property->getValue($object);
+            }
+
+            return $property->getValue();
+        } elseif ($reflection->hasConstant($methodName)) {
+            return $reflection->getConstant($methodName);
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a unique identifier as uniqid() is not reliable sometimes
+     *
+     * @param string $prefix
+     * @param int $length
+     * @return string
+     */
+    protected static function getUniqueID($prefix = '', $length = 13) {
+        return $prefix . \OC::$server->get(ISecureRandom::class)->generate(
+            $length,
+            // Do not use dots and slashes as we use the value for file names
+            ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
+        );
+    }
+
+    /**
+     * Filter methods
+     *
+     * Returns all methods of the given class,
+     * that are public or abstract and not in the ignoreMethods list,
+     * to be able to fill onlyMethods() with an inverted list.
+     *
+     * @param string $className
+     * @param string[] $filterMethods
+     * @return string[]
+     */
+    public function filterClassMethods(string $className, array $filterMethods): array {
+        $class = new \ReflectionClass($className);
+
+        $methods = [];
+        foreach ($class->getMethods() as $method) {
+            if (($method->isPublic() || $method->isAbstract()) && !in_array($method->getName(), $filterMethods, true)) {
+                $methods[] = $method->getName();
+            }
+        }
+
+        return $methods;
+    }
+
+    public static function tearDownAfterClass(): void {
+        if (!self::$wasDatabaseAllowed && self::$realDatabase !== null) {
+            // in case an error is thrown in a test, PHPUnit jumps straight to tearDownAfterClass,
+            // so we need the database again
+            \OC::$server->registerService(IDBConnection::class, function () {
+                return self::$realDatabase;
+            });
+        }
+        $dataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data-autotest');
+        if (self::$wasDatabaseAllowed && \OC::$server->getDatabaseConnection()) {
+            $db = \OC::$server->getDatabaseConnection();
+            if ($db->inTransaction()) {
+                $db->rollBack();
+                throw new \Exception('There was a transaction still in progress and needed to be rolled back. Please fix this in your test.');
+            }
+            $queryBuilder = $db->getQueryBuilder();
+
+            self::tearDownAfterClassCleanShares($queryBuilder);
+            self::tearDownAfterClassCleanStorages($queryBuilder);
+            self::tearDownAfterClassCleanFileCache($queryBuilder);
+        }
+        self::tearDownAfterClassCleanStrayDataFiles($dataDir);
+        self::tearDownAfterClassCleanStrayHooks();
+        self::tearDownAfterClassCleanStrayLocks();
+
+        /** @var SetupManager $setupManager */
+        $setupManager = \OC::$server->get(SetupManager::class);
+        $setupManager->tearDown();
+
+        /** @var MountProviderCollection $mountProviderCollection */
+        $mountProviderCollection = \OC::$server->get(MountProviderCollection::class);
+        $mountProviderCollection->clearProviders();
+
+        /** @var IConfig $config */
+        $config = \OC::$server->get(IConfig::class);
+        $mountProviderCollection->registerProvider(new CacheMountProvider($config));
+        $mountProviderCollection->registerHomeProvider(new LocalHomeMountProvider());
+        $objectStoreConfig = \OC::$server->get(PrimaryObjectStoreConfig::class);
+        $mountProviderCollection->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+
+        $setupManager->setupRoot();
+
+        parent::tearDownAfterClass();
+    }
+
+    /**
+     * Remove all entries from the share table
+     *
+     * @param IQueryBuilder $queryBuilder
+     */
+    protected static function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) {
+        $queryBuilder->delete('share')
+            ->execute();
+    }
+
+    /**
+     * Remove all entries from the storages table
+     *
+     * @param IQueryBuilder $queryBuilder
+     */
+    protected static function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) {
+        $queryBuilder->delete('storages')
+            ->execute();
+    }
+
+    /**
+     * Remove all entries from the filecache table
+     *
+     * @param IQueryBuilder $queryBuilder
+     */
+    protected static function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) {
+        $queryBuilder->delete('filecache')
+            ->runAcrossAllShards()
+            ->execute();
+    }
+
+    /**
+     * Remove all unused files from the data dir
+     *
+     * @param string $dataDir
+     */
+    protected static function tearDownAfterClassCleanStrayDataFiles($dataDir) {
+        $knownEntries = [
+            'nextcloud.log' => true,
+            'audit.log' => true,
+            'owncloud.db' => true,
+            '.ocdata' => true,
+            '..' => true,
+            '.' => true,
+        ];
+
+        if ($dh = opendir($dataDir)) {
+            while (($file = readdir($dh)) !== false) {
+                if (!isset($knownEntries[$file])) {
+                    self::tearDownAfterClassCleanStrayDataUnlinkDir($dataDir . '/' . $file);
+                }
+            }
+            closedir($dh);
+        }
+    }
+
+    /**
+     * Recursive delete files and folders from a given directory
+     *
+     * @param string $dir
+     */
+    protected static function tearDownAfterClassCleanStrayDataUnlinkDir($dir) {
+        if ($dh = @opendir($dir)) {
+            while (($file = readdir($dh)) !== false) {
+                if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                    continue;
+                }
+                $path = $dir . '/' . $file;
+                if (is_dir($path)) {
+                    self::tearDownAfterClassCleanStrayDataUnlinkDir($path);
+                } else {
+                    @unlink($path);
+                }
+            }
+            closedir($dh);
+        }
+        @rmdir($dir);
+    }
+
+    /**
+     * Clean up the list of hooks
+     */
+    protected static function tearDownAfterClassCleanStrayHooks() {
+        \OC_Hook::clear();
+    }
+
+    /**
+     * Clean up the list of locks
+     */
+    protected static function tearDownAfterClassCleanStrayLocks() {
+        \OC::$server->get(ILockingProvider::class)->releaseAll();
+    }
+
+    /**
+     * Login and setup FS as a given user,
+     * sets the given user as the current user.
+     *
+     * @param string $user user id or empty for a generic FS
+     */
+    protected static function loginAsUser($user = '') {
+        self::logout();
+        \OC\Files\Filesystem::tearDown();
+        \OC_User::setUserId($user);
+        $userObject = \OC::$server->getUserManager()->get($user);
+        if (!is_null($userObject)) {
+            $userObject->updateLastLoginTimestamp();
+        }
+        \OC_Util::setupFS($user);
+        if (\OC::$server->getUserManager()->userExists($user)) {
+            \OC::$server->getUserFolder($user);
+        }
+    }
+
+    /**
+     * Logout the current user and tear down the filesystem.
+     */
+    protected static function logout() {
+        \OC_Util::tearDownFS();
+        \OC_User::setUserId('');
+        // needed for fully logout
+        \OC::$server->getUserSession()->setUser(null);
+    }
+
+    /**
+     * Run all commands pushed to the bus
+     */
+    protected function runCommands() {
+        // get the user for which the fs is setup
+        $view = Filesystem::getView();
+        if ($view) {
+            [, $user] = explode('/', $view->getRoot());
+        } else {
+            $user = null;
+        }
+
+        \OC_Util::tearDownFS(); // command can't reply on the fs being setup
+        $this->commandBus->run();
+        \OC_Util::tearDownFS();
+
+        if ($user) {
+            \OC_Util::setupFS($user);
+        }
+    }
+
+    /**
+     * Check if the given path is locked with a given type
+     *
+     * @param \OC\Files\View $view view
+     * @param string $path path to check
+     * @param int $type lock type
+     * @param bool $onMountPoint true to check the mount point instead of the
+     *                           mounted storage
+     *
+     * @return boolean true if the file is locked with the
+     *                 given type, false otherwise
+     */
+    protected function isFileLocked($view, $path, $type, $onMountPoint = false) {
+        // Note: this seems convoluted but is necessary because
+        // the format of the lock key depends on the storage implementation
+        // (in our case mostly md5)
+
+        if ($type === \OCP\Lock\ILockingProvider::LOCK_SHARED) {
+            // to check if the file has a shared lock, try acquiring an exclusive lock
+            $checkType = \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE;
+        } else {
+            // a shared lock cannot be set if exclusive lock is in place
+            $checkType = \OCP\Lock\ILockingProvider::LOCK_SHARED;
+        }
+        try {
+            $view->lockFile($path, $checkType, $onMountPoint);
+            // no exception, which means the lock of $type is not set
+            // clean up
+            $view->unlockFile($path, $checkType, $onMountPoint);
+            return false;
+        } catch (\OCP\Lock\LockedException $e) {
+            // we could not acquire the counter-lock, which means
+            // the lock of $type was in place
+            return true;
+        }
+    }
+
+    protected function getGroupAnnotations(): array {
+        if (method_exists($this, 'getAnnotations')) {
+            $annotations = $this->getAnnotations();
+            return $annotations['class']['group'] ?? [];
+        }
+
+        $r = new \ReflectionClass($this);
+        $doc = $r->getDocComment();
+        preg_match_all('#@group\s+(.*?)\n#s', $doc, $annotations);
+        return $annotations[1] ?? [];
+    }
+
+    protected function IsDatabaseAccessAllowed() {
+        $annotations = $this->getGroupAnnotations();
+        if (isset($annotations)) {
+            if (in_array('DB', $annotations) || in_array('SLOWDB', $annotations)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $expectedHtml
+     * @param string $template
+     * @param array $vars
+     */
+    protected function assertTemplate($expectedHtml, $template, $vars = []) {
+        $requestToken = 12345;
+        /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject $l10n */
+        $theme = $this->getMockBuilder('\OCP\Defaults')
+            ->disableOriginalConstructor()->getMock();
+        $theme->expects($this->any())
+            ->method('getName')
+            ->willReturn('Nextcloud');
+        /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject $l10n */
+        $l10n = $this->getMockBuilder(IL10N::class)
+            ->disableOriginalConstructor()->getMock();
+        $l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+
+        $t = new Base($template, $requestToken, $l10n, $theme);
+        $buf = $t->fetchPage($vars);
+        $this->assertHtmlStringEqualsHtmlString($expectedHtml, $buf);
+    }
+
+    /**
+     * @param string $expectedHtml
+     * @param string $actualHtml
+     * @param string $message
+     */
+    protected function assertHtmlStringEqualsHtmlString($expectedHtml, $actualHtml, $message = '') {
+        $expected = new DOMDocument();
+        $expected->preserveWhiteSpace = false;
+        $expected->formatOutput = true;
+        $expected->loadHTML($expectedHtml);
+
+        $actual = new DOMDocument();
+        $actual->preserveWhiteSpace = false;
+        $actual->formatOutput = true;
+        $actual->loadHTML($actualHtml);
+        $this->removeWhitespaces($actual);
+
+        $expectedHtml1 = $expected->saveHTML();
+        $actualHtml1 = $actual->saveHTML();
+        self::assertEquals($expectedHtml1, $actualHtml1, $message);
+    }
+
+
+    private function removeWhitespaces(DOMNode $domNode) {
+        foreach ($domNode->childNodes as $node) {
+            if ($node->hasChildNodes()) {
+                $this->removeWhitespaces($node);
+            } else {
+                if ($node instanceof \DOMText && $node->isWhitespaceInElementContent()) {
+                    $domNode->removeChild($node);
+                }
+            }
+        }
+    }
 }