nextcloud / server

lib/private/Server.php

Indentation +1882 added lines, -1882 removed lines

@@ -254,1927 +254,1927 @@
  * 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);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
-			$manager->registerRootProvider(new RootMountProvider($config, $c->get(LoggerInterface::class)));
-			$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 new $factoryClass($this);
-		});
-
-		$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);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
+            $manager->registerRootProvider(new RootMountProvider($config, $c->get(LoggerInterface::class)));
+            $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 new $factoryClass($this);
+        });
+
+        $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(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->connectDispatcher();
-	}
+        $this->connectDispatcher();
+    }
 
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	/**
-	 * @return \OCP\Calendar\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCalendarManager() {
-		return $this->get(\OC\Calendar\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Calendar\Resource\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCalendarResourceBackendManager() {
-		return $this->get(\OC\Calendar\Resource\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Calendar\Room\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCalendarRoomBackendManager() {
-		return $this->get(\OC\Calendar\Room\Manager::class);
-	}
-
-	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);
-	}
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionKeyStorage() {
-		return $this->get(IStorage::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 preview manager which can create preview images for a given file
-	 *
-	 * @return IPreview
-	 * @deprecated 20.0.0
-	 */
-	public function getPreviewManager() {
-		return $this->get(IPreview::class);
-	}
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return ITagManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTagManager() {
-		return $this->get(ITagManager::class);
-	}
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemTagManager() {
-		return $this->get(ISystemTagManager::class);
-	}
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemTagObjectMapper() {
-		return $this->get(ISystemTagObjectMapper::class);
-	}
-
-	/**
-	 * Returns the avatar manager, used for avatar functionality
-	 *
-	 * @return IAvatarManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAvatarManager() {
-		return $this->get(IAvatarManager::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 \OC\Authentication\TwoFactorAuth\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getTwoFactorAuthManager() {
-		return $this->get(\OC\Authentication\TwoFactorAuth\Manager::class);
-	}
-
-	/**
-	 * @return \OC\NavigationManager
-	 * @deprecated 20.0.0
-	 */
-	public function getNavigationManager() {
-		return $this->get(INavigationManager::class);
-	}
-
-	/**
-	 * @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);
-	}
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return IAppConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getAppConfig() {
-		return $this->get(IAppConfig::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);
-	}
-
-	/**
-	 * @return AppFetcher
-	 * @deprecated 20.0.0
-	 */
-	public function getAppFetcher() {
-		return $this->get(AppFetcher::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 an \OC\RedisFactory instance
-	 *
-	 * @return \OC\RedisFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getGetRedisFactory() {
-		return $this->get('RedisFactory');
-	}
-
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * @return ILogFactory
-	 * @throws \OCP\AppFramework\QueryException
-	 * @deprecated 20.0.0
-	 */
-	public function getLogFactory() {
-		return $this->get(ILogFactory::class);
-	}
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return IRouter
-	 * @deprecated 20.0.0
-	 */
-	public function getRouter() {
-		return $this->get(IRouter::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);
-	}
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return ICredentialsManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCredentialsManager() {
-		return $this->get(ICredentialsManager::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return IClientService
-	 * @deprecated 20.0.0
-	 */
-	public function getHTTPClientService() {
-		return $this->get(IClientService::class);
-	}
-
-	/**
-	 * Get the active event logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return IEventLogger
-	 * @deprecated 20.0.0
-	 */
-	public function getEventLogger() {
-		return $this->get(IEventLogger::class);
-	}
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return IQueryLogger
-	 * @deprecated 20.0.0
-	 */
-	public function getQueryLogger() {
-		return $this->get(IQueryLogger::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;
-	}
-
-	/**
-	 * @return \OC\OCSClient
-	 * @deprecated 20.0.0
-	 */
-	public function getOcsClient() {
-		return $this->get('OcsClient');
-	}
-
-	/**
-	 * @return IDateTimeZone
-	 * @deprecated 20.0.0
-	 */
-	public function getDateTimeZone() {
-		return $this->get(IDateTimeZone::class);
-	}
-
-	/**
-	 * @return IDateTimeFormatter
-	 * @deprecated 20.0.0
-	 */
-	public function getDateTimeFormatter() {
-		return $this->get(IDateTimeFormatter::class);
-	}
-
-	/**
-	 * @return IMountProviderCollection
-	 * @deprecated 20.0.0
-	 */
-	public function getMountProviderCollection() {
-		return $this->get(IMountProviderCollection::class);
-	}
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return IniGetWrapper
-	 * @deprecated 20.0.0
-	 */
-	public function getIniWrapper() {
-		return $this->get(IniGetWrapper::class);
-	}
-
-	/**
-	 * @return \OCP\Command\IBus
-	 * @deprecated 20.0.0
-	 */
-	public function getCommandBus() {
-		return $this->get(IBus::class);
-	}
-
-	/**
-	 * Get the trusted domain helper
-	 *
-	 * @return TrustedDomainHelper
-	 * @deprecated 20.0.0
-	 */
-	public function getTrustedDomainHelper() {
-		return $this->get(TrustedDomainHelper::class);
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * @return IMountManager
-	 * @deprecated 20.0.0
-	 **/
-	public function getMountManager() {
-		return $this->get(IMountManager::class);
-	}
-
-	/**
-	 * @return IUserMountCache
-	 * @deprecated 20.0.0
-	 */
-	public function getUserMountCache() {
-		return $this->get(IUserMountCache::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 manager of all the capabilities
-	 *
-	 * @return CapabilitiesManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCapabilitiesManager() {
-		return $this->get(CapabilitiesManager::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 ICommentsManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCommentsManager() {
-		return $this->get(ICommentsManager::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 \OC\Session\CryptoWrapper
-	 * @deprecated 20.0.0
-	 */
-	public function getSessionCryptoWrapper() {
-		return $this->get('CryptoWrapper');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return IThrottler
-	 * @deprecated 20.0.0
-	 */
-	public function getBruteForceThrottler() {
-		return $this->get(Throttler::class);
-	}
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyManager() {
-		return $this->get(ContentSecurityPolicyManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 * @deprecated 20.0.0
-	 */
-	public function getStoragesBackendService() {
-		return $this->get(BackendService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
-	 * @deprecated 20.0.0
-	 */
-	public function getGlobalStoragesService() {
-		return $this->get(GlobalStoragesService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
-	 * @deprecated 20.0.0
-	 */
-	public function getUserGlobalStoragesService() {
-		return $this->get(UserGlobalStoragesService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserStoragesService
-	 * @deprecated 20.0.0
-	 */
-	public function getUserStoragesService() {
-		return $this->get(UserStoragesService::class);
-	}
-
-	/**
-	 * @return \OCP\Share\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getShareManager() {
-		return $this->get(\OCP\Share\IManager::class);
-	}
-
-	/**
-	 * @return \OCP\Collaboration\Collaborators\ISearch
-	 * @deprecated 20.0.0
-	 */
-	public function getCollaboratorSearch() {
-		return $this->get(\OCP\Collaboration\Collaborators\ISearch::class);
-	}
-
-	/**
-	 * @return \OCP\Collaboration\AutoComplete\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAutoCompleteManager() {
-		return $this->get(IManager::class);
-	}
-
-	/**
-	 * Returns the LDAP Provider
-	 *
-	 * @return \OCP\LDAP\ILDAPProvider
-	 * @deprecated 20.0.0
-	 */
-	public function getLDAPProvider() {
-		return $this->get('LDAPProvider');
-	}
-
-	/**
-	 * @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\Lockdown\ILockdownManager
-	 * @deprecated 20.0.0
-	 */
-	public function getLockdownManager() {
-		return $this->get('LockdownManager');
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
-
-	/**
-	 * @return \OCP\GlobalScale\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getGlobalScaleConfig() {
-		return $this->get(IConfig::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationProviderManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudFederationProviderManager() {
-		return $this->get(ICloudFederationProviderManager::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\Api\IApiFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getRemoteApiFactory() {
-		return $this->get(IApiFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudFederationFactory() {
-		return $this->get(ICloudFederationFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\IInstanceFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getRemoteInstanceFactory() {
-		return $this->get(IInstanceFactory::class);
-	}
-
-	/**
-	 * @return IStorageFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getStorageFactory() {
-		return $this->get(IStorageFactory::class);
-	}
-
-	/**
-	 * Get the Preview GeneratorHelper
-	 *
-	 * @return GeneratorHelper
-	 * @since 17.0.0
-	 * @deprecated 20.0.0
-	 */
-	public function getGeneratorHelper() {
-		return $this->get(\OC\Preview\GeneratorHelper::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);
-	}
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    /**
+     * @return \OCP\Calendar\IManager
+     * @deprecated 20.0.0
+     */
+    public function getCalendarManager() {
+        return $this->get(\OC\Calendar\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Calendar\Resource\IManager
+     * @deprecated 20.0.0
+     */
+    public function getCalendarResourceBackendManager() {
+        return $this->get(\OC\Calendar\Resource\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Calendar\Room\IManager
+     * @deprecated 20.0.0
+     */
+    public function getCalendarRoomBackendManager() {
+        return $this->get(\OC\Calendar\Room\Manager::class);
+    }
+
+    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);
+    }
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionKeyStorage() {
+        return $this->get(IStorage::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 preview manager which can create preview images for a given file
+     *
+     * @return IPreview
+     * @deprecated 20.0.0
+     */
+    public function getPreviewManager() {
+        return $this->get(IPreview::class);
+    }
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return ITagManager
+     * @deprecated 20.0.0
+     */
+    public function getTagManager() {
+        return $this->get(ITagManager::class);
+    }
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return ISystemTagManager
+     *
+     * @since 9.0.0
+     * @deprecated 20.0.0
+     */
+    public function getSystemTagManager() {
+        return $this->get(ISystemTagManager::class);
+    }
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     * @deprecated 20.0.0
+     */
+    public function getSystemTagObjectMapper() {
+        return $this->get(ISystemTagObjectMapper::class);
+    }
+
+    /**
+     * Returns the avatar manager, used for avatar functionality
+     *
+     * @return IAvatarManager
+     * @deprecated 20.0.0
+     */
+    public function getAvatarManager() {
+        return $this->get(IAvatarManager::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 \OC\Authentication\TwoFactorAuth\Manager
+     * @deprecated 20.0.0
+     */
+    public function getTwoFactorAuthManager() {
+        return $this->get(\OC\Authentication\TwoFactorAuth\Manager::class);
+    }
+
+    /**
+     * @return \OC\NavigationManager
+     * @deprecated 20.0.0
+     */
+    public function getNavigationManager() {
+        return $this->get(INavigationManager::class);
+    }
+
+    /**
+     * @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);
+    }
+
+    /**
+     * Returns the app config manager
+     *
+     * @return IAppConfig
+     * @deprecated 20.0.0
+     */
+    public function getAppConfig() {
+        return $this->get(IAppConfig::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);
+    }
+
+    /**
+     * @return AppFetcher
+     * @deprecated 20.0.0
+     */
+    public function getAppFetcher() {
+        return $this->get(AppFetcher::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 an \OC\RedisFactory instance
+     *
+     * @return \OC\RedisFactory
+     * @deprecated 20.0.0
+     */
+    public function getGetRedisFactory() {
+        return $this->get('RedisFactory');
+    }
+
+
+    /**
+     * 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);
+    }
+
+    /**
+     * @return ILogFactory
+     * @throws \OCP\AppFramework\QueryException
+     * @deprecated 20.0.0
+     */
+    public function getLogFactory() {
+        return $this->get(ILogFactory::class);
+    }
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return IRouter
+     * @deprecated 20.0.0
+     */
+    public function getRouter() {
+        return $this->get(IRouter::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);
+    }
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return ICredentialsManager
+     * @deprecated 20.0.0
+     */
+    public function getCredentialsManager() {
+        return $this->get(ICredentialsManager::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return IClientService
+     * @deprecated 20.0.0
+     */
+    public function getHTTPClientService() {
+        return $this->get(IClientService::class);
+    }
+
+    /**
+     * Get the active event logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return IEventLogger
+     * @deprecated 20.0.0
+     */
+    public function getEventLogger() {
+        return $this->get(IEventLogger::class);
+    }
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return IQueryLogger
+     * @deprecated 20.0.0
+     */
+    public function getQueryLogger() {
+        return $this->get(IQueryLogger::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;
+    }
+
+    /**
+     * @return \OC\OCSClient
+     * @deprecated 20.0.0
+     */
+    public function getOcsClient() {
+        return $this->get('OcsClient');
+    }
+
+    /**
+     * @return IDateTimeZone
+     * @deprecated 20.0.0
+     */
+    public function getDateTimeZone() {
+        return $this->get(IDateTimeZone::class);
+    }
+
+    /**
+     * @return IDateTimeFormatter
+     * @deprecated 20.0.0
+     */
+    public function getDateTimeFormatter() {
+        return $this->get(IDateTimeFormatter::class);
+    }
+
+    /**
+     * @return IMountProviderCollection
+     * @deprecated 20.0.0
+     */
+    public function getMountProviderCollection() {
+        return $this->get(IMountProviderCollection::class);
+    }
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return IniGetWrapper
+     * @deprecated 20.0.0
+     */
+    public function getIniWrapper() {
+        return $this->get(IniGetWrapper::class);
+    }
+
+    /**
+     * @return \OCP\Command\IBus
+     * @deprecated 20.0.0
+     */
+    public function getCommandBus() {
+        return $this->get(IBus::class);
+    }
+
+    /**
+     * Get the trusted domain helper
+     *
+     * @return TrustedDomainHelper
+     * @deprecated 20.0.0
+     */
+    public function getTrustedDomainHelper() {
+        return $this->get(TrustedDomainHelper::class);
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * @return IMountManager
+     * @deprecated 20.0.0
+     **/
+    public function getMountManager() {
+        return $this->get(IMountManager::class);
+    }
+
+    /**
+     * @return IUserMountCache
+     * @deprecated 20.0.0
+     */
+    public function getUserMountCache() {
+        return $this->get(IUserMountCache::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 manager of all the capabilities
+     *
+     * @return CapabilitiesManager
+     * @deprecated 20.0.0
+     */
+    public function getCapabilitiesManager() {
+        return $this->get(CapabilitiesManager::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 ICommentsManager
+     * @deprecated 20.0.0
+     */
+    public function getCommentsManager() {
+        return $this->get(ICommentsManager::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 \OC\Session\CryptoWrapper
+     * @deprecated 20.0.0
+     */
+    public function getSessionCryptoWrapper() {
+        return $this->get('CryptoWrapper');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return IThrottler
+     * @deprecated 20.0.0
+     */
+    public function getBruteForceThrottler() {
+        return $this->get(Throttler::class);
+    }
+
+    /**
+     * @return IContentSecurityPolicyManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyManager() {
+        return $this->get(ContentSecurityPolicyManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     * @deprecated 20.0.0
+     */
+    public function getStoragesBackendService() {
+        return $this->get(BackendService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\GlobalStoragesService
+     * @deprecated 20.0.0
+     */
+    public function getGlobalStoragesService() {
+        return $this->get(GlobalStoragesService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
+     * @deprecated 20.0.0
+     */
+    public function getUserGlobalStoragesService() {
+        return $this->get(UserGlobalStoragesService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserStoragesService
+     * @deprecated 20.0.0
+     */
+    public function getUserStoragesService() {
+        return $this->get(UserStoragesService::class);
+    }
+
+    /**
+     * @return \OCP\Share\IManager
+     * @deprecated 20.0.0
+     */
+    public function getShareManager() {
+        return $this->get(\OCP\Share\IManager::class);
+    }
+
+    /**
+     * @return \OCP\Collaboration\Collaborators\ISearch
+     * @deprecated 20.0.0
+     */
+    public function getCollaboratorSearch() {
+        return $this->get(\OCP\Collaboration\Collaborators\ISearch::class);
+    }
+
+    /**
+     * @return \OCP\Collaboration\AutoComplete\IManager
+     * @deprecated 20.0.0
+     */
+    public function getAutoCompleteManager() {
+        return $this->get(IManager::class);
+    }
+
+    /**
+     * Returns the LDAP Provider
+     *
+     * @return \OCP\LDAP\ILDAPProvider
+     * @deprecated 20.0.0
+     */
+    public function getLDAPProvider() {
+        return $this->get('LDAPProvider');
+    }
+
+    /**
+     * @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\Lockdown\ILockdownManager
+     * @deprecated 20.0.0
+     */
+    public function getLockdownManager() {
+        return $this->get('LockdownManager');
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
+
+    /**
+     * @return \OCP\GlobalScale\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getGlobalScaleConfig() {
+        return $this->get(IConfig::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationProviderManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudFederationProviderManager() {
+        return $this->get(ICloudFederationProviderManager::class);
+    }
+
+    /**
+     * @return \OCP\Remote\Api\IApiFactory
+     * @deprecated 20.0.0
+     */
+    public function getRemoteApiFactory() {
+        return $this->get(IApiFactory::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationFactory
+     * @deprecated 20.0.0
+     */
+    public function getCloudFederationFactory() {
+        return $this->get(ICloudFederationFactory::class);
+    }
+
+    /**
+     * @return \OCP\Remote\IInstanceFactory
+     * @deprecated 20.0.0
+     */
+    public function getRemoteInstanceFactory() {
+        return $this->get(IInstanceFactory::class);
+    }
+
+    /**
+     * @return IStorageFactory
+     * @deprecated 20.0.0
+     */
+    public function getStorageFactory() {
+        return $this->get(IStorageFactory::class);
+    }
+
+    /**
+     * Get the Preview GeneratorHelper
+     *
+     * @return GeneratorHelper
+     * @since 17.0.0
+     * @deprecated 20.0.0
+     */
+    public function getGeneratorHelper() {
+        return $this->get(\OC\Preview\GeneratorHelper::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/Preview/Watcher.php

Indentation +38 added lines, -38 removed lines

@@ -22,42 +22,42 @@
  * Class that will watch filesystem activity and remove previews as needed.
  */
 class Watcher {
-	/** @var IAppData */
-	private $appData;
-
-	/**
-	 * Watcher constructor.
-	 *
-	 * @param IAppData $appData
-	 */
-	public function __construct(IAppData $appData) {
-		$this->appData = $appData;
-	}
-
-	public function postWrite(Node $node) {
-		$this->deleteNode($node);
-	}
-
-	protected function deleteNode(FileInfo $node) {
-		// We only handle files
-		if ($node instanceof Folder) {
-			return;
-		}
-
-		try {
-			if (is_null($node->getId())) {
-				return;
-			}
-			$folder = $this->appData->getFolder((string)$node->getId());
-			$folder->delete();
-		} catch (NotFoundException $e) {
-			//Nothing to do
-		}
-	}
-
-	public function versionRollback(array $data) {
-		if (isset($data['node'])) {
-			$this->deleteNode($data['node']);
-		}
-	}
+    /** @var IAppData */
+    private $appData;
+
+    /**
+     * Watcher constructor.
+     *
+     * @param IAppData $appData
+     */
+    public function __construct(IAppData $appData) {
+        $this->appData = $appData;
+    }
+
+    public function postWrite(Node $node) {
+        $this->deleteNode($node);
+    }
+
+    protected function deleteNode(FileInfo $node) {
+        // We only handle files
+        if ($node instanceof Folder) {
+            return;
+        }
+
+        try {
+            if (is_null($node->getId())) {
+                return;
+            }
+            $folder = $this->appData->getFolder((string)$node->getId());
+            $folder->delete();
+        } catch (NotFoundException $e) {
+            //Nothing to do
+        }
+    }
+
+    public function versionRollback(array $data) {
+        if (isset($data['node'])) {
+            $this->deleteNode($data['node']);
+        }
+    }
 }

lib/private/Preview/WatcherConnector.php

Indentation +20 added lines, -20 removed lines

@@ -15,27 +15,27 @@
 use OCP\Files\Node;
 
 class WatcherConnector {
-	public function __construct(
-		private IRootFolder $root,
-		private SystemConfig $config,
-		private IEventDispatcher $dispatcher,
-	) {
-	}
+    public function __construct(
+        private IRootFolder $root,
+        private SystemConfig $config,
+        private IEventDispatcher $dispatcher,
+    ) {
+    }
 
-	private function getWatcher(): Watcher {
-		return \OCP\Server::get(Watcher::class);
-	}
+    private function getWatcher(): Watcher {
+        return \OCP\Server::get(Watcher::class);
+    }
 
-	public function connectWatcher(): void {
-		// Do not connect if we are not setup yet!
-		if ($this->config->getValue('instanceid', null) !== null) {
-			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
-				$this->getWatcher()->postWrite($node);
-			});
+    public function connectWatcher(): void {
+        // Do not connect if we are not setup yet!
+        if ($this->config->getValue('instanceid', null) !== null) {
+            $this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
+                $this->getWatcher()->postWrite($node);
+            });
 
-			$this->dispatcher->addListener(VersionRestoredEvent::class, function (VersionRestoredEvent $event) {
-				$this->getWatcher()->versionRollback(['node' => $event->getVersion()->getSourceFile()]);
-			});
-		}
-	}
+            $this->dispatcher->addListener(VersionRestoredEvent::class, function (VersionRestoredEvent $event) {
+                $this->getWatcher()->versionRollback(['node' => $event->getVersion()->getSourceFile()]);
+            });
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
 	public function connectWatcher(): void {
 		// Do not connect if we are not setup yet!
 		if ($this->config->getValue('instanceid', null) !== null) {
-			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
+			$this->root->listen('\OC\Files', 'postWrite', function(Node $node) {
 				$this->getWatcher()->postWrite($node);
 			});
 
-			$this->dispatcher->addListener(VersionRestoredEvent::class, function (VersionRestoredEvent $event) {
+			$this->dispatcher->addListener(VersionRestoredEvent::class, function(VersionRestoredEvent $event) {
 				$this->getWatcher()->versionRollback(['node' => $event->getVersion()->getSourceFile()]);
 			});
 		}

apps/files_versions/tests/VersioningTest.php

Indentation +871 added lines, -871 removed lines

@@ -36,960 +36,960 @@
  * @group DB
  */
 class VersioningTest extends \Test\TestCase {
-	public const TEST_VERSIONS_USER = 'test-versions-user';
-	public const TEST_VERSIONS_USER2 = 'test-versions-user2';
-	public const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
-
-	/**
-	 * @var View
-	 */
-	private $rootView;
-	/**
-	 * @var VersionsMapper
-	 */
-	private $versionsMapper;
-	/**
-	 * @var IMimeTypeLoader
-	 */
-	private $mimeTypeLoader;
-	private $user1;
-	private $user2;
-
-	public static function setUpBeforeClass(): void {
-		parent::setUpBeforeClass();
-
-		$application = new Application();
-
-		// create test user
-		self::loginHelper(self::TEST_VERSIONS_USER2, true);
-		self::loginHelper(self::TEST_VERSIONS_USER, true);
-	}
-
-	public static function tearDownAfterClass(): void {
-		// cleanup test user
-		$user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER);
-		if ($user !== null) {
-			$user->delete();
-		}
-		$user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER2);
-		if ($user !== null) {
-			$user->delete();
-		}
-
-		parent::tearDownAfterClass();
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$config = Server::get(IConfig::class);
-		$mockConfig = $this->createMock(IConfig::class);
-		$mockConfig->expects($this->any())
-			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
-				if ($key === 'filesystem_check_changes') {
-					return Watcher::CHECK_ONCE;
-				} else {
-					return $config->getSystemValue($key, $default);
-				}
-			});
-		$this->overwriteService(AllConfig::class, $mockConfig);
-
-		// clear hooks
-		\OC_Hook::clear();
-		\OC::registerShareHooks(Server::get(SystemConfig::class));
-		\OC::$server->boot();
-
-		self::loginHelper(self::TEST_VERSIONS_USER);
-		$this->rootView = new View();
-		if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
-			$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
-		}
-
-		$this->versionsMapper = Server::get(VersionsMapper::class);
-		$this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
-
-		$this->user1 = $this->createMock(IUser::class);
-		$this->user1->method('getUID')
-			->willReturn(self::TEST_VERSIONS_USER);
-		$this->user2 = $this->createMock(IUser::class);
-		$this->user2->method('getUID')
-			->willReturn(self::TEST_VERSIONS_USER2);
-	}
-
-	protected function tearDown(): void {
-		$this->restoreService(AllConfig::class);
-
-		if ($this->rootView) {
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
-		}
-
-		\OC_Hook::clear();
-
-		parent::tearDown();
-	}
-
-	/**
-	 * @medium
-	 * test expire logic
-	 * @dataProvider versionsProvider
-	 */
-	public function testGetExpireList($versions, $sizeOfAllDeletedFiles): void {
-
-		// last interval end at 2592000
-		$startTime = 5000000;
-
-		$testClass = new VersionStorageToTest();
-		[$deleted, $size] = $testClass->callProtectedGetExpireList($startTime, $versions);
-
-		// we should have deleted 16 files each of the size 1
-		$this->assertEquals($sizeOfAllDeletedFiles, $size);
-
-		// the deleted array should only contain versions which should be deleted
-		foreach ($deleted as $key => $path) {
-			unset($versions[$key]);
-			$this->assertEquals('delete', substr($path, 0, strlen('delete')));
-		}
-
-		// the versions array should only contain versions which should be kept
-		foreach ($versions as $version) {
-			$this->assertEquals('keep', $version['path']);
-		}
-	}
-
-	public function versionsProvider() {
-		return [
-			// first set of versions uniformly distributed versions
-			[
-				[
-					// first slice (10sec) keep one version every 2 seconds
-					['version' => 4999999, 'path' => 'keep', 'size' => 1],
-					['version' => 4999998, 'path' => 'delete', 'size' => 1],
-					['version' => 4999997, 'path' => 'keep', 'size' => 1],
-					['version' => 4999995, 'path' => 'keep', 'size' => 1],
-					['version' => 4999994, 'path' => 'delete', 'size' => 1],
-					//next slice (60sec) starts at 4999990 keep one version every 10 secons
-					['version' => 4999988, 'path' => 'keep', 'size' => 1],
-					['version' => 4999978, 'path' => 'keep', 'size' => 1],
-					['version' => 4999975, 'path' => 'delete', 'size' => 1],
-					['version' => 4999972, 'path' => 'delete', 'size' => 1],
-					['version' => 4999967, 'path' => 'keep', 'size' => 1],
-					['version' => 4999958, 'path' => 'delete', 'size' => 1],
-					['version' => 4999957, 'path' => 'keep', 'size' => 1],
-					//next slice (3600sec) start at 4999940 keep one version every 60 seconds
-					['version' => 4999900, 'path' => 'keep', 'size' => 1],
-					['version' => 4999841, 'path' => 'delete', 'size' => 1],
-					['version' => 4999840, 'path' => 'keep', 'size' => 1],
-					['version' => 4999780, 'path' => 'keep', 'size' => 1],
-					['version' => 4996401, 'path' => 'keep', 'size' => 1],
-					// next slice (86400sec) start at 4996400 keep one version every 3600 seconds
-					['version' => 4996350, 'path' => 'delete', 'size' => 1],
-					['version' => 4992800, 'path' => 'keep', 'size' => 1],
-					['version' => 4989800, 'path' => 'delete', 'size' => 1],
-					['version' => 4989700, 'path' => 'delete', 'size' => 1],
-					['version' => 4989200, 'path' => 'keep', 'size' => 1],
-					// next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
-					['version' => 4913600, 'path' => 'keep', 'size' => 1],
-					['version' => 4852800, 'path' => 'delete', 'size' => 1],
-					['version' => 4827201, 'path' => 'delete', 'size' => 1],
-					['version' => 4827200, 'path' => 'keep', 'size' => 1],
-					['version' => 4777201, 'path' => 'delete', 'size' => 1],
-					['version' => 4777501, 'path' => 'delete', 'size' => 1],
-					['version' => 4740000, 'path' => 'keep', 'size' => 1],
-					// final slice starts at 2408000 keep one version every 604800 secons
-					['version' => 2408000, 'path' => 'keep', 'size' => 1],
-					['version' => 1803201, 'path' => 'delete', 'size' => 1],
-					['version' => 1803200, 'path' => 'keep', 'size' => 1],
-					['version' => 1800199, 'path' => 'delete', 'size' => 1],
-					['version' => 1800100, 'path' => 'delete', 'size' => 1],
-					['version' => 1198300, 'path' => 'keep', 'size' => 1],
-				],
-				16 // size of all deleted files (every file has the size 1)
-			],
-			// second set of versions, here we have only really old versions
-			[
-				[
-					// first slice (10sec) keep one version every 2 seconds
-					// next slice (60sec) starts at 4999990 keep one version every 10 secons
-					// next slice (3600sec) start at 4999940 keep one version every 60 seconds
-					// next slice (86400sec) start at 4996400 keep one version every 3600 seconds
-					['version' => 4996400, 'path' => 'keep', 'size' => 1],
-					['version' => 4996350, 'path' => 'delete', 'size' => 1],
-					['version' => 4996350, 'path' => 'delete', 'size' => 1],
-					['version' => 4992800, 'path' => 'keep', 'size' => 1],
-					['version' => 4989800, 'path' => 'delete', 'size' => 1],
-					['version' => 4989700, 'path' => 'delete', 'size' => 1],
-					['version' => 4989200, 'path' => 'keep', 'size' => 1],
-					// next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
-					['version' => 4913600, 'path' => 'keep', 'size' => 1],
-					['version' => 4852800, 'path' => 'delete', 'size' => 1],
-					['version' => 4827201, 'path' => 'delete', 'size' => 1],
-					['version' => 4827200, 'path' => 'keep', 'size' => 1],
-					['version' => 4777201, 'path' => 'delete', 'size' => 1],
-					['version' => 4777501, 'path' => 'delete', 'size' => 1],
-					['version' => 4740000, 'path' => 'keep', 'size' => 1],
-					// final slice starts at 2408000 keep one version every 604800 secons
-					['version' => 2408000, 'path' => 'keep', 'size' => 1],
-					['version' => 1803201, 'path' => 'delete', 'size' => 1],
-					['version' => 1803200, 'path' => 'keep', 'size' => 1],
-					['version' => 1800199, 'path' => 'delete', 'size' => 1],
-					['version' => 1800100, 'path' => 'delete', 'size' => 1],
-					['version' => 1198300, 'path' => 'keep', 'size' => 1],
-				],
-				11 // size of all deleted files (every file has the size 1)
-			],
-			// third set of versions, with some gaps between
-			[
-				[
-					// first slice (10sec) keep one version every 2 seconds
-					['version' => 4999999, 'path' => 'keep', 'size' => 1],
-					['version' => 4999998, 'path' => 'delete', 'size' => 1],
-					['version' => 4999997, 'path' => 'keep', 'size' => 1],
-					['version' => 4999995, 'path' => 'keep', 'size' => 1],
-					['version' => 4999994, 'path' => 'delete', 'size' => 1],
-					//next slice (60sec) starts at 4999990 keep one version every 10 secons
-					['version' => 4999988, 'path' => 'keep', 'size' => 1],
-					['version' => 4999978, 'path' => 'keep', 'size' => 1],
-					//next slice (3600sec) start at 4999940 keep one version every 60 seconds
-					// next slice (86400sec) start at 4996400 keep one version every 3600 seconds
-					['version' => 4989200, 'path' => 'keep', 'size' => 1],
-					// next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
-					['version' => 4913600, 'path' => 'keep', 'size' => 1],
-					['version' => 4852800, 'path' => 'delete', 'size' => 1],
-					['version' => 4827201, 'path' => 'delete', 'size' => 1],
-					['version' => 4827200, 'path' => 'keep', 'size' => 1],
-					['version' => 4777201, 'path' => 'delete', 'size' => 1],
-					['version' => 4777501, 'path' => 'delete', 'size' => 1],
-					['version' => 4740000, 'path' => 'keep', 'size' => 1],
-					// final slice starts at 2408000 keep one version every 604800 secons
-					['version' => 2408000, 'path' => 'keep', 'size' => 1],
-					['version' => 1803201, 'path' => 'delete', 'size' => 1],
-					['version' => 1803200, 'path' => 'keep', 'size' => 1],
-					['version' => 1800199, 'path' => 'delete', 'size' => 1],
-					['version' => 1800100, 'path' => 'delete', 'size' => 1],
-					['version' => 1198300, 'path' => 'keep', 'size' => 1],
-				],
-				9 // size of all deleted files (every file has the size 1)
-			],
-			// fourth set of versions: empty (see issue #19066)
-			[
-				[],
-				0
-			]
-
-		];
-	}
-
-	public function testRename(): void {
-		Filesystem::file_put_contents('test.txt', 'test file');
-
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
-
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
-
-		// execute rename hook of versions app
-		Filesystem::rename('test.txt', 'test2.txt');
-
-		$this->runCommands();
-
-		$this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
-		$this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
-
-		$this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
-		$this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
-	}
-
-	public function testRenameInSharedFolder(): void {
-		Filesystem::mkdir('folder1');
-		Filesystem::mkdir('folder1/folder2');
-		Filesystem::file_put_contents('folder1/test.txt', 'test file');
-
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
-
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
-
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-
-		$this->assertTrue(Filesystem::file_exists('folder1/test.txt'));
-
-		// execute rename hook of versions app
-		Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
-
-		$this->runCommands();
-
-		self::loginHelper(self::TEST_VERSIONS_USER);
-
-		$this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
-		$this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
-
-		$this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
-		$this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
-
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
-
-	public function testMoveFolder(): void {
-		Filesystem::mkdir('folder1');
-		Filesystem::mkdir('folder2');
-		Filesystem::file_put_contents('folder1/test.txt', 'test file');
-
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		// create some versions
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
+    public const TEST_VERSIONS_USER = 'test-versions-user';
+    public const TEST_VERSIONS_USER2 = 'test-versions-user2';
+    public const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
+
+    /**
+     * @var View
+     */
+    private $rootView;
+    /**
+     * @var VersionsMapper
+     */
+    private $versionsMapper;
+    /**
+     * @var IMimeTypeLoader
+     */
+    private $mimeTypeLoader;
+    private $user1;
+    private $user2;
+
+    public static function setUpBeforeClass(): void {
+        parent::setUpBeforeClass();
+
+        $application = new Application();
+
+        // create test user
+        self::loginHelper(self::TEST_VERSIONS_USER2, true);
+        self::loginHelper(self::TEST_VERSIONS_USER, true);
+    }
+
+    public static function tearDownAfterClass(): void {
+        // cleanup test user
+        $user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER);
+        if ($user !== null) {
+            $user->delete();
+        }
+        $user = Server::get(IUserManager::class)->get(self::TEST_VERSIONS_USER2);
+        if ($user !== null) {
+            $user->delete();
+        }
+
+        parent::tearDownAfterClass();
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $config = Server::get(IConfig::class);
+        $mockConfig = $this->createMock(IConfig::class);
+        $mockConfig->expects($this->any())
+            ->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) use ($config) {
+                if ($key === 'filesystem_check_changes') {
+                    return Watcher::CHECK_ONCE;
+                } else {
+                    return $config->getSystemValue($key, $default);
+                }
+            });
+        $this->overwriteService(AllConfig::class, $mockConfig);
+
+        // clear hooks
+        \OC_Hook::clear();
+        \OC::registerShareHooks(Server::get(SystemConfig::class));
+        \OC::$server->boot();
+
+        self::loginHelper(self::TEST_VERSIONS_USER);
+        $this->rootView = new View();
+        if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
+            $this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
+        }
+
+        $this->versionsMapper = Server::get(VersionsMapper::class);
+        $this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
+
+        $this->user1 = $this->createMock(IUser::class);
+        $this->user1->method('getUID')
+            ->willReturn(self::TEST_VERSIONS_USER);
+        $this->user2 = $this->createMock(IUser::class);
+        $this->user2->method('getUID')
+            ->willReturn(self::TEST_VERSIONS_USER2);
+    }
+
+    protected function tearDown(): void {
+        $this->restoreService(AllConfig::class);
+
+        if ($this->rootView) {
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
+            $this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
+        }
+
+        \OC_Hook::clear();
+
+        parent::tearDown();
+    }
+
+    /**
+     * @medium
+     * test expire logic
+     * @dataProvider versionsProvider
+     */
+    public function testGetExpireList($versions, $sizeOfAllDeletedFiles): void {
+
+        // last interval end at 2592000
+        $startTime = 5000000;
+
+        $testClass = new VersionStorageToTest();
+        [$deleted, $size] = $testClass->callProtectedGetExpireList($startTime, $versions);
+
+        // we should have deleted 16 files each of the size 1
+        $this->assertEquals($sizeOfAllDeletedFiles, $size);
+
+        // the deleted array should only contain versions which should be deleted
+        foreach ($deleted as $key => $path) {
+            unset($versions[$key]);
+            $this->assertEquals('delete', substr($path, 0, strlen('delete')));
+        }
+
+        // the versions array should only contain versions which should be kept
+        foreach ($versions as $version) {
+            $this->assertEquals('keep', $version['path']);
+        }
+    }
+
+    public function versionsProvider() {
+        return [
+            // first set of versions uniformly distributed versions
+            [
+                [
+                    // first slice (10sec) keep one version every 2 seconds
+                    ['version' => 4999999, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999998, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999997, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999995, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999994, 'path' => 'delete', 'size' => 1],
+                    //next slice (60sec) starts at 4999990 keep one version every 10 secons
+                    ['version' => 4999988, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999978, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999975, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999972, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999967, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999958, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999957, 'path' => 'keep', 'size' => 1],
+                    //next slice (3600sec) start at 4999940 keep one version every 60 seconds
+                    ['version' => 4999900, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999841, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999840, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999780, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4996401, 'path' => 'keep', 'size' => 1],
+                    // next slice (86400sec) start at 4996400 keep one version every 3600 seconds
+                    ['version' => 4996350, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4992800, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4989800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989700, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989200, 'path' => 'keep', 'size' => 1],
+                    // next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
+                    ['version' => 4913600, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4852800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4777201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4777501, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4740000, 'path' => 'keep', 'size' => 1],
+                    // final slice starts at 2408000 keep one version every 604800 secons
+                    ['version' => 2408000, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1803201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1803200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1800199, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1800100, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1198300, 'path' => 'keep', 'size' => 1],
+                ],
+                16 // size of all deleted files (every file has the size 1)
+            ],
+            // second set of versions, here we have only really old versions
+            [
+                [
+                    // first slice (10sec) keep one version every 2 seconds
+                    // next slice (60sec) starts at 4999990 keep one version every 10 secons
+                    // next slice (3600sec) start at 4999940 keep one version every 60 seconds
+                    // next slice (86400sec) start at 4996400 keep one version every 3600 seconds
+                    ['version' => 4996400, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4996350, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4996350, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4992800, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4989800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989700, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4989200, 'path' => 'keep', 'size' => 1],
+                    // next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
+                    ['version' => 4913600, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4852800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4777201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4777501, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4740000, 'path' => 'keep', 'size' => 1],
+                    // final slice starts at 2408000 keep one version every 604800 secons
+                    ['version' => 2408000, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1803201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1803200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1800199, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1800100, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1198300, 'path' => 'keep', 'size' => 1],
+                ],
+                11 // size of all deleted files (every file has the size 1)
+            ],
+            // third set of versions, with some gaps between
+            [
+                [
+                    // first slice (10sec) keep one version every 2 seconds
+                    ['version' => 4999999, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999998, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4999997, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999995, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999994, 'path' => 'delete', 'size' => 1],
+                    //next slice (60sec) starts at 4999990 keep one version every 10 secons
+                    ['version' => 4999988, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4999978, 'path' => 'keep', 'size' => 1],
+                    //next slice (3600sec) start at 4999940 keep one version every 60 seconds
+                    // next slice (86400sec) start at 4996400 keep one version every 3600 seconds
+                    ['version' => 4989200, 'path' => 'keep', 'size' => 1],
+                    // next slice (2592000sec) start at 4913600 keep one version every 86400 seconds
+                    ['version' => 4913600, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4852800, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4827200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 4777201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4777501, 'path' => 'delete', 'size' => 1],
+                    ['version' => 4740000, 'path' => 'keep', 'size' => 1],
+                    // final slice starts at 2408000 keep one version every 604800 secons
+                    ['version' => 2408000, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1803201, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1803200, 'path' => 'keep', 'size' => 1],
+                    ['version' => 1800199, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1800100, 'path' => 'delete', 'size' => 1],
+                    ['version' => 1198300, 'path' => 'keep', 'size' => 1],
+                ],
+                9 // size of all deleted files (every file has the size 1)
+            ],
+            // fourth set of versions: empty (see issue #19066)
+            [
+                [],
+                0
+            ]
+
+        ];
+    }
+
+    public function testRename(): void {
+        Filesystem::file_put_contents('test.txt', 'test file');
+
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
+
+        // execute rename hook of versions app
+        Filesystem::rename('test.txt', 'test2.txt');
+
+        $this->runCommands();
+
+        $this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
+        $this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
+
+        $this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
+        $this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
+    }
+
+    public function testRenameInSharedFolder(): void {
+        Filesystem::mkdir('folder1');
+        Filesystem::mkdir('folder1/folder2');
+        Filesystem::file_put_contents('folder1/test.txt', 'test file');
+
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
+
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
+
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+
+        $this->assertTrue(Filesystem::file_exists('folder1/test.txt'));
+
+        // execute rename hook of versions app
+        Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
+
+        $this->runCommands();
+
+        self::loginHelper(self::TEST_VERSIONS_USER);
+
+        $this->assertFalse($this->rootView->file_exists($v1), 'version 1 of old file does not exist');
+        $this->assertFalse($this->rootView->file_exists($v2), 'version 2 of old file does not exist');
+
+        $this->assertTrue($this->rootView->file_exists($v1Renamed), 'version 1 of renamed file exists');
+        $this->assertTrue($this->rootView->file_exists($v2Renamed), 'version 2 of renamed file exists');
+
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
+
+    public function testMoveFolder(): void {
+        Filesystem::mkdir('folder1');
+        Filesystem::mkdir('folder2');
+        Filesystem::file_put_contents('folder1/test.txt', 'test file');
+
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        // create some versions
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+        $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// execute rename hook of versions app
-		Filesystem::rename('folder1', 'folder2/folder1');
+        // execute rename hook of versions app
+        Filesystem::rename('folder1', 'folder2/folder1');
 
-		$this->runCommands();
+        $this->runCommands();
 
-		$this->assertFalse($this->rootView->file_exists($v1));
-		$this->assertFalse($this->rootView->file_exists($v2));
+        $this->assertFalse($this->rootView->file_exists($v1));
+        $this->assertFalse($this->rootView->file_exists($v2));
 
-		$this->assertTrue($this->rootView->file_exists($v1Renamed));
-		$this->assertTrue($this->rootView->file_exists($v2Renamed));
-	}
+        $this->assertTrue($this->rootView->file_exists($v1Renamed));
+        $this->assertTrue($this->rootView->file_exists($v2Renamed));
+    }
 
 
-	public function testMoveFileIntoSharedFolderAsRecipient(): void {
-		Filesystem::mkdir('folder1');
-		$fileInfo = Filesystem::getFileInfo('folder1');
+    public function testMoveFileIntoSharedFolderAsRecipient(): void {
+        Filesystem::mkdir('folder1');
+        $fileInfo = Filesystem::getFileInfo('folder1');
 
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
-		Filesystem::file_put_contents('test.txt', 'test file');
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+        $versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir($versionsFolder2);
-		// create some versions
-		$v1 = $versionsFolder2 . '/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/test.txt.v' . $t2;
+        $this->rootView->mkdir($versionsFolder2);
+        // create some versions
+        $v1 = $versionsFolder2 . '/test.txt.v' . $t1;
+        $v2 = $versionsFolder2 . '/test.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// move file into the shared folder as recipient
-		Filesystem::rename('/test.txt', '/folder1/test.txt');
+        // move file into the shared folder as recipient
+        Filesystem::rename('/test.txt', '/folder1/test.txt');
 
-		$this->assertFalse($this->rootView->file_exists($v1));
-		$this->assertFalse($this->rootView->file_exists($v2));
+        $this->assertFalse($this->rootView->file_exists($v1));
+        $this->assertFalse($this->rootView->file_exists($v2));
 
-		self::loginHelper(self::TEST_VERSIONS_USER);
+        self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+        $versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
+        $v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
+        $v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
 
-		$this->assertTrue($this->rootView->file_exists($v1Renamed));
-		$this->assertTrue($this->rootView->file_exists($v2Renamed));
+        $this->assertTrue($this->rootView->file_exists($v1Renamed));
+        $this->assertTrue($this->rootView->file_exists($v2Renamed));
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
 
-	public function testMoveFolderIntoSharedFolderAsRecipient(): void {
-		Filesystem::mkdir('folder1');
+    public function testMoveFolderIntoSharedFolderAsRecipient(): void {
+        Filesystem::mkdir('folder1');
 
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
-		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
-		Filesystem::mkdir('folder2');
-		Filesystem::file_put_contents('folder2/test.txt', 'test file');
+        self::loginHelper(self::TEST_VERSIONS_USER2);
+        $versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+        Filesystem::mkdir('folder2');
+        Filesystem::file_put_contents('folder2/test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir($versionsFolder2);
-		$this->rootView->mkdir($versionsFolder2 . '/folder2');
-		// create some versions
-		$v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
+        $this->rootView->mkdir($versionsFolder2);
+        $this->rootView->mkdir($versionsFolder2 . '/folder2');
+        // create some versions
+        $v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
+        $v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// move file into the shared folder as recipient
-		Filesystem::rename('/folder2', '/folder1/folder2');
+        // move file into the shared folder as recipient
+        Filesystem::rename('/folder2', '/folder1/folder2');
 
-		$this->assertFalse($this->rootView->file_exists($v1));
-		$this->assertFalse($this->rootView->file_exists($v2));
+        $this->assertFalse($this->rootView->file_exists($v1));
+        $this->assertFalse($this->rootView->file_exists($v2));
 
-		self::loginHelper(self::TEST_VERSIONS_USER);
+        self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+        $versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
+        $v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
+        $v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
 
-		$this->assertTrue($this->rootView->file_exists($v1Renamed));
-		$this->assertTrue($this->rootView->file_exists($v2Renamed));
+        $this->assertTrue($this->rootView->file_exists($v1Renamed));
+        $this->assertTrue($this->rootView->file_exists($v2Renamed));
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
 
-	public function testRenameSharedFile(): void {
-		Filesystem::file_put_contents('test.txt', 'test file');
+    public function testRenameSharedFile(): void {
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		// the renamed versions should not exist! Because we only moved the mount point!
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+        // the renamed versions should not exist! Because we only moved the mount point!
+        $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+        $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('test.txt');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE | Constants::PERMISSION_SHARE);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('test.txt');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE | Constants::PERMISSION_SHARE);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
-		self::loginHelper(self::TEST_VERSIONS_USER2);
+        self::loginHelper(self::TEST_VERSIONS_USER2);
 
-		$this->assertTrue(Filesystem::file_exists('test.txt'));
+        $this->assertTrue(Filesystem::file_exists('test.txt'));
 
-		// execute rename hook of versions app
-		Filesystem::rename('test.txt', 'test2.txt');
+        // execute rename hook of versions app
+        Filesystem::rename('test.txt', 'test2.txt');
 
-		self::loginHelper(self::TEST_VERSIONS_USER);
+        self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$this->runCommands();
+        $this->runCommands();
 
-		$this->assertTrue($this->rootView->file_exists($v1));
-		$this->assertTrue($this->rootView->file_exists($v2));
+        $this->assertTrue($this->rootView->file_exists($v1));
+        $this->assertTrue($this->rootView->file_exists($v2));
 
-		$this->assertFalse($this->rootView->file_exists($v1Renamed));
-		$this->assertFalse($this->rootView->file_exists($v2Renamed));
+        $this->assertFalse($this->rootView->file_exists($v1Renamed));
+        $this->assertFalse($this->rootView->file_exists($v2Renamed));
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
 
-	public function testCopy(): void {
-		Filesystem::file_put_contents('test.txt', 'test file');
+    public function testCopy(): void {
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+        $v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+        $v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// execute copy hook of versions app
-		Filesystem::copy('test.txt', 'test2.txt');
+        // execute copy hook of versions app
+        Filesystem::copy('test.txt', 'test2.txt');
 
-		$this->runCommands();
+        $this->runCommands();
 
-		$this->assertTrue($this->rootView->file_exists($v1), 'version 1 of original file exists');
-		$this->assertTrue($this->rootView->file_exists($v2), 'version 2 of original file exists');
+        $this->assertTrue($this->rootView->file_exists($v1), 'version 1 of original file exists');
+        $this->assertTrue($this->rootView->file_exists($v2), 'version 2 of original file exists');
 
-		$this->assertTrue($this->rootView->file_exists($v1Copied), 'version 1 of copied file exists');
-		$this->assertTrue($this->rootView->file_exists($v2Copied), 'version 2 of copied file exists');
-	}
+        $this->assertTrue($this->rootView->file_exists($v1Copied), 'version 1 of copied file exists');
+        $this->assertTrue($this->rootView->file_exists($v2Copied), 'version 2 of copied file exists');
+    }
 
-	/**
-	 * test if we find all versions and if the versions array contain
-	 * the correct 'path' and 'name'
-	 */
-	public function testGetVersions(): void {
-		$t1 = time();
-		// second version is two weeks older, this way we make sure that no
-		// version will be expired
-		$t2 = $t1 - 60 * 60 * 24 * 14;
+    /**
+     * test if we find all versions and if the versions array contain
+     * the correct 'path' and 'name'
+     */
+    public function testGetVersions(): void {
+        $t1 = time();
+        // second version is two weeks older, this way we make sure that no
+        // version will be expired
+        $t2 = $t1 - 60 * 60 * 24 * 14;
 
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
 
-		$this->rootView->file_put_contents($v1, 'version1');
-		$this->rootView->file_put_contents($v2, 'version2');
+        $this->rootView->file_put_contents($v1, 'version1');
+        $this->rootView->file_put_contents($v2, 'version2');
 
-		// execute copy hook of versions app
-		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
+        // execute copy hook of versions app
+        $versions = Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
 
-		$this->assertCount(2, $versions);
+        $this->assertCount(2, $versions);
 
-		foreach ($versions as $version) {
-			$this->assertSame('/subfolder/test.txt', $version['path']);
-			$this->assertSame('test.txt', $version['name']);
-		}
+        foreach ($versions as $version) {
+            $this->assertSame('/subfolder/test.txt', $version['path']);
+            $this->assertSame('test.txt', $version['name']);
+        }
 
-		//cleanup
-		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
-	}
+        //cleanup
+        $this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
+    }
 
-	/**
-	 * test if we find all versions and if the versions array contain
-	 * the correct 'path' and 'name'
-	 */
-	public function testGetVersionsEmptyFile(): void {
-		// execute copy hook of versions app
-		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, '');
-		$this->assertCount(0, $versions);
+    /**
+     * test if we find all versions and if the versions array contain
+     * the correct 'path' and 'name'
+     */
+    public function testGetVersionsEmptyFile(): void {
+        // execute copy hook of versions app
+        $versions = Storage::getVersions(self::TEST_VERSIONS_USER, '');
+        $this->assertCount(0, $versions);
 
-		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, null);
-		$this->assertCount(0, $versions);
-	}
+        $versions = Storage::getVersions(self::TEST_VERSIONS_USER, null);
+        $this->assertCount(0, $versions);
+    }
 
-	public function testExpireNonexistingFile(): void {
-		$this->logout();
-		// needed to have a FS setup (the background job does this)
-		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
+    public function testExpireNonexistingFile(): void {
+        $this->logout();
+        // needed to have a FS setup (the background job does this)
+        \OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$this->assertFalse(Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
-	}
+        $this->assertFalse(Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
+    }
 
 
-	public function testExpireNonexistingUser(): void {
-		$this->expectException(NoUserException::class);
+    public function testExpireNonexistingUser(): void {
+        $this->expectException(NoUserException::class);
 
-		$this->logout();
-		// needed to have a FS setup (the background job does this)
-		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
-		Filesystem::file_put_contents('test.txt', 'test file');
+        $this->logout();
+        // needed to have a FS setup (the background job does this)
+        \OC_Util::setupFS(self::TEST_VERSIONS_USER);
+        Filesystem::file_put_contents('test.txt', 'test file');
 
-		$this->assertFalse(Storage::expire('test.txt', 'unexist'));
-	}
+        $this->assertFalse(Storage::expire('test.txt', 'unexist'));
+    }
 
-	public function testRestoreSameStorage(): void {
-		Filesystem::mkdir('sub');
-		$this->doTestRestore();
-	}
+    public function testRestoreSameStorage(): void {
+        Filesystem::mkdir('sub');
+        $this->doTestRestore();
+    }
 
-	public function testRestoreCrossStorage(): void {
-		$storage2 = new Temporary([]);
-		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
+    public function testRestoreCrossStorage(): void {
+        $storage2 = new Temporary([]);
+        Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
 
-		$this->doTestRestore();
-	}
+        $this->doTestRestore();
+    }
 
-	public function testRestoreNoPermission(): void {
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
+    public function testRestoreNoPermission(): void {
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
 
-		$userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
-		$node = $userHome->newFolder('folder');
-		$file = $node->newFile('test.txt');
+        $userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
+        $node = $userHome->newFolder('folder');
+        $file = $node->newFile('test.txt');
 
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_READ);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		$versions = $this->createAndCheckVersions(
-			Filesystem::getView(),
-			'folder/test.txt'
-		);
-
-		$file->putContent('test file');
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER2);
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_READ);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        $versions = $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'folder/test.txt'
+        );
+
+        $file->putContent('test file');
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER2);
 
-		$firstVersion = current($versions);
+        $firstVersion = current($versions);
 
-		$this->assertFalse(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user2), 'Revert did not happen');
+        $this->assertFalse(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user2), 'Revert did not happen');
 
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
 
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-		$this->assertEquals('test file', $file->getContent(), 'File content has not changed');
-	}
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+        $this->assertEquals('test file', $file->getContent(), 'File content has not changed');
+    }
 
-	public function testRestoreMovedShare(): void {
-		$this->markTestSkipped('Unreliable test');
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		$userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
-		$node = $userHome->newFolder('folder');
-		$file = $node->newFile('test.txt');
-
-		$userHome2 = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER2);
-		$userHome2->newFolder('subfolder');
-
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-		$shareManager->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		$share->setTarget('subfolder/folder');
-		$shareManager->moveShare($share, self::TEST_VERSIONS_USER2);
-
-		$versions = $this->createAndCheckVersions(
-			Filesystem::getView(),
-			'folder/test.txt'
-		);
-
-		$file->putContent('test file');
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER2);
-
-		$firstVersion = current($versions);
-
-		$this->assertTrue(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-		$this->assertEquals('version 2', $file->getContent(), 'File content has not changed');
-	}
-
-	/**
-	 * @param string $hookName name of hook called
-	 * @param string $params variable to receive parameters provided by hook
-	 */
-	private function connectMockHooks($hookName, &$params) {
-		if ($hookName === null) {
-			return;
-		}
-
-		$eventHandler = $this->getMockBuilder(\stdclass::class)
-			->setMethods(['callback'])
-			->getMock();
-
-		$eventHandler->expects($this->any())
-			->method('callback')
-			->willReturnCallback(
-				function ($p) use (&$params): void {
-					$params = $p;
-				}
-			);
-
-		Util::connectHook(
-			'\OCP\Versions',
-			$hookName,
-			$eventHandler,
-			'callback'
-		);
-	}
-
-	private function doTestRestore() {
-		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
-		$this->rootView->file_put_contents($filePath, 'test file');
-
-		$fileInfo = $this->rootView->getFileInfo($filePath);
-		$t0 = $this->rootView->filemtime($filePath);
-
-		// not exactly the same timestamp as the file
-		$t1 = time() - 60;
-		// second version is two weeks older
-		$t2 = $t1 - 60 * 60 * 24 * 14;
-
-		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
-
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
-
-		$this->rootView->file_put_contents($v1, 'version1');
-		$fileInfoV1 = $this->rootView->getFileInfo($v1);
-		$versionEntity = new VersionEntity();
-		$versionEntity->setFileId($fileInfo->getId());
-		$versionEntity->setTimestamp($t1);
-		$versionEntity->setSize($fileInfoV1->getSize());
-		$versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV1->getMimetype()));
-		$versionEntity->setMetadata([]);
-		$this->versionsMapper->insert($versionEntity);
-
-		$this->rootView->file_put_contents($v2, 'version2');
-		$fileInfoV2 = $this->rootView->getFileInfo($v2);
-		$versionEntity = new VersionEntity();
-		$versionEntity->setFileId($fileInfo->getId());
-		$versionEntity->setTimestamp($t2);
-		$versionEntity->setSize($fileInfoV2->getSize());
-		$versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV2->getMimetype()));
-		$versionEntity->setMetadata([]);
-		$this->versionsMapper->insert($versionEntity);
-
-		$oldVersions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/sub/test.txt'
-		);
-
-		$this->assertCount(2, $oldVersions);
-
-		$this->assertEquals('test file', $this->rootView->file_get_contents($filePath));
-		$info1 = $this->rootView->getFileInfo($filePath);
-
-		$eventDispatcher = Server::get(IEventDispatcher::class);
-		$eventFired = false;
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2) {
-			$eventFired = true;
-			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
-			$this->assertTrue($event->getVersion()->getRevisionId() > 0);
-		});
-
-		$versionManager = Server::get(IVersionManager::class);
-		$versions = $versionManager->getVersionsForFile($this->user1, $info1);
-		$version = array_filter($versions, function ($version) use ($t2) {
-			return $version->getRevisionId() === $t2;
-		});
-		$this->assertTrue($versionManager->rollback(current($version)));
-
-		$this->assertTrue($eventFired, 'VersionRestoredEvent was not fired');
-
-		$this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
-		$info2 = $this->rootView->getFileInfo($filePath);
-
-		$this->assertNotEquals(
-			$info2['etag'],
-			$info1['etag'],
-			'Etag must change after rolling back version'
-		);
-		$this->assertEquals(
-			$info2['fileid'],
-			$info1['fileid'],
-			'File id must not change after rolling back version'
-		);
-		$this->assertEquals(
-			$info2['mtime'],
-			$t2,
-			'Restored file has mtime from version'
-		);
-
-		$newVersions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/sub/test.txt'
-		);
-
-		$this->assertTrue(
-			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
-			'A version file was created for the file before restoration'
-		);
-		$this->assertTrue(
-			$this->rootView->file_exists($v1),
-			'Untouched version file is still there'
-		);
-		$this->assertFalse(
-			$this->rootView->file_exists($v2),
-			'Restored version file gone from files_version folder'
-		);
-
-		$this->assertCount(2, $newVersions, 'Additional version created');
-
-		$this->assertTrue(
-			isset($newVersions[$t0 . '#' . 'test.txt']),
-			'A version was created for the file before restoration'
-		);
-		$this->assertTrue(
-			isset($newVersions[$t1 . '#' . 'test.txt']),
-			'Untouched version is still there'
-		);
-		$this->assertFalse(
-			isset($newVersions[$t2 . '#' . 'test.txt']),
-			'Restored version is not in the list any more'
-		);
-	}
-
-	/**
-	 * Test whether versions are created when overwriting as owner
-	 */
-	public function testStoreVersionAsOwner(): void {
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		$this->createAndCheckVersions(
-			Filesystem::getView(),
-			'test.txt'
-		);
-	}
-
-	/**
-	 * Test whether versions are created when overwriting as share recipient
-	 */
-	public function testStoreVersionAsRecipient(): void {
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		Filesystem::mkdir('folder');
-		Filesystem::file_put_contents('folder/test.txt', 'test file');
-
-		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder');
-		$share = Server::get(\OCP\Share\IManager::class)->newShare();
-		$share->setNode($node)
-			->setShareType(IShare::TYPE_USER)
-			->setSharedBy(self::TEST_VERSIONS_USER)
-			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(Constants::PERMISSION_ALL);
-		$share = Server::get(\OCP\Share\IManager::class)->createShare($share);
-		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER2);
-
-		$this->createAndCheckVersions(
-			Filesystem::getView(),
-			'folder/test.txt'
-		);
-
-		Server::get(\OCP\Share\IManager::class)->deleteShare($share);
-	}
-
-	/**
-	 * Test whether versions are created when overwriting anonymously.
-	 *
-	 * When uploading through a public link or publicwebdav, no user
-	 * is logged in. File modification must still be able to find
-	 * the owner and create versions.
-	 */
-	public function testStoreVersionAsAnonymous(): void {
-		$this->logout();
-
-		// note: public link upload does this,
-		// needed to make the hooks fire
-		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
-
-		$userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
-		$this->createAndCheckVersions(
-			$userView,
-			'test.txt'
-		);
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $path
-	 */
-	private function createAndCheckVersions(View $view, $path) {
-		$view->file_put_contents($path, 'test file');
-		$view->file_put_contents($path, 'version 1');
-		$view->file_put_contents($path, 'version 2');
-
-		$this->loginAsUser(self::TEST_VERSIONS_USER);
-
-		// need to scan for the versions
-		[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
-		$rootStorage->getScanner()->scan('files_versions');
-
-		$versions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/' . $path
-		);
-
-		// note: we cannot predict how many versions are created due to
-		// test run timing
-		$this->assertGreaterThan(0, count($versions));
-
-		return $versions;
-	}
-
-	/**
-	 * @param string $user
-	 * @param bool $create
-	 */
-	public static function loginHelper($user, $create = false) {
-		if ($create) {
-			$backend = new \Test\Util\User\Dummy();
-			$backend->createUser($user, $user);
-			Server::get(IUserManager::class)->registerBackend($backend);
-		}
-
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		Filesystem::tearDown();
-		\OC_User::setUserId($user);
-		\OC_Util::setupFS($user);
-		\OC::$server->getUserFolder($user);
-	}
+    public function testRestoreMovedShare(): void {
+        $this->markTestSkipped('Unreliable test');
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        $userHome = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER);
+        $node = $userHome->newFolder('folder');
+        $file = $node->newFile('test.txt');
+
+        $userHome2 = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER2);
+        $userHome2->newFolder('subfolder');
+
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+        $shareManager->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        $share->setTarget('subfolder/folder');
+        $shareManager->moveShare($share, self::TEST_VERSIONS_USER2);
+
+        $versions = $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'folder/test.txt'
+        );
+
+        $file->putContent('test file');
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER2);
+
+        $firstVersion = current($versions);
+
+        $this->assertTrue(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+        $this->assertEquals('version 2', $file->getContent(), 'File content has not changed');
+    }
+
+    /**
+     * @param string $hookName name of hook called
+     * @param string $params variable to receive parameters provided by hook
+     */
+    private function connectMockHooks($hookName, &$params) {
+        if ($hookName === null) {
+            return;
+        }
+
+        $eventHandler = $this->getMockBuilder(\stdclass::class)
+            ->setMethods(['callback'])
+            ->getMock();
+
+        $eventHandler->expects($this->any())
+            ->method('callback')
+            ->willReturnCallback(
+                function ($p) use (&$params): void {
+                    $params = $p;
+                }
+            );
+
+        Util::connectHook(
+            '\OCP\Versions',
+            $hookName,
+            $eventHandler,
+            'callback'
+        );
+    }
+
+    private function doTestRestore() {
+        $filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
+        $this->rootView->file_put_contents($filePath, 'test file');
+
+        $fileInfo = $this->rootView->getFileInfo($filePath);
+        $t0 = $this->rootView->filemtime($filePath);
+
+        // not exactly the same timestamp as the file
+        $t1 = time() - 60;
+        // second version is two weeks older
+        $t2 = $t1 - 60 * 60 * 24 * 14;
+
+        // create some versions
+        $v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
+        $v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
+
+        $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
+
+        $this->rootView->file_put_contents($v1, 'version1');
+        $fileInfoV1 = $this->rootView->getFileInfo($v1);
+        $versionEntity = new VersionEntity();
+        $versionEntity->setFileId($fileInfo->getId());
+        $versionEntity->setTimestamp($t1);
+        $versionEntity->setSize($fileInfoV1->getSize());
+        $versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV1->getMimetype()));
+        $versionEntity->setMetadata([]);
+        $this->versionsMapper->insert($versionEntity);
+
+        $this->rootView->file_put_contents($v2, 'version2');
+        $fileInfoV2 = $this->rootView->getFileInfo($v2);
+        $versionEntity = new VersionEntity();
+        $versionEntity->setFileId($fileInfo->getId());
+        $versionEntity->setTimestamp($t2);
+        $versionEntity->setSize($fileInfoV2->getSize());
+        $versionEntity->setMimetype($this->mimeTypeLoader->getId($fileInfoV2->getMimetype()));
+        $versionEntity->setMetadata([]);
+        $this->versionsMapper->insert($versionEntity);
+
+        $oldVersions = Storage::getVersions(
+            self::TEST_VERSIONS_USER, '/sub/test.txt'
+        );
+
+        $this->assertCount(2, $oldVersions);
+
+        $this->assertEquals('test file', $this->rootView->file_get_contents($filePath));
+        $info1 = $this->rootView->getFileInfo($filePath);
+
+        $eventDispatcher = Server::get(IEventDispatcher::class);
+        $eventFired = false;
+        $eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2) {
+            $eventFired = true;
+            $this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
+            $this->assertTrue($event->getVersion()->getRevisionId() > 0);
+        });
+
+        $versionManager = Server::get(IVersionManager::class);
+        $versions = $versionManager->getVersionsForFile($this->user1, $info1);
+        $version = array_filter($versions, function ($version) use ($t2) {
+            return $version->getRevisionId() === $t2;
+        });
+        $this->assertTrue($versionManager->rollback(current($version)));
+
+        $this->assertTrue($eventFired, 'VersionRestoredEvent was not fired');
+
+        $this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
+        $info2 = $this->rootView->getFileInfo($filePath);
+
+        $this->assertNotEquals(
+            $info2['etag'],
+            $info1['etag'],
+            'Etag must change after rolling back version'
+        );
+        $this->assertEquals(
+            $info2['fileid'],
+            $info1['fileid'],
+            'File id must not change after rolling back version'
+        );
+        $this->assertEquals(
+            $info2['mtime'],
+            $t2,
+            'Restored file has mtime from version'
+        );
+
+        $newVersions = Storage::getVersions(
+            self::TEST_VERSIONS_USER, '/sub/test.txt'
+        );
+
+        $this->assertTrue(
+            $this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
+            'A version file was created for the file before restoration'
+        );
+        $this->assertTrue(
+            $this->rootView->file_exists($v1),
+            'Untouched version file is still there'
+        );
+        $this->assertFalse(
+            $this->rootView->file_exists($v2),
+            'Restored version file gone from files_version folder'
+        );
+
+        $this->assertCount(2, $newVersions, 'Additional version created');
+
+        $this->assertTrue(
+            isset($newVersions[$t0 . '#' . 'test.txt']),
+            'A version was created for the file before restoration'
+        );
+        $this->assertTrue(
+            isset($newVersions[$t1 . '#' . 'test.txt']),
+            'Untouched version is still there'
+        );
+        $this->assertFalse(
+            isset($newVersions[$t2 . '#' . 'test.txt']),
+            'Restored version is not in the list any more'
+        );
+    }
+
+    /**
+     * Test whether versions are created when overwriting as owner
+     */
+    public function testStoreVersionAsOwner(): void {
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'test.txt'
+        );
+    }
+
+    /**
+     * Test whether versions are created when overwriting as share recipient
+     */
+    public function testStoreVersionAsRecipient(): void {
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        Filesystem::mkdir('folder');
+        Filesystem::file_put_contents('folder/test.txt', 'test file');
+
+        $node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder');
+        $share = Server::get(\OCP\Share\IManager::class)->newShare();
+        $share->setNode($node)
+            ->setShareType(IShare::TYPE_USER)
+            ->setSharedBy(self::TEST_VERSIONS_USER)
+            ->setSharedWith(self::TEST_VERSIONS_USER2)
+            ->setPermissions(Constants::PERMISSION_ALL);
+        $share = Server::get(\OCP\Share\IManager::class)->createShare($share);
+        Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER2);
+
+        $this->createAndCheckVersions(
+            Filesystem::getView(),
+            'folder/test.txt'
+        );
+
+        Server::get(\OCP\Share\IManager::class)->deleteShare($share);
+    }
+
+    /**
+     * Test whether versions are created when overwriting anonymously.
+     *
+     * When uploading through a public link or publicwebdav, no user
+     * is logged in. File modification must still be able to find
+     * the owner and create versions.
+     */
+    public function testStoreVersionAsAnonymous(): void {
+        $this->logout();
+
+        // note: public link upload does this,
+        // needed to make the hooks fire
+        \OC_Util::setupFS(self::TEST_VERSIONS_USER);
+
+        $userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
+        $this->createAndCheckVersions(
+            $userView,
+            'test.txt'
+        );
+    }
+
+    /**
+     * @param View $view
+     * @param string $path
+     */
+    private function createAndCheckVersions(View $view, $path) {
+        $view->file_put_contents($path, 'test file');
+        $view->file_put_contents($path, 'version 1');
+        $view->file_put_contents($path, 'version 2');
+
+        $this->loginAsUser(self::TEST_VERSIONS_USER);
+
+        // need to scan for the versions
+        [$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
+        $rootStorage->getScanner()->scan('files_versions');
+
+        $versions = Storage::getVersions(
+            self::TEST_VERSIONS_USER, '/' . $path
+        );
+
+        // note: we cannot predict how many versions are created due to
+        // test run timing
+        $this->assertGreaterThan(0, count($versions));
+
+        return $versions;
+    }
+
+    /**
+     * @param string $user
+     * @param bool $create
+     */
+    public static function loginHelper($user, $create = false) {
+        if ($create) {
+            $backend = new \Test\Util\User\Dummy();
+            $backend->createUser($user, $user);
+            Server::get(IUserManager::class)->registerBackend($backend);
+        }
+
+        \OC_Util::tearDownFS();
+        \OC_User::setUserId('');
+        Filesystem::tearDown();
+        \OC_User::setUserId($user);
+        \OC_Util::setupFS($user);
+        \OC::$server->getUserFolder($user);
+    }
 }
 
 // extend the original class to make it possible to test protected methods
 class VersionStorageToTest extends Storage {
 
-	/**
-	 * @param integer $time
-	 */
-	public function callProtectedGetExpireList($time, $versions) {
-		return self::getExpireList($time, $versions);
-	}
+    /**
+     * @param integer $time
+     */
+    public function callProtectedGetExpireList($time, $versions) {
+        return self::getExpireList($time, $versions);
+    }
 }

Spacing +59 added lines, -59 removed lines

@@ -86,7 +86,7 @@ 
 		$mockConfig = $this->createMock(IConfig::class);
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
+			->willReturnCallback(function($key, $default) use ($config) {
 				if ($key === 'filesystem_check_changes') {
 					return Watcher::CHECK_ONCE;
 				} else {
@@ -121,10 +121,10 @@ 
 		$this->restoreService(AllConfig::class);
 
 		if ($this->rootView) {
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files_versions/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files_versions/');
 		}
 
 		\OC_Hook::clear();
@@ -292,10 +292,10 @@ 
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -322,12 +322,12 @@ 
 		// version will be expired
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -373,11 +373,11 @@ 
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
+		$v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -410,7 +410,7 @@ 
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+		$versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
 		Filesystem::file_put_contents('test.txt', 'test file');
 
 		$t1 = time();
@@ -420,8 +420,8 @@ 
 
 		$this->rootView->mkdir($versionsFolder2);
 		// create some versions
-		$v1 = $versionsFolder2 . '/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/test.txt.v' . $t2;
+		$v1 = $versionsFolder2.'/test.txt.v'.$t1;
+		$v2 = $versionsFolder2.'/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -434,10 +434,10 @@ 
 
 		self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+		$versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
+		$v1Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t1;
+		$v2Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t2;
 
 		$this->assertTrue($this->rootView->file_exists($v1Renamed));
 		$this->assertTrue($this->rootView->file_exists($v2Renamed));
@@ -459,7 +459,7 @@ 
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+		$versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
 		Filesystem::mkdir('folder2');
 		Filesystem::file_put_contents('folder2/test.txt', 'test file');
 
@@ -469,10 +469,10 @@ 
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		$this->rootView->mkdir($versionsFolder2);
-		$this->rootView->mkdir($versionsFolder2 . '/folder2');
+		$this->rootView->mkdir($versionsFolder2.'/folder2');
 		// create some versions
-		$v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
+		$v1 = $versionsFolder2.'/folder2/test.txt.v'.$t1;
+		$v2 = $versionsFolder2.'/folder2/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -485,10 +485,10 @@ 
 
 		self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+		$versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
+		$v1Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t1;
+		$v2Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t2;
 
 		$this->assertTrue($this->rootView->file_exists($v1Renamed));
 		$this->assertTrue($this->rootView->file_exists($v2Renamed));
@@ -506,11 +506,11 @@ 
 
 		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
 		// the renamed versions should not exist! Because we only moved the mount point!
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -554,10 +554,10 @@ 
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
+		$v1Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
+		$v2Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -585,10 +585,10 @@ 
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t2;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/subfolder/');
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -604,7 +604,7 @@ 
 		}
 
 		//cleanup
-		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
+		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT.'/subfolder');
 	}
 
 	/**
@@ -647,7 +647,7 @@ 
 
 	public function testRestoreCrossStorage(): void {
 		$storage2 = new Temporary([]);
-		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
+		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER.'/files/sub');
 
 		$this->doTestRestore();
 	}
@@ -746,7 +746,7 @@ 
 		$eventHandler->expects($this->any())
 			->method('callback')
 			->willReturnCallback(
-				function ($p) use (&$params): void {
+				function($p) use (&$params): void {
 					$params = $p;
 				}
 			);
@@ -760,7 +760,7 @@ 
 	}
 
 	private function doTestRestore() {
-		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
+		$filePath = self::TEST_VERSIONS_USER.'/files/sub/test.txt';
 		$this->rootView->file_put_contents($filePath, 'test file');
 
 		$fileInfo = $this->rootView->getFileInfo($filePath);
@@ -772,10 +772,10 @@ 
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t2;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/sub');
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$fileInfoV1 = $this->rootView->getFileInfo($v1);
@@ -808,7 +808,7 @@ 
 
 		$eventDispatcher = Server::get(IEventDispatcher::class);
 		$eventFired = false;
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2) {
+		$eventDispatcher->addListener(VersionRestoredEvent::class, function($event) use (&$eventFired, $t2) {
 			$eventFired = true;
 			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
 			$this->assertTrue($event->getVersion()->getRevisionId() > 0);
@@ -816,7 +816,7 @@ 
 
 		$versionManager = Server::get(IVersionManager::class);
 		$versions = $versionManager->getVersionsForFile($this->user1, $info1);
-		$version = array_filter($versions, function ($version) use ($t2) {
+		$version = array_filter($versions, function($version) use ($t2) {
 			return $version->getRevisionId() === $t2;
 		});
 		$this->assertTrue($versionManager->rollback(current($version)));
@@ -847,7 +847,7 @@ 
 		);
 
 		$this->assertTrue(
-			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
+			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t0),
 			'A version file was created for the file before restoration'
 		);
 		$this->assertTrue(
@@ -862,15 +862,15 @@ 
 		$this->assertCount(2, $newVersions, 'Additional version created');
 
 		$this->assertTrue(
-			isset($newVersions[$t0 . '#' . 'test.txt']),
+			isset($newVersions[$t0.'#'.'test.txt']),
 			'A version was created for the file before restoration'
 		);
 		$this->assertTrue(
-			isset($newVersions[$t1 . '#' . 'test.txt']),
+			isset($newVersions[$t1.'#'.'test.txt']),
 			'Untouched version is still there'
 		);
 		$this->assertFalse(
-			isset($newVersions[$t2 . '#' . 'test.txt']),
+			isset($newVersions[$t2.'#'.'test.txt']),
 			'Restored version is not in the list any more'
 		);
 	}
@@ -930,7 +930,7 @@ 
 		// needed to make the hooks fire
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
+		$userView = new View('/'.self::TEST_VERSIONS_USER.'/files');
 		$this->createAndCheckVersions(
 			$userView,
 			'test.txt'
@@ -949,11 +949,11 @@ 
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
 		// need to scan for the versions
-		[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
+		[$rootStorage, ] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER.'/files_versions');
 		$rootStorage->getScanner()->scan('files_versions');
 
 		$versions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/' . $path
+			self::TEST_VERSIONS_USER, '/'.$path
 		);
 
 		// note: we cannot predict how many versions are created due to

apps/admin_audit/lib/AppInfo/Application.php

Indentation +154 added lines, -154 removed lines

@@ -73,161 +73,161 @@
 use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
-	public function __construct() {
-		parent::__construct('admin_audit');
-	}
-
-	public function register(IRegistrationContext $context): void {
-		$context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
-			return new AuditLogger($c->get(ILogFactory::class), $c->get(IConfig::class));
-		});
-
-		$context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
-
-		// User management events
-		$context->registerEventListener(UserCreatedEvent::class, UserManagementEventListener::class);
-		$context->registerEventListener(UserDeletedEvent::class, UserManagementEventListener::class);
-		$context->registerEventListener(UserChangedEvent::class, UserManagementEventListener::class);
-		$context->registerEventListener(PasswordUpdatedEvent::class, UserManagementEventListener::class);
-		$context->registerEventListener(UserIdAssignedEvent::class, UserManagementEventListener::class);
-		$context->registerEventListener(UserIdUnassignedEvent::class, UserManagementEventListener::class);
-
-		// Group management events
-		$context->registerEventListener(UserAddedEvent::class, GroupManagementEventListener::class);
-		$context->registerEventListener(UserRemovedEvent::class, GroupManagementEventListener::class);
-		$context->registerEventListener(GroupCreatedEvent::class, GroupManagementEventListener::class);
-		$context->registerEventListener(GroupDeletedEvent::class, GroupManagementEventListener::class);
-
-		// Sharing events
-		$context->registerEventListener(ShareCreatedEvent::class, SharingEventListener::class);
-		$context->registerEventListener(ShareDeletedEvent::class, SharingEventListener::class);
-
-		// Auth events
-		$context->registerEventListener(BeforeUserLoggedInEvent::class, AuthEventListener::class);
-		$context->registerEventListener(UserLoggedInWithCookieEvent::class, AuthEventListener::class);
-		$context->registerEventListener(UserLoggedInEvent::class, AuthEventListener::class);
-		$context->registerEventListener(BeforeUserLoggedOutEvent::class, AuthEventListener::class);
-		$context->registerEventListener(AnyLoginFailedEvent::class, AuthEventListener::class);
-
-		// File events
-		$context->registerEventListener(BeforePreviewFetchedEvent::class, FileEventListener::class);
-		$context->registerEventListener(VersionRestoredEvent::class, FileEventListener::class);
-
-		// Security events
-		$context->registerEventListener(TwoFactorProviderChallengePassed::class, SecurityEventListener::class);
-		$context->registerEventListener(TwoFactorProviderChallengeFailed::class, SecurityEventListener::class);
-
-		// App management events
-		$context->registerEventListener(AppEnableEvent::class, AppManagementEventListener::class);
-		$context->registerEventListener(AppDisableEvent::class, AppManagementEventListener::class);
-		$context->registerEventListener(AppUpdateEvent::class, AppManagementEventListener::class);
-
-		// Console events
-		$context->registerEventListener(ConsoleEvent::class, ConsoleEventListener::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		/** @var IAuditLogger $logger */
-		$logger = $context->getAppContainer()->get(IAuditLogger::class);
-
-		/*
+    public function __construct() {
+        parent::__construct('admin_audit');
+    }
+
+    public function register(IRegistrationContext $context): void {
+        $context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
+            return new AuditLogger($c->get(ILogFactory::class), $c->get(IConfig::class));
+        });
+
+        $context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
+
+        // User management events
+        $context->registerEventListener(UserCreatedEvent::class, UserManagementEventListener::class);
+        $context->registerEventListener(UserDeletedEvent::class, UserManagementEventListener::class);
+        $context->registerEventListener(UserChangedEvent::class, UserManagementEventListener::class);
+        $context->registerEventListener(PasswordUpdatedEvent::class, UserManagementEventListener::class);
+        $context->registerEventListener(UserIdAssignedEvent::class, UserManagementEventListener::class);
+        $context->registerEventListener(UserIdUnassignedEvent::class, UserManagementEventListener::class);
+
+        // Group management events
+        $context->registerEventListener(UserAddedEvent::class, GroupManagementEventListener::class);
+        $context->registerEventListener(UserRemovedEvent::class, GroupManagementEventListener::class);
+        $context->registerEventListener(GroupCreatedEvent::class, GroupManagementEventListener::class);
+        $context->registerEventListener(GroupDeletedEvent::class, GroupManagementEventListener::class);
+
+        // Sharing events
+        $context->registerEventListener(ShareCreatedEvent::class, SharingEventListener::class);
+        $context->registerEventListener(ShareDeletedEvent::class, SharingEventListener::class);
+
+        // Auth events
+        $context->registerEventListener(BeforeUserLoggedInEvent::class, AuthEventListener::class);
+        $context->registerEventListener(UserLoggedInWithCookieEvent::class, AuthEventListener::class);
+        $context->registerEventListener(UserLoggedInEvent::class, AuthEventListener::class);
+        $context->registerEventListener(BeforeUserLoggedOutEvent::class, AuthEventListener::class);
+        $context->registerEventListener(AnyLoginFailedEvent::class, AuthEventListener::class);
+
+        // File events
+        $context->registerEventListener(BeforePreviewFetchedEvent::class, FileEventListener::class);
+        $context->registerEventListener(VersionRestoredEvent::class, FileEventListener::class);
+
+        // Security events
+        $context->registerEventListener(TwoFactorProviderChallengePassed::class, SecurityEventListener::class);
+        $context->registerEventListener(TwoFactorProviderChallengeFailed::class, SecurityEventListener::class);
+
+        // App management events
+        $context->registerEventListener(AppEnableEvent::class, AppManagementEventListener::class);
+        $context->registerEventListener(AppDisableEvent::class, AppManagementEventListener::class);
+        $context->registerEventListener(AppUpdateEvent::class, AppManagementEventListener::class);
+
+        // Console events
+        $context->registerEventListener(ConsoleEvent::class, ConsoleEventListener::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        /** @var IAuditLogger $logger */
+        $logger = $context->getAppContainer()->get(IAuditLogger::class);
+
+        /*
 		 * TODO: once the hooks are migrated to lazy events, this should be done
 		 *       in \OCA\AdminAudit\AppInfo\Application::register
 		 */
-		$this->registerLegacyHooks($logger, $context->getServerContainer());
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	private function registerLegacyHooks(IAuditLogger $logger, ContainerInterface $serverContainer): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $serverContainer->get(IEventDispatcher::class);
-		$this->sharingLegacyHooks($logger);
-		$this->fileHooks($logger, $eventDispatcher);
-		$this->trashbinHooks($logger);
-		$this->versionsHooks($logger);
-		$this->tagHooks($logger, $eventDispatcher);
-	}
-
-	private function sharingLegacyHooks(IAuditLogger $logger): void {
-		$shareActions = new Sharing($logger);
-
-		Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	private function tagHooks(IAuditLogger $logger,
-		IEventDispatcher $eventDispatcher): void {
-		$eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, function (ManagerEvent $event) use ($logger): void {
-			$tagActions = new TagManagement($logger);
-			$tagActions->createTag($event->getTag());
-		});
-	}
-
-	private function fileHooks(IAuditLogger $logger, IEventDispatcher $eventDispatcher): void {
-		$fileActions = new Files($logger);
-
-		$eventDispatcher->addListener(
-			BeforeNodeRenamedEvent::class,
-			function (BeforeNodeRenamedEvent $event) use ($fileActions): void {
-				$fileActions->beforeRename($event);
-			}
-		);
-
-		$eventDispatcher->addListener(
-			NodeRenamedEvent::class,
-			function (NodeRenamedEvent $event) use ($fileActions): void {
-				$fileActions->afterRename($event);
-			}
-		);
-
-		$eventDispatcher->addListener(
-			NodeCreatedEvent::class,
-			function (NodeCreatedEvent $event) use ($fileActions): void {
-				$fileActions->create($event);
-			}
-		);
-
-		$eventDispatcher->addListener(
-			NodeCopiedEvent::class,
-			function (NodeCopiedEvent $event) use ($fileActions): void {
-				$fileActions->copy($event);
-			}
-		);
-
-		$eventDispatcher->addListener(
-			NodeWrittenEvent::class,
-			function (NodeWrittenEvent $event) use ($fileActions): void {
-				$fileActions->write($event);
-			}
-		);
-
-		$eventDispatcher->addListener(
-			BeforeNodeReadEvent::class,
-			function (BeforeNodeReadEvent $event) use ($fileActions): void {
-				$fileActions->read($event);
-			}
-		);
-
-		$eventDispatcher->addListener(
-			BeforeNodeDeletedEvent::class,
-			function (BeforeNodeDeletedEvent $event) use ($fileActions): void {
-				$fileActions->delete($event);
-			}
-		);
-	}
-
-	private function versionsHooks(IAuditLogger $logger): void {
-		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
-	}
-
-	private function trashbinHooks(IAuditLogger $logger): void {
-		$trashActions = new Trashbin($logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
+        $this->registerLegacyHooks($logger, $context->getServerContainer());
+    }
+
+    /**
+     * Register hooks in order to log them
+     */
+    private function registerLegacyHooks(IAuditLogger $logger, ContainerInterface $serverContainer): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $serverContainer->get(IEventDispatcher::class);
+        $this->sharingLegacyHooks($logger);
+        $this->fileHooks($logger, $eventDispatcher);
+        $this->trashbinHooks($logger);
+        $this->versionsHooks($logger);
+        $this->tagHooks($logger, $eventDispatcher);
+    }
+
+    private function sharingLegacyHooks(IAuditLogger $logger): void {
+        $shareActions = new Sharing($logger);
+
+        Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
+    }
+
+    private function tagHooks(IAuditLogger $logger,
+        IEventDispatcher $eventDispatcher): void {
+        $eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, function (ManagerEvent $event) use ($logger): void {
+            $tagActions = new TagManagement($logger);
+            $tagActions->createTag($event->getTag());
+        });
+    }
+
+    private function fileHooks(IAuditLogger $logger, IEventDispatcher $eventDispatcher): void {
+        $fileActions = new Files($logger);
+
+        $eventDispatcher->addListener(
+            BeforeNodeRenamedEvent::class,
+            function (BeforeNodeRenamedEvent $event) use ($fileActions): void {
+                $fileActions->beforeRename($event);
+            }
+        );
+
+        $eventDispatcher->addListener(
+            NodeRenamedEvent::class,
+            function (NodeRenamedEvent $event) use ($fileActions): void {
+                $fileActions->afterRename($event);
+            }
+        );
+
+        $eventDispatcher->addListener(
+            NodeCreatedEvent::class,
+            function (NodeCreatedEvent $event) use ($fileActions): void {
+                $fileActions->create($event);
+            }
+        );
+
+        $eventDispatcher->addListener(
+            NodeCopiedEvent::class,
+            function (NodeCopiedEvent $event) use ($fileActions): void {
+                $fileActions->copy($event);
+            }
+        );
+
+        $eventDispatcher->addListener(
+            NodeWrittenEvent::class,
+            function (NodeWrittenEvent $event) use ($fileActions): void {
+                $fileActions->write($event);
+            }
+        );
+
+        $eventDispatcher->addListener(
+            BeforeNodeReadEvent::class,
+            function (BeforeNodeReadEvent $event) use ($fileActions): void {
+                $fileActions->read($event);
+            }
+        );
+
+        $eventDispatcher->addListener(
+            BeforeNodeDeletedEvent::class,
+            function (BeforeNodeDeletedEvent $event) use ($fileActions): void {
+                $fileActions->delete($event);
+            }
+        );
+    }
+
+    private function versionsHooks(IAuditLogger $logger): void {
+        $versionsActions = new Versions($logger);
+        Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
+    }
+
+    private function trashbinHooks(IAuditLogger $logger): void {
+        $trashActions = new Trashbin($logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
 }

apps/admin_audit/lib/Actions/Versions.php

Indentation +6 added lines, -6 removed lines

@@ -8,10 +8,10 @@
 namespace OCA\AdminAudit\Actions;
 
 class Versions extends Action {
-	public function delete(array $params): void {
-		$this->log('Version "%s" was deleted.',
-			['path' => $params['path']],
-			['path']
-		);
-	}
+    public function delete(array $params): void {
+        $this->log('Version "%s" was deleted.',
+            ['path' => $params['path']],
+            ['path']
+        );
+    }
 }

apps/admin_audit/lib/Listener/FileEventListener.php

Indentation +46 added lines, -46 removed lines

@@ -23,52 +23,52 @@
  * @template-implements IEventListener<BeforePreviewFetchedEvent|VersionRestoredEvent>
  */
 class FileEventListener extends Action implements IEventListener {
-	public function handle(Event $event): void {
-		if ($event instanceof BeforePreviewFetchedEvent) {
-			$this->beforePreviewFetched($event);
-		} elseif ($event instanceof VersionRestoredEvent) {
-			$this->versionRestored($event);
-		}
-	}
+    public function handle(Event $event): void {
+        if ($event instanceof BeforePreviewFetchedEvent) {
+            $this->beforePreviewFetched($event);
+        } elseif ($event instanceof VersionRestoredEvent) {
+            $this->versionRestored($event);
+        }
+    }
 
-	/**
-	 * Logs preview access to a file
-	 */
-	private function beforePreviewFetched(BeforePreviewFetchedEvent $event): void {
-		try {
-			$file = $event->getNode();
-			$params = [
-				'id' => $file->getId(),
-				'width' => $event->getWidth(),
-				'height' => $event->getHeight(),
-				'crop' => $event->isCrop(),
-				'mode' => $event->getMode(),
-				'path' => $file->getPath(),
-			];
-			$this->log(
-				'Preview accessed: (id: "%s", width: "%s", height: "%s" crop: "%s", mode: "%s", path: "%s")',
-				$params,
-				array_keys($params)
-			);
-		} catch (InvalidPathException|NotFoundException $e) {
-			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file preview: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
-			);
-			return;
-		}
-	}
+    /**
+     * Logs preview access to a file
+     */
+    private function beforePreviewFetched(BeforePreviewFetchedEvent $event): void {
+        try {
+            $file = $event->getNode();
+            $params = [
+                'id' => $file->getId(),
+                'width' => $event->getWidth(),
+                'height' => $event->getHeight(),
+                'crop' => $event->isCrop(),
+                'mode' => $event->getMode(),
+                'path' => $file->getPath(),
+            ];
+            $this->log(
+                'Preview accessed: (id: "%s", width: "%s", height: "%s" crop: "%s", mode: "%s", path: "%s")',
+                $params,
+                array_keys($params)
+            );
+        } catch (InvalidPathException|NotFoundException $e) {
+            Server::get(LoggerInterface::class)->error(
+                'Exception thrown in file preview: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+            );
+            return;
+        }
+    }
 
-	/**
-	 * Logs when a version is restored
-	 */
-	private function versionRestored(VersionRestoredEvent $event): void {
-		$version = $event->getVersion();
-		$this->log('Version "%s" of "%s" was restored.',
-			[
-				'version' => $version->getRevisionId(),
-				'path' => $version->getVersionPath()
-			],
-			['version', 'path']
-		);
-	}
+    /**
+     * Logs when a version is restored
+     */
+    private function versionRestored(VersionRestoredEvent $event): void {
+        $version = $event->getVersion();
+        $this->log('Version "%s" of "%s" was restored.',
+            [
+                'version' => $version->getRevisionId(),
+                'path' => $version->getVersionPath()
+            ],
+            ['version', 'path']
+        );
+    }
 }