nextcloud / server

lib/private/Server.php

Indentation +2049 added lines, -2049 removed lines

@@ -243,2058 +243,2058 @@
  */
 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);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CalendarManager', \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ContactsManager', \OCP\Contacts\IManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-
-		$this->registerService(IPreview::class, function (Server $c) {
-			return new PreviewManager(
-				$c->getConfig(),
-				$c->getRootFolder(),
-				new \OC\Preview\Storage\Root($c->getRootFolder(), $c->getSystemConfig()),
-				$c->getEventDispatcher(),
-				$c->getGeneratorHelper(),
-				$c->getSession()->get('user_id')
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('PreviewManager', IPreview::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root($c->getRootFolder(), $c->getSystemConfig())
-			);
-		});
-
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\Manager(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('EncryptionManager', \OCP\Encryption\IManager::class);
-
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\File(
-				$util,
-				$c->getRootFolder(),
-				$c->getShareManager()
-			);
-		});
-
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-
-			return new Encryption\Keys\Storage($view, $util);
-		});
-		/** @deprecated 20.0.0 */
-		$this->registerDeprecatedAlias('TagMapper', TagMapper::class);
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerService('RootFolder', function (Server $c) {
-			$manager = \OC\Files\Filesystem::getMountManager(null);
-			$view = new View();
-			$root = new Root(
-				$manager,
-				$view,
-				null,
-				$c->getUserMountCache(),
-				$this->getLogger(),
-				$this->getUserManager()
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (Server $c) {
-			return new HookConnector(
-				$c->query(IRootFolder::class),
-				new View(),
-				$c->query(\OC\EventDispatcher\SymfonyAdapter::class),
-				$c->query(IEventDispatcher::class)
-			);
-		});
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
-
-		$this->registerService(IRootFolder::class, function (Server $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->query('RootFolder');
-			});
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('LazyRootFolder', IRootFolder::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $this->getLogger());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
-				\OC_Hook::emit('OC_Group', 'pre_createGroup', ['run' => true, 'gid' => $gid]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
-			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_User', 'post_createGroup', ['gid' => $group->getGID()]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new GroupCreatedEvent($group));
-			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', ['run' => true, 'gid' => $group->getGID()]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
-			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_User', 'post_deleteGroup', ['gid' => $group->getGID()]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new GroupDeletedEvent($group));
-			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'pre_addToGroup', ['run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
-			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'post_addToGroup', ['uid' => $user->getUID(), 'gid' => $group->getGID()]);
-				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
-				\OC_Hook::emit('OC_User', 'post_addToGroup', ['uid' => $user->getUID(), 'gid' => $group->getGID()]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
-			});
-			$groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
-			});
-			$groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
-			});
-			return $groupManager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
-
-		$this->registerService(Store::class, function (Server $c) {
-			$session = $c->getSession();
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$tokenProvider = $c->query(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->getLogger();
-			return new Store($session, $logger, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->getUserManager();
-			$session = new \OC\Session\Memory('');
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$defaultTokenProvider = $c->query(IProvider::class);
-			} else {
-				$defaultTokenProvider = null;
-			}
-
-			$legacyDispatcher = $c->getEventDispatcher();
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$defaultTokenProvider,
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getLockdownManager(),
-				$c->getLogger(),
-				$c->query(IEventDispatcher::class)
-			);
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
-			});
-			$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]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-				$legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserDeletedEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserDeletedEvent($user));
-			});
-			$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]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $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]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $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->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(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->query(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->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(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]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->query(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserChangedEvent($user, $feature, $value, $oldValue));
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserSession', \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('NavigationManager', INavigationManager::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemConfig', \OC\SystemConfig::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->getConfig(),
-				$c->getRequest(),
-				$c->getUserSession(),
-				\OC::$SERVERROOT
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('L10NFactory', IFactory::class);
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('URLGenerator', IURLGenerator::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AppFetcher', AppFetcher::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
-
-		$this->registerService(ICache::class, function ($c) {
-			return new Cache\File();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserCache', ICache::class);
-
-		$this->registerService(Factory::class, function (Server $c) {
-			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			$config = $c->getConfig();
-
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode(',', \OC_Util::getVersion());
-				$version = implode(',', $v);
-				$instanceId = \OC_Util::getInstanceId();
-				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
-				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
-					$config->getSystemValue('memcache.local', null),
-					$config->getSystemValue('memcache.distributed', null),
-					$config->getSystemValue('memcache.locking', null)
-				);
-			}
-			return $arrayCacheFactory;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			return new RedisFactory($systemConfig);
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('activity');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->getUserSession(),
-				$c->getConfig(),
-				$c->query(IValidator::class),
-				$l10n
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
-
-		$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->query(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AvatarManager', AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->query(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->getSystemConfig());
-			$logger = $factory->get($logType);
-			$registry = $c->query(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->getSystemConfig(), null, $registry);
-		});
-		$this->registerAlias(ILogger::class, \OC\Log::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Logger', \OC\Log::class);
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->getSystemConfig());
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('JobList', IJobList::class);
-
-		$this->registerService(IRouter::class, function (Server $c) {
-			$cacheFactory = $c->getMemCacheFactory();
-			$logger = $c->getLogger();
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger);
-			} else {
-				$router = new \OC\Route\Router($logger);
-			}
-			return $router;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Router', IRouter::class);
-
-		$this->registerAlias(ISearch::class, Search::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Search', ISearch::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			return new \OC\Security\RateLimiting\Backend\MemoryCache(
-				$this->getMemCacheFactory(),
-				new \OC\AppFramework\Utility\TimeFactory()
-			);
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Crypto', ICrypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Hasher', IHasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
-
-		$this->registerService(IDBConnection::class, function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			$factory = new \OC\DB\ConnectionFactory($systemConfig);
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connectionParams = $factory->createConnectionParams();
-			$connection = $factory->getConnection($type, $connectionParams);
-			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
-			return $connection;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('DatabaseConnection', IDBConnection::class);
-
-
-		$this->registerService(IClientService::class, function (Server $c) {
-			$user = \OC_User::getUser();
-			$uid = $user ? $user : null;
-			return new ClientService(
-				$c->getConfig(),
-				$c->getLogger(),
-				new \OC\Security\CertificateManager(
-					$uid,
-					new View(),
-					$c->getConfig(),
-					$c->getLogger(),
-					$c->getSecureRandom()
-				)
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (Server $c) {
-			$eventLogger = new EventLogger();
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$eventLogger->activate();
-			}
-			return $eventLogger;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
-
-		$this->registerService(IQueryLogger::class, function (Server $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('QueryLogger', IQueryLogger::class);
-
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('TempManager', TempManager::class);
-		$this->registerAlias(ITempManager::class, TempManager::class);
-
-		$this->registerService(AppManager::class, function (Server $c) {
-			return new \OC\App\AppManager(
-				$c->getUserSession(),
-				$c->getConfig(),
-				$c->query(\OC\AppConfig::class),
-				$c->getGroupManager(),
-				$c->getMemCacheFactory(),
-				$c->getEventDispatcher(),
-				$c->getLogger()
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('AppManager', AppManager::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->getDateTimeZone()->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
-
-		$this->registerService(IUserMountCache::class, function (Server $c) {
-			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->getUserManager());
-			return $mountCache;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
-
-		$this->registerService(IMountProviderCollection::class, function (Server $c) {
-			$loader = \OC\Files\Filesystem::getLoader();
-			$mountCache = $c->query(IUserMountCache::class);
-			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
-
-			// builtin providers
-
-			$config = $c->getConfig();
-			$logger = $c->getLogger();
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
-
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MountConfigManager', IMountProviderCollection::class);
-
-		/** @deprecated 20.0.0 */
-		$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
-		$this->registerService('AsyncCommandBus', function (Server $c) {
-			$busClass = $c->getConfig()->getSystemValue('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->getAppManager()->isInstalled($app)) {
-					\OC_App::loadApp($app);
-					return $c->query($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->getJobList();
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerAlias(IBus::class, 'AsyncCommandBus');
-		/** @deprecated 20.0.0 */
-		$this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Throttler', Throttler::class);
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
-			// IConfig and IAppManager requires a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$config = $c->getConfig();
-				$appManager = $c->getAppManager();
-			} else {
-				$config = null;
-				$appManager = null;
-			}
-
-			return new Checker(
-				new EnvironmentHelper(),
-				new FileAccessHelper(),
-				new AppLocator(),
-				$config,
-				$c->getMemCacheFactory(),
-				$appManager,
-				$c->getTempManager(),
-				$c->getMimeTypeDetector()
-			);
-		});
-		$this->registerService(\OCP\IRequest::class, function ($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->getSecureRandom(),
-				$this->getConfig(),
-				$this->getCsrfTokenManager(),
-				$stream
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->query(Defaults::class),
-				$c->getURLGenerator(),
-				$c->getL10N('lib'),
-				$c->query(IEventDispatcher::class),
-				$c->getL10NFactory()
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Mailer', IMailer::class);
-
-		$this->registerService('LDAPProvider', function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass)) {
-				throw new \Exception('ldapProviderFactory not set');
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (Server $c) {
-			$ini = $c->getIniWrapper();
-			$config = $c->getConfig();
-			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->getMemCacheFactory();
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					return new MemcacheLockingProvider($memcache, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->getDatabaseConnection(),
-					$c->getLogger(),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class);
-
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MountManager', IMountManager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (Server $c) {
-			return new \OC\Files\Type\Detection(
-				$c->getURLGenerator(),
-				$c->getLogger(),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MimeTypeDetector', IMimeTypeDetector::class);
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (Server $c) {
-			$manager = new CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->getConfig());
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->query(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->getConfig();
-			$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->getUserManager();
-				$user = $manager->get($id);
-				if (is_null($user)) {
-					$l = $c->getL10N('core');
-					$displayName = $l->t('Unknown user');
-				} else {
-					$displayName = $user->getDisplayName();
-				}
-				return $displayName;
-			});
-
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			/*
+    /** @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);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CalendarManager', \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CalendarResourceBackendManager', \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CalendarRoomBackendManager', \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ContactsManager', \OCP\Contacts\IManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+
+        $this->registerService(IPreview::class, function (Server $c) {
+            return new PreviewManager(
+                $c->getConfig(),
+                $c->getRootFolder(),
+                new \OC\Preview\Storage\Root($c->getRootFolder(), $c->getSystemConfig()),
+                $c->getEventDispatcher(),
+                $c->getGeneratorHelper(),
+                $c->getSession()->get('user_id')
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('PreviewManager', IPreview::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root($c->getRootFolder(), $c->getSystemConfig())
+            );
+        });
+
+        $this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\Manager(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('EncryptionManager', \OCP\Encryption\IManager::class);
+
+        $this->registerService('EncryptionFileHelper', function (Server $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\File(
+                $util,
+                $c->getRootFolder(),
+                $c->getShareManager()
+            );
+        });
+
+        $this->registerService('EncryptionKeyStorage', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+
+            return new Encryption\Keys\Storage($view, $util);
+        });
+        /** @deprecated 20.0.0 */
+        $this->registerDeprecatedAlias('TagMapper', TagMapper::class);
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerService('RootFolder', function (Server $c) {
+            $manager = \OC\Files\Filesystem::getMountManager(null);
+            $view = new View();
+            $root = new Root(
+                $manager,
+                $view,
+                null,
+                $c->getUserMountCache(),
+                $this->getLogger(),
+                $this->getUserManager()
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (Server $c) {
+            return new HookConnector(
+                $c->query(IRootFolder::class),
+                new View(),
+                $c->query(\OC\EventDispatcher\SymfonyAdapter::class),
+                $c->query(IEventDispatcher::class)
+            );
+        });
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
+
+        $this->registerService(IRootFolder::class, function (Server $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->query('RootFolder');
+            });
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('LazyRootFolder', IRootFolder::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+            $groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $this->getLogger());
+            $groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+                \OC_Hook::emit('OC_Group', 'pre_createGroup', ['run' => true, 'gid' => $gid]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
+            });
+            $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_User', 'post_createGroup', ['gid' => $group->getGID()]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new GroupCreatedEvent($group));
+            });
+            $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_Group', 'pre_deleteGroup', ['run' => true, 'gid' => $group->getGID()]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
+            });
+            $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_User', 'post_deleteGroup', ['gid' => $group->getGID()]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new GroupDeletedEvent($group));
+            });
+            $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'pre_addToGroup', ['run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
+            });
+            $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'post_addToGroup', ['uid' => $user->getUID(), 'gid' => $group->getGID()]);
+                //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
+                \OC_Hook::emit('OC_User', 'post_addToGroup', ['uid' => $user->getUID(), 'gid' => $group->getGID()]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
+            });
+            $groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
+            });
+            $groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
+            });
+            return $groupManager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
+
+        $this->registerService(Store::class, function (Server $c) {
+            $session = $c->getSession();
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $tokenProvider = $c->query(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->getLogger();
+            return new Store($session, $logger, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->getUserManager();
+            $session = new \OC\Session\Memory('');
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $defaultTokenProvider = $c->query(IProvider::class);
+            } else {
+                $defaultTokenProvider = null;
+            }
+
+            $legacyDispatcher = $c->getEventDispatcher();
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $defaultTokenProvider,
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getLockdownManager(),
+                $c->getLogger(),
+                $c->query(IEventDispatcher::class)
+            );
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
+            });
+            $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]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+                $legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserDeletedEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserDeletedEvent($user));
+            });
+            $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]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $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]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $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->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(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->query(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->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(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]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->query(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserChangedEvent($user, $feature, $value, $oldValue));
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserSession', \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('NavigationManager', INavigationManager::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemConfig', \OC\SystemConfig::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->getConfig(),
+                $c->getRequest(),
+                $c->getUserSession(),
+                \OC::$SERVERROOT
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('L10NFactory', IFactory::class);
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('URLGenerator', IURLGenerator::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AppFetcher', AppFetcher::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
+
+        $this->registerService(ICache::class, function ($c) {
+            return new Cache\File();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserCache', ICache::class);
+
+        $this->registerService(Factory::class, function (Server $c) {
+            $arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            $config = $c->getConfig();
+
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode(',', \OC_Util::getVersion());
+                $version = implode(',', $v);
+                $instanceId = \OC_Util::getInstanceId();
+                $path = \OC::$SERVERROOT;
+                $prefix = md5($instanceId . '-' . $version . '-' . $path);
+                return new \OC\Memcache\Factory($prefix, $c->getLogger(),
+                    $config->getSystemValue('memcache.local', null),
+                    $config->getSystemValue('memcache.distributed', null),
+                    $config->getSystemValue('memcache.locking', null)
+                );
+            }
+            return $arrayCacheFactory;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            return new RedisFactory($systemConfig);
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('activity');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->getUserSession(),
+                $c->getConfig(),
+                $c->query(IValidator::class),
+                $l10n
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
+
+        $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->query(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AvatarManager', AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->query(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->getSystemConfig());
+            $logger = $factory->get($logType);
+            $registry = $c->query(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->getSystemConfig(), null, $registry);
+        });
+        $this->registerAlias(ILogger::class, \OC\Log::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Logger', \OC\Log::class);
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->getSystemConfig());
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('JobList', IJobList::class);
+
+        $this->registerService(IRouter::class, function (Server $c) {
+            $cacheFactory = $c->getMemCacheFactory();
+            $logger = $c->getLogger();
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger);
+            } else {
+                $router = new \OC\Route\Router($logger);
+            }
+            return $router;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Router', IRouter::class);
+
+        $this->registerAlias(ISearch::class, Search::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Search', ISearch::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            return new \OC\Security\RateLimiting\Backend\MemoryCache(
+                $this->getMemCacheFactory(),
+                new \OC\AppFramework\Utility\TimeFactory()
+            );
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Crypto', ICrypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Hasher', IHasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
+
+        $this->registerService(IDBConnection::class, function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            $factory = new \OC\DB\ConnectionFactory($systemConfig);
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connectionParams = $factory->createConnectionParams();
+            $connection = $factory->getConnection($type, $connectionParams);
+            $connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
+            return $connection;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('DatabaseConnection', IDBConnection::class);
+
+
+        $this->registerService(IClientService::class, function (Server $c) {
+            $user = \OC_User::getUser();
+            $uid = $user ? $user : null;
+            return new ClientService(
+                $c->getConfig(),
+                $c->getLogger(),
+                new \OC\Security\CertificateManager(
+                    $uid,
+                    new View(),
+                    $c->getConfig(),
+                    $c->getLogger(),
+                    $c->getSecureRandom()
+                )
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (Server $c) {
+            $eventLogger = new EventLogger();
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $eventLogger->activate();
+            }
+            return $eventLogger;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
+
+        $this->registerService(IQueryLogger::class, function (Server $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('QueryLogger', IQueryLogger::class);
+
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('TempManager', TempManager::class);
+        $this->registerAlias(ITempManager::class, TempManager::class);
+
+        $this->registerService(AppManager::class, function (Server $c) {
+            return new \OC\App\AppManager(
+                $c->getUserSession(),
+                $c->getConfig(),
+                $c->query(\OC\AppConfig::class),
+                $c->getGroupManager(),
+                $c->getMemCacheFactory(),
+                $c->getEventDispatcher(),
+                $c->getLogger()
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('AppManager', AppManager::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->getDateTimeZone()->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
+
+        $this->registerService(IUserMountCache::class, function (Server $c) {
+            $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->getUserManager());
+            return $mountCache;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
+
+        $this->registerService(IMountProviderCollection::class, function (Server $c) {
+            $loader = \OC\Files\Filesystem::getLoader();
+            $mountCache = $c->query(IUserMountCache::class);
+            $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+
+            // builtin providers
+
+            $config = $c->getConfig();
+            $logger = $c->getLogger();
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
+
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MountConfigManager', IMountProviderCollection::class);
+
+        /** @deprecated 20.0.0 */
+        $this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
+        $this->registerService('AsyncCommandBus', function (Server $c) {
+            $busClass = $c->getConfig()->getSystemValue('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->getAppManager()->isInstalled($app)) {
+                    \OC_App::loadApp($app);
+                    return $c->query($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->getJobList();
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerAlias(IBus::class, 'AsyncCommandBus');
+        /** @deprecated 20.0.0 */
+        $this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Throttler', Throttler::class);
+        $this->registerService('IntegrityCodeChecker', function (Server $c) {
+            // IConfig and IAppManager requires a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $config = $c->getConfig();
+                $appManager = $c->getAppManager();
+            } else {
+                $config = null;
+                $appManager = null;
+            }
+
+            return new Checker(
+                new EnvironmentHelper(),
+                new FileAccessHelper(),
+                new AppLocator(),
+                $config,
+                $c->getMemCacheFactory(),
+                $appManager,
+                $c->getTempManager(),
+                $c->getMimeTypeDetector()
+            );
+        });
+        $this->registerService(\OCP\IRequest::class, function ($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->getSecureRandom(),
+                $this->getConfig(),
+                $this->getCsrfTokenManager(),
+                $stream
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->query(Defaults::class),
+                $c->getURLGenerator(),
+                $c->getL10N('lib'),
+                $c->query(IEventDispatcher::class),
+                $c->getL10NFactory()
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Mailer', IMailer::class);
+
+        $this->registerService('LDAPProvider', function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass)) {
+                throw new \Exception('ldapProviderFactory not set');
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (Server $c) {
+            $ini = $c->getIniWrapper();
+            $config = $c->getConfig();
+            $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->getMemCacheFactory();
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    return new MemcacheLockingProvider($memcache, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->getDatabaseConnection(),
+                    $c->getLogger(),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class);
+
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MountManager', IMountManager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (Server $c) {
+            return new \OC\Files\Type\Detection(
+                $c->getURLGenerator(),
+                $c->getLogger(),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MimeTypeDetector', IMimeTypeDetector::class);
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (Server $c) {
+            $manager = new CapabilitiesManager($c->getLogger());
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->getConfig());
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->query(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->getConfig();
+            $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->getUserManager();
+                $user = $manager->get($id);
+                if (is_null($user)) {
+                    $l = $c->getL10N('core');
+                    $displayName = $l->t('Unknown user');
+                } else {
+                    $displayName = $user->getDisplayName();
+                }
+                return $displayName;
+            });
+
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            /*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
 			 * make composer cache the result. Resulting in errors when enabling
 			 * the theming app.
 			 */
-			$prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
-			if (isset($prefixes['OCA\\Theming\\'])) {
-				$classExists = true;
-			} else {
-				$classExists = false;
-			}
-
-			if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				return new ThemingDefaults(
-					$c->getConfig(),
-					$c->getL10N('theming'),
-					$c->getURLGenerator(),
-					$c->getMemCacheFactory(),
-					new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')),
-					new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator(), $this->getMemCacheFactory(), $this->getLogger()),
-					$c->getAppManager(),
-					$c->getNavigationManager()
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->getURLGenerator(),
-				$this->getMemCacheFactory(),
-				$c->getSystemConfig(),
-				$c->getLogger()
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
-		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
-
-		$this->registerService('CryptoWrapper', function (Server $c) {
-			// FIXME: Instantiiated 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->getSecureRandom(),
-				$c->getConfig()
-			);
-
-			return new CryptoWrapper(
-				$c->getConfig(),
-				$c->getCrypto(),
-				$c->getSecureRandom(),
-				$request
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
-		$this->registerService(SessionStorage::class, function (Server $c) {
-			return new SessionStorage($c->getSession());
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
-
-		$this->registerService(\OCP\Share\IManager::class, function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			$factory = new $factoryClass($this);
-
-			$manager = new \OC\Share20\Manager(
-				$c->getLogger(),
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getHasher(),
-				$c->getMountManager(),
-				$c->getGroupManager(),
-				$c->getL10N('lib'),
-				$c->getL10NFactory(),
-				$factory,
-				$c->getUserManager(),
-				$c->getLazyRootFolder(),
-				$c->getEventDispatcher(),
-				$c->getMailer(),
-				$c->getURLGenerator(),
-				$c->getThemingDefaults(),
-				$c->query(IEventDispatcher::class)
-			);
-
-			return $manager;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::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;
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
-		$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->registerService('SettingsManager', function (Server $c) {
-			$manager = new \OC\Settings\Manager(
-				$c->getLogger(),
-				$c->getL10NFactory(),
-				$c->getURLGenerator(),
-				$c
-			);
-			return $manager;
-		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->getRootFolder(),
-				$c->getSystemConfig()
-			);
-		});
-
-		$this->registerService('LockdownManager', function (Server $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->getSession();
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
-			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
-		});
-
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
-			return new CloudIdManager();
-		});
-
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-
-		$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
-			return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
-		});
-
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
-
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
-
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
-
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->getThemingDefaults()
-			);
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
-
-		$this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
-			return $c->query(\OCP\IUserSession::class)->getSession();
-		});
-
-		$this->registerService(IShareHelper::class, function (Server $c) {
-			return new ShareHelper(
-				$c->query(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(Installer::class, function (Server $c) {
-			return new Installer(
-				$c->getAppFetcher(),
-				$c->getHTTPClientService(),
-				$c->getTempManager(),
-				$c->getLogger(),
-				$c->getConfig(),
-				\OC::$CLI
-			);
-		});
-
-		$this->registerService(IApiFactory::class, function (Server $c) {
-			return new ApiFactory($c->getHTTPClientService());
-		});
-
-		$this->registerService(IInstanceFactory::class, function (Server $c) {
-			$memcacheFactory = $c->getMemCacheFactory();
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
-		});
-
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
-
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
-
-		$this->registerAlias(IDashboardManager::class, DashboardManager::class);
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
-
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
-
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
-
-		$this->connectDispatcher();
-	}
-
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->query(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	/**
-	 * @return \OCP\Calendar\IManager
-	 * @deprecated
-	 */
-	public function getCalendarManager() {
-		return $this->query(\OC\Calendar\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Calendar\Resource\IManager
-	 * @deprecated
-	 */
-	public function getCalendarResourceBackendManager() {
-		return $this->query(\OC\Calendar\Resource\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Calendar\Room\IManager
-	 * @deprecated
-	 */
-	public function getCalendarRoomBackendManager() {
-		return $this->query(\OC\Calendar\Room\Manager::class);
-	}
-
-	private function connectDispatcher() {
-		$dispatcher = $this->getEventDispatcher();
-
-		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
-			$logger = $this->getLogger();
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->remove();
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			} catch (\Exception $e) {
-				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
-			}
-		});
-
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-			$feature = $e->getArgument('feature');
-			$oldValue = $e->getArgument('oldValue');
-			$value = $e->getArgument('value');
-
-			// We only change the avatar on display name changes
-			if ($feature !== 'displayName') {
-				return;
-			}
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->userChanged($feature, $oldValue, $value);
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			}
-		});
-
-		/** @var IEventDispatcher $eventDispatched */
-		$eventDispatched = $this->query(IEventDispatcher::class);
-		$eventDispatched->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated
-	 */
-	public function getContactsManager() {
-		return $this->query(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated
-	 */
-	public function getEncryptionManager() {
-		return $this->query(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->query('EncryptionFileHelper');
-	}
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 * @deprecated
-	 */
-	public function getEncryptionKeyStorage() {
-		return $this->query('EncryptionKeyStorage');
-	}
-
-	/**
-	 * 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
-	 */
-	public function getRequest() {
-		return $this->query(IRequest::class);
-	}
-
-	/**
-	 * Returns the preview manager which can create preview images for a given file
-	 *
-	 * @return IPreview
-	 * @deprecated
-	 */
-	public function getPreviewManager() {
-		return $this->query(IPreview::class);
-	}
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return ITagManager
-	 * @deprecated
-	 */
-	public function getTagManager() {
-		return $this->query(ITagManager::class);
-	}
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 * @deprecated
-	 */
-	public function getSystemTagManager() {
-		return $this->query(ISystemTagManager::class);
-	}
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 * @deprecated
-	 */
-	public function getSystemTagObjectMapper() {
-		return $this->query(ISystemTagObjectMapper::class);
-	}
-
-	/**
-	 * Returns the avatar manager, used for avatar functionality
-	 *
-	 * @return IAvatarManager
-	 * @deprecated
-	 */
-	public function getAvatarManager() {
-		return $this->query(IAvatarManager::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated
-	 */
-	public function getRootFolder() {
-		return $this->query(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
-	 */
-	public function getLazyRootFolder() {
-		return $this->query(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->getUserSession()->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->getRootFolder();
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated
-	 */
-	public function getUserManager() {
-		return $this->query(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated
-	 */
-	public function getGroupManager() {
-		return $this->query(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated
-	 */
-	public function getUserSession() {
-		return $this->query(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated
-	 */
-	public function getSession() {
-		return $this->getUserSession()->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->query(SessionStorage::class)->setSession($session);
-		$this->getUserSession()->setSession($session);
-		$this->query(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OC\Authentication\TwoFactorAuth\Manager
-	 * @deprecated
-	 */
-	public function getTwoFactorAuthManager() {
-		return $this->query(\OC\Authentication\TwoFactorAuth\Manager::class);
-	}
-
-	/**
-	 * @return \OC\NavigationManager
-	 * @deprecated
-	 */
-	public function getNavigationManager() {
-		return $this->query(INavigationManager::class);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated
-	 */
-	public function getConfig() {
-		return $this->query(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated
-	 */
-	public function getSystemConfig() {
-		return $this->query(SystemConfig::class);
-	}
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return IAppConfig
-	 * @deprecated
-	 */
-	public function getAppConfig() {
-		return $this->query(IAppConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated
-	 */
-	public function getL10NFactory() {
-		return $this->query(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->getL10NFactory()->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated
-	 */
-	public function getURLGenerator() {
-		return $this->query(IURLGenerator::class);
-	}
-
-	/**
-	 * @return AppFetcher
-	 * @deprecated
-	 */
-	public function getAppFetcher() {
-		return $this->query(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->query(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated
-	 */
-	public function getMemCacheFactory() {
-		return $this->query(Factory::class);
-	}
-
-	/**
-	 * Returns an \OC\RedisFactory instance
-	 *
-	 * @return \OC\RedisFactory
-	 * @deprecated
-	 */
-	public function getGetRedisFactory() {
-		return $this->query('RedisFactory');
-	}
-
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated
-	 */
-	public function getDatabaseConnection() {
-		return $this->query(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated
-	 */
-	public function getActivityManager() {
-		return $this->query(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated
-	 */
-	public function getJobList() {
-		return $this->query(IJobList::class);
-	}
-
-	/**
-	 * Returns a logger instance
-	 *
-	 * @return ILogger
-	 * @deprecated
-	 */
-	public function getLogger() {
-		return $this->query(ILogger::class);
-	}
-
-	/**
-	 * @return ILogFactory
-	 * @throws \OCP\AppFramework\QueryException
-	 * @deprecated
-	 */
-	public function getLogFactory() {
-		return $this->query(ILogFactory::class);
-	}
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return IRouter
-	 * @deprecated
-	 */
-	public function getRouter() {
-		return $this->query(IRouter::class);
-	}
-
-	/**
-	 * Returns a search instance
-	 *
-	 * @return ISearch
-	 * @deprecated
-	 */
-	public function getSearch() {
-		return $this->query(ISearch::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated
-	 */
-	public function getSecureRandom() {
-		return $this->query(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated
-	 */
-	public function getCrypto() {
-		return $this->query(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated
-	 */
-	public function getHasher() {
-		return $this->query(IHasher::class);
-	}
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return ICredentialsManager
-	 * @deprecated
-	 */
-	public function getCredentialsManager() {
-		return $this->query(ICredentialsManager::class);
-	}
-
-	/**
-	 * Get the certificate manager for the user
-	 *
-	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
-	 * @deprecated
-	 */
-	public function getCertificateManager($userId = '') {
-		if ($userId === '') {
-			$userSession = $this->getUserSession();
-			$user = $userSession->getUser();
-			if (is_null($user)) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		return new CertificateManager(
-			$userId,
-			new View(),
-			$this->getConfig(),
-			$this->getLogger(),
-			$this->getSecureRandom()
-		);
-	}
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return IClientService
-	 * @deprecated
-	 */
-	public function getHTTPClientService() {
-		return $this->query(IClientService::class);
-	}
-
-	/**
-	 * Create a new event source
-	 *
-	 * @return \OCP\IEventSource
-	 * @deprecated
-	 */
-	public function createEventSource() {
-		return new \OC_EventSource();
-	}
-
-	/**
-	 * Get the active event logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return IEventLogger
-	 * @deprecated
-	 */
-	public function getEventLogger() {
-		return $this->query(IEventLogger::class);
-	}
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return IQueryLogger
-	 * @deprecated
-	 */
-	public function getQueryLogger() {
-		return $this->query(IQueryLogger::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated
-	 */
-	public function getTempManager() {
-		return $this->query(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated
-	 */
-	public function getAppManager() {
-		return $this->query(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated
-	 */
-	public function getMailer() {
-		return $this->query(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * @return \OC\OCSClient
-	 * @deprecated
-	 */
-	public function getOcsClient() {
-		return $this->query('OcsClient');
-	}
-
-	/**
-	 * @return IDateTimeZone
-	 * @deprecated
-	 */
-	public function getDateTimeZone() {
-		return $this->query(IDateTimeZone::class);
-	}
-
-	/**
-	 * @return IDateTimeFormatter
-	 * @deprecated
-	 */
-	public function getDateTimeFormatter() {
-		return $this->query(IDateTimeFormatter::class);
-	}
-
-	/**
-	 * @return IMountProviderCollection
-	 * @deprecated
-	 */
-	public function getMountProviderCollection() {
-		return $this->query(IMountProviderCollection::class);
-	}
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return IniGetWrapper
-	 * @deprecated
-	 */
-	public function getIniWrapper() {
-		return $this->query('IniWrapper');
-	}
-
-	/**
-	 * @return \OCP\Command\IBus
-	 * @deprecated
-	 */
-	public function getCommandBus() {
-		return $this->query('AsyncCommandBus');
-	}
-
-	/**
-	 * Get the trusted domain helper
-	 *
-	 * @return TrustedDomainHelper
-	 * @deprecated
-	 */
-	public function getTrustedDomainHelper() {
-		return $this->query('TrustedDomainHelper');
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated
-	 */
-	public function getLockingProvider() {
-		return $this->query(ILockingProvider::class);
-	}
-
-	/**
-	 * @return IMountManager
-	 * @deprecated
-	 **/
-	public function getMountManager() {
-		return $this->query(IMountManager::class);
-	}
-
-	/**
-	 * @return IUserMountCache
-	 * @deprecated
-	 */
-	public function getUserMountCache() {
-		return $this->query(IUserMountCache::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated
-	 */
-	public function getMimeTypeDetector() {
-		return $this->query(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated
-	 */
-	public function getMimeTypeLoader() {
-		return $this->query(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the manager of all the capabilities
-	 *
-	 * @return CapabilitiesManager
-	 * @deprecated
-	 */
-	public function getCapabilitiesManager() {
-		return $this->query(CapabilitiesManager::class);
-	}
-
-	/**
-	 * Get the EventDispatcher
-	 *
-	 * @return EventDispatcherInterface
-	 * @since 8.2.0
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
-	 */
-	public function getEventDispatcher() {
-		return $this->query(\OC\EventDispatcher\SymfonyAdapter::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated
-	 */
-	public function getNotificationManager() {
-		return $this->query(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return ICommentsManager
-	 * @deprecated
-	 */
-	public function getCommentsManager() {
-		return $this->query(ICommentsManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated
-	 */
-	public function getThemingDefaults() {
-		return $this->query('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->query('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return \OC\Session\CryptoWrapper
-	 * @deprecated
-	 */
-	public function getSessionCryptoWrapper() {
-		return $this->query('CryptoWrapper');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated
-	 */
-	public function getCsrfTokenManager() {
-		return $this->query(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return Throttler
-	 * @deprecated
-	 */
-	public function getBruteForceThrottler() {
-		return $this->query(Throttler::class);
-	}
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 * @deprecated
-	 */
-	public function getContentSecurityPolicyManager() {
-		return $this->query(ContentSecurityPolicyManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->query(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 * @deprecated
-	 */
-	public function getStoragesBackendService() {
-		return $this->query(BackendService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
-	 * @deprecated
-	 */
-	public function getGlobalStoragesService() {
-		return $this->query(GlobalStoragesService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
-	 * @deprecated
-	 */
-	public function getUserGlobalStoragesService() {
-		return $this->query(UserGlobalStoragesService::class);
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserStoragesService
-	 * @deprecated
-	 */
-	public function getUserStoragesService() {
-		return $this->query(UserStoragesService::class);
-	}
-
-	/**
-	 * @return \OCP\Share\IManager
-	 * @deprecated
-	 */
-	public function getShareManager() {
-		return $this->query(\OCP\Share\IManager::class);
-	}
-
-	/**
-	 * @return \OCP\Collaboration\Collaborators\ISearch
-	 * @deprecated
-	 */
-	public function getCollaboratorSearch() {
-		return $this->query(\OCP\Collaboration\Collaborators\ISearch::class);
-	}
-
-	/**
-	 * @return \OCP\Collaboration\AutoComplete\IManager
-	 * @deprecated
-	 */
-	public function getAutoCompleteManager() {
-		return $this->query(IManager::class);
-	}
-
-	/**
-	 * Returns the LDAP Provider
-	 *
-	 * @return \OCP\LDAP\ILDAPProvider
-	 * @deprecated
-	 */
-	public function getLDAPProvider() {
-		return $this->query('LDAPProvider');
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated
-	 */
-	public function getSettingsManager() {
-		return $this->query('SettingsManager');
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated
-	 */
-	public function getAppDataDir($app) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$factory = $this->query(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Lockdown\ILockdownManager
-	 * @deprecated
-	 */
-	public function getLockdownManager() {
-		return $this->query('LockdownManager');
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated
-	 */
-	public function getCloudIdManager() {
-		return $this->query(ICloudIdManager::class);
-	}
-
-	/**
-	 * @return \OCP\GlobalScale\IConfig
-	 * @deprecated
-	 */
-	public function getGlobalScaleConfig() {
-		return $this->query(IConfig::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationProviderManager
-	 * @deprecated
-	 */
-	public function getCloudFederationProviderManager() {
-		return $this->query(ICloudFederationProviderManager::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\Api\IApiFactory
-	 * @deprecated
-	 */
-	public function getRemoteApiFactory() {
-		return $this->query(IApiFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudFederationFactory
-	 * @deprecated
-	 */
-	public function getCloudFederationFactory() {
-		return $this->query(ICloudFederationFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\IInstanceFactory
-	 * @deprecated
-	 */
-	public function getRemoteInstanceFactory() {
-		return $this->query(IInstanceFactory::class);
-	}
-
-	/**
-	 * @return IStorageFactory
-	 * @deprecated
-	 */
-	public function getStorageFactory() {
-		return $this->query(IStorageFactory::class);
-	}
-
-	/**
-	 * Get the Preview GeneratorHelper
-	 *
-	 * @return GeneratorHelper
-	 * @since 17.0.0
-	 * @deprecated
-	 */
-	public function getGeneratorHelper() {
-		return $this->query(\OC\Preview\GeneratorHelper::class);
-	}
-
-	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
-			try {
-				/** @var ILogger $logger */
-				$logger = $container->get(ILogger::class);
-				$logger->debug('The requested alias "' . $alias . '" is depreacted. 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);
-	}
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
+            if (isset($prefixes['OCA\\Theming\\'])) {
+                $classExists = true;
+            } else {
+                $classExists = false;
+            }
+
+            if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                return new ThemingDefaults(
+                    $c->getConfig(),
+                    $c->getL10N('theming'),
+                    $c->getURLGenerator(),
+                    $c->getMemCacheFactory(),
+                    new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')),
+                    new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator(), $this->getMemCacheFactory(), $this->getLogger()),
+                    $c->getAppManager(),
+                    $c->getNavigationManager()
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->getURLGenerator(),
+                $this->getMemCacheFactory(),
+                $c->getSystemConfig(),
+                $c->getLogger()
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
+        $this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
+
+        $this->registerService('CryptoWrapper', function (Server $c) {
+            // FIXME: Instantiiated 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->getSecureRandom(),
+                $c->getConfig()
+            );
+
+            return new CryptoWrapper(
+                $c->getConfig(),
+                $c->getCrypto(),
+                $c->getSecureRandom(),
+                $request
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
+        $this->registerService(SessionStorage::class, function (Server $c) {
+            return new SessionStorage($c->getSession());
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
+
+        $this->registerService(\OCP\Share\IManager::class, function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            $factory = new $factoryClass($this);
+
+            $manager = new \OC\Share20\Manager(
+                $c->getLogger(),
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getHasher(),
+                $c->getMountManager(),
+                $c->getGroupManager(),
+                $c->getL10N('lib'),
+                $c->getL10NFactory(),
+                $factory,
+                $c->getUserManager(),
+                $c->getLazyRootFolder(),
+                $c->getEventDispatcher(),
+                $c->getMailer(),
+                $c->getURLGenerator(),
+                $c->getThemingDefaults(),
+                $c->query(IEventDispatcher::class)
+            );
+
+            return $manager;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::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;
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
+        $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->registerService('SettingsManager', function (Server $c) {
+            $manager = new \OC\Settings\Manager(
+                $c->getLogger(),
+                $c->getL10NFactory(),
+                $c->getURLGenerator(),
+                $c
+            );
+            return $manager;
+        });
+        $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->getRootFolder(),
+                $c->getSystemConfig()
+            );
+        });
+
+        $this->registerService('LockdownManager', function (Server $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->getSession();
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
+            return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
+        });
+
+        $this->registerService(ICloudIdManager::class, function (Server $c) {
+            return new CloudIdManager();
+        });
+
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+
+        $this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
+            return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
+        });
+
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
+
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
+
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
+
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->getThemingDefaults()
+            );
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
+
+        $this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
+            return $c->query(\OCP\IUserSession::class)->getSession();
+        });
+
+        $this->registerService(IShareHelper::class, function (Server $c) {
+            return new ShareHelper(
+                $c->query(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(Installer::class, function (Server $c) {
+            return new Installer(
+                $c->getAppFetcher(),
+                $c->getHTTPClientService(),
+                $c->getTempManager(),
+                $c->getLogger(),
+                $c->getConfig(),
+                \OC::$CLI
+            );
+        });
+
+        $this->registerService(IApiFactory::class, function (Server $c) {
+            return new ApiFactory($c->getHTTPClientService());
+        });
+
+        $this->registerService(IInstanceFactory::class, function (Server $c) {
+            $memcacheFactory = $c->getMemCacheFactory();
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
+        });
+
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
+
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
+
+        $this->registerAlias(IDashboardManager::class, DashboardManager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
+
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
+
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+
+        $this->connectDispatcher();
+    }
+
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->query(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    /**
+     * @return \OCP\Calendar\IManager
+     * @deprecated
+     */
+    public function getCalendarManager() {
+        return $this->query(\OC\Calendar\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Calendar\Resource\IManager
+     * @deprecated
+     */
+    public function getCalendarResourceBackendManager() {
+        return $this->query(\OC\Calendar\Resource\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Calendar\Room\IManager
+     * @deprecated
+     */
+    public function getCalendarRoomBackendManager() {
+        return $this->query(\OC\Calendar\Room\Manager::class);
+    }
+
+    private function connectDispatcher() {
+        $dispatcher = $this->getEventDispatcher();
+
+        // Delete avatar on user deletion
+        $dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
+            $logger = $this->getLogger();
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->remove();
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            } catch (\Exception $e) {
+                // Ignore exceptions
+                $logger->info('Could not cleanup avatar of ' . $user->getUID());
+            }
+        });
+
+        $dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+            $feature = $e->getArgument('feature');
+            $oldValue = $e->getArgument('oldValue');
+            $value = $e->getArgument('value');
+
+            // We only change the avatar on display name changes
+            if ($feature !== 'displayName') {
+                return;
+            }
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->userChanged($feature, $oldValue, $value);
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            }
+        });
+
+        /** @var IEventDispatcher $eventDispatched */
+        $eventDispatched = $this->query(IEventDispatcher::class);
+        $eventDispatched->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated
+     */
+    public function getContactsManager() {
+        return $this->query(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated
+     */
+    public function getEncryptionManager() {
+        return $this->query(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->query('EncryptionFileHelper');
+    }
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     * @deprecated
+     */
+    public function getEncryptionKeyStorage() {
+        return $this->query('EncryptionKeyStorage');
+    }
+
+    /**
+     * 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
+     */
+    public function getRequest() {
+        return $this->query(IRequest::class);
+    }
+
+    /**
+     * Returns the preview manager which can create preview images for a given file
+     *
+     * @return IPreview
+     * @deprecated
+     */
+    public function getPreviewManager() {
+        return $this->query(IPreview::class);
+    }
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return ITagManager
+     * @deprecated
+     */
+    public function getTagManager() {
+        return $this->query(ITagManager::class);
+    }
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return ISystemTagManager
+     *
+     * @since 9.0.0
+     * @deprecated
+     */
+    public function getSystemTagManager() {
+        return $this->query(ISystemTagManager::class);
+    }
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     * @deprecated
+     */
+    public function getSystemTagObjectMapper() {
+        return $this->query(ISystemTagObjectMapper::class);
+    }
+
+    /**
+     * Returns the avatar manager, used for avatar functionality
+     *
+     * @return IAvatarManager
+     * @deprecated
+     */
+    public function getAvatarManager() {
+        return $this->query(IAvatarManager::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated
+     */
+    public function getRootFolder() {
+        return $this->query(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
+     */
+    public function getLazyRootFolder() {
+        return $this->query(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->getUserSession()->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->getRootFolder();
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated
+     */
+    public function getUserManager() {
+        return $this->query(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated
+     */
+    public function getGroupManager() {
+        return $this->query(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated
+     */
+    public function getUserSession() {
+        return $this->query(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated
+     */
+    public function getSession() {
+        return $this->getUserSession()->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->query(SessionStorage::class)->setSession($session);
+        $this->getUserSession()->setSession($session);
+        $this->query(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OC\Authentication\TwoFactorAuth\Manager
+     * @deprecated
+     */
+    public function getTwoFactorAuthManager() {
+        return $this->query(\OC\Authentication\TwoFactorAuth\Manager::class);
+    }
+
+    /**
+     * @return \OC\NavigationManager
+     * @deprecated
+     */
+    public function getNavigationManager() {
+        return $this->query(INavigationManager::class);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated
+     */
+    public function getConfig() {
+        return $this->query(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated
+     */
+    public function getSystemConfig() {
+        return $this->query(SystemConfig::class);
+    }
+
+    /**
+     * Returns the app config manager
+     *
+     * @return IAppConfig
+     * @deprecated
+     */
+    public function getAppConfig() {
+        return $this->query(IAppConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated
+     */
+    public function getL10NFactory() {
+        return $this->query(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->getL10NFactory()->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated
+     */
+    public function getURLGenerator() {
+        return $this->query(IURLGenerator::class);
+    }
+
+    /**
+     * @return AppFetcher
+     * @deprecated
+     */
+    public function getAppFetcher() {
+        return $this->query(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->query(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated
+     */
+    public function getMemCacheFactory() {
+        return $this->query(Factory::class);
+    }
+
+    /**
+     * Returns an \OC\RedisFactory instance
+     *
+     * @return \OC\RedisFactory
+     * @deprecated
+     */
+    public function getGetRedisFactory() {
+        return $this->query('RedisFactory');
+    }
+
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated
+     */
+    public function getDatabaseConnection() {
+        return $this->query(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated
+     */
+    public function getActivityManager() {
+        return $this->query(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated
+     */
+    public function getJobList() {
+        return $this->query(IJobList::class);
+    }
+
+    /**
+     * Returns a logger instance
+     *
+     * @return ILogger
+     * @deprecated
+     */
+    public function getLogger() {
+        return $this->query(ILogger::class);
+    }
+
+    /**
+     * @return ILogFactory
+     * @throws \OCP\AppFramework\QueryException
+     * @deprecated
+     */
+    public function getLogFactory() {
+        return $this->query(ILogFactory::class);
+    }
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return IRouter
+     * @deprecated
+     */
+    public function getRouter() {
+        return $this->query(IRouter::class);
+    }
+
+    /**
+     * Returns a search instance
+     *
+     * @return ISearch
+     * @deprecated
+     */
+    public function getSearch() {
+        return $this->query(ISearch::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated
+     */
+    public function getSecureRandom() {
+        return $this->query(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated
+     */
+    public function getCrypto() {
+        return $this->query(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated
+     */
+    public function getHasher() {
+        return $this->query(IHasher::class);
+    }
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return ICredentialsManager
+     * @deprecated
+     */
+    public function getCredentialsManager() {
+        return $this->query(ICredentialsManager::class);
+    }
+
+    /**
+     * Get the certificate manager for the user
+     *
+     * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
+     * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
+     * @deprecated
+     */
+    public function getCertificateManager($userId = '') {
+        if ($userId === '') {
+            $userSession = $this->getUserSession();
+            $user = $userSession->getUser();
+            if (is_null($user)) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        return new CertificateManager(
+            $userId,
+            new View(),
+            $this->getConfig(),
+            $this->getLogger(),
+            $this->getSecureRandom()
+        );
+    }
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return IClientService
+     * @deprecated
+     */
+    public function getHTTPClientService() {
+        return $this->query(IClientService::class);
+    }
+
+    /**
+     * Create a new event source
+     *
+     * @return \OCP\IEventSource
+     * @deprecated
+     */
+    public function createEventSource() {
+        return new \OC_EventSource();
+    }
+
+    /**
+     * Get the active event logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return IEventLogger
+     * @deprecated
+     */
+    public function getEventLogger() {
+        return $this->query(IEventLogger::class);
+    }
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return IQueryLogger
+     * @deprecated
+     */
+    public function getQueryLogger() {
+        return $this->query(IQueryLogger::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated
+     */
+    public function getTempManager() {
+        return $this->query(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated
+     */
+    public function getAppManager() {
+        return $this->query(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated
+     */
+    public function getMailer() {
+        return $this->query(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * @return \OC\OCSClient
+     * @deprecated
+     */
+    public function getOcsClient() {
+        return $this->query('OcsClient');
+    }
+
+    /**
+     * @return IDateTimeZone
+     * @deprecated
+     */
+    public function getDateTimeZone() {
+        return $this->query(IDateTimeZone::class);
+    }
+
+    /**
+     * @return IDateTimeFormatter
+     * @deprecated
+     */
+    public function getDateTimeFormatter() {
+        return $this->query(IDateTimeFormatter::class);
+    }
+
+    /**
+     * @return IMountProviderCollection
+     * @deprecated
+     */
+    public function getMountProviderCollection() {
+        return $this->query(IMountProviderCollection::class);
+    }
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return IniGetWrapper
+     * @deprecated
+     */
+    public function getIniWrapper() {
+        return $this->query('IniWrapper');
+    }
+
+    /**
+     * @return \OCP\Command\IBus
+     * @deprecated
+     */
+    public function getCommandBus() {
+        return $this->query('AsyncCommandBus');
+    }
+
+    /**
+     * Get the trusted domain helper
+     *
+     * @return TrustedDomainHelper
+     * @deprecated
+     */
+    public function getTrustedDomainHelper() {
+        return $this->query('TrustedDomainHelper');
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated
+     */
+    public function getLockingProvider() {
+        return $this->query(ILockingProvider::class);
+    }
+
+    /**
+     * @return IMountManager
+     * @deprecated
+     **/
+    public function getMountManager() {
+        return $this->query(IMountManager::class);
+    }
+
+    /**
+     * @return IUserMountCache
+     * @deprecated
+     */
+    public function getUserMountCache() {
+        return $this->query(IUserMountCache::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated
+     */
+    public function getMimeTypeDetector() {
+        return $this->query(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated
+     */
+    public function getMimeTypeLoader() {
+        return $this->query(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the manager of all the capabilities
+     *
+     * @return CapabilitiesManager
+     * @deprecated
+     */
+    public function getCapabilitiesManager() {
+        return $this->query(CapabilitiesManager::class);
+    }
+
+    /**
+     * Get the EventDispatcher
+     *
+     * @return EventDispatcherInterface
+     * @since 8.2.0
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
+     */
+    public function getEventDispatcher() {
+        return $this->query(\OC\EventDispatcher\SymfonyAdapter::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated
+     */
+    public function getNotificationManager() {
+        return $this->query(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return ICommentsManager
+     * @deprecated
+     */
+    public function getCommentsManager() {
+        return $this->query(ICommentsManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated
+     */
+    public function getThemingDefaults() {
+        return $this->query('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->query('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return \OC\Session\CryptoWrapper
+     * @deprecated
+     */
+    public function getSessionCryptoWrapper() {
+        return $this->query('CryptoWrapper');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated
+     */
+    public function getCsrfTokenManager() {
+        return $this->query(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return Throttler
+     * @deprecated
+     */
+    public function getBruteForceThrottler() {
+        return $this->query(Throttler::class);
+    }
+
+    /**
+     * @return IContentSecurityPolicyManager
+     * @deprecated
+     */
+    public function getContentSecurityPolicyManager() {
+        return $this->query(ContentSecurityPolicyManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->query(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     * @deprecated
+     */
+    public function getStoragesBackendService() {
+        return $this->query(BackendService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\GlobalStoragesService
+     * @deprecated
+     */
+    public function getGlobalStoragesService() {
+        return $this->query(GlobalStoragesService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
+     * @deprecated
+     */
+    public function getUserGlobalStoragesService() {
+        return $this->query(UserGlobalStoragesService::class);
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserStoragesService
+     * @deprecated
+     */
+    public function getUserStoragesService() {
+        return $this->query(UserStoragesService::class);
+    }
+
+    /**
+     * @return \OCP\Share\IManager
+     * @deprecated
+     */
+    public function getShareManager() {
+        return $this->query(\OCP\Share\IManager::class);
+    }
+
+    /**
+     * @return \OCP\Collaboration\Collaborators\ISearch
+     * @deprecated
+     */
+    public function getCollaboratorSearch() {
+        return $this->query(\OCP\Collaboration\Collaborators\ISearch::class);
+    }
+
+    /**
+     * @return \OCP\Collaboration\AutoComplete\IManager
+     * @deprecated
+     */
+    public function getAutoCompleteManager() {
+        return $this->query(IManager::class);
+    }
+
+    /**
+     * Returns the LDAP Provider
+     *
+     * @return \OCP\LDAP\ILDAPProvider
+     * @deprecated
+     */
+    public function getLDAPProvider() {
+        return $this->query('LDAPProvider');
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated
+     */
+    public function getSettingsManager() {
+        return $this->query('SettingsManager');
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated
+     */
+    public function getAppDataDir($app) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $factory = $this->query(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Lockdown\ILockdownManager
+     * @deprecated
+     */
+    public function getLockdownManager() {
+        return $this->query('LockdownManager');
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated
+     */
+    public function getCloudIdManager() {
+        return $this->query(ICloudIdManager::class);
+    }
+
+    /**
+     * @return \OCP\GlobalScale\IConfig
+     * @deprecated
+     */
+    public function getGlobalScaleConfig() {
+        return $this->query(IConfig::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationProviderManager
+     * @deprecated
+     */
+    public function getCloudFederationProviderManager() {
+        return $this->query(ICloudFederationProviderManager::class);
+    }
+
+    /**
+     * @return \OCP\Remote\Api\IApiFactory
+     * @deprecated
+     */
+    public function getRemoteApiFactory() {
+        return $this->query(IApiFactory::class);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudFederationFactory
+     * @deprecated
+     */
+    public function getCloudFederationFactory() {
+        return $this->query(ICloudFederationFactory::class);
+    }
+
+    /**
+     * @return \OCP\Remote\IInstanceFactory
+     * @deprecated
+     */
+    public function getRemoteInstanceFactory() {
+        return $this->query(IInstanceFactory::class);
+    }
+
+    /**
+     * @return IStorageFactory
+     * @deprecated
+     */
+    public function getStorageFactory() {
+        return $this->query(IStorageFactory::class);
+    }
+
+    /**
+     * Get the Preview GeneratorHelper
+     *
+     * @return GeneratorHelper
+     * @since 17.0.0
+     * @deprecated
+     */
+    public function getGeneratorHelper() {
+        return $this->query(\OC\Preview\GeneratorHelper::class);
+    }
+
+    private function registerDeprecatedAlias(string $alias, string $target) {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+            try {
+                /** @var ILogger $logger */
+                $logger = $container->get(ILogger::class);
+                $logger->debug('The requested alias "' . $alias . '" is depreacted. 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);
+    }
 }

Spacing +98 added lines, -98 removed lines

@@ -258,10 +258,10 @@ 
 		$this->registerParameter('isCLI', \OC::$CLI);
 		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
 
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(ContainerInterface::class, function(ContainerInterface $c) {
 			return $c;
 		});
-		$this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IServerContainer::class, function(ContainerInterface $c) {
 			return $c;
 		});
 
@@ -286,7 +286,7 @@ 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
 
-		$this->registerService(IPreview::class, function (Server $c) {
+		$this->registerService(IPreview::class, function(Server $c) {
 			return new PreviewManager(
 				$c->getConfig(),
 				$c->getRootFolder(),
@@ -299,13 +299,13 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('PreviewManager', IPreview::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(Server $c) {
 			return new \OC\Preview\Watcher(
 				new \OC\Preview\Storage\Root($c->getRootFolder(), $c->getSystemConfig())
 			);
 		});
 
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Encryption\IManager::class, function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -325,7 +325,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('EncryptionManager', \OCP\Encryption\IManager::class);
 
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
+		$this->registerService('EncryptionFileHelper', function(Server $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->getUserManager(),
@@ -339,7 +339,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
+		$this->registerService('EncryptionKeyStorage', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -357,21 +357,21 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
+		$this->registerService('SystemTagManagerFactory', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$this->registerService(ISystemTagManager::class, function (Server $c) {
+		$this->registerService(ISystemTagManager::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getManager();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
 
-		$this->registerService(ISystemTagObjectMapper::class, function (Server $c) {
+		$this->registerService(ISystemTagObjectMapper::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function (Server $c) {
+		$this->registerService('RootFolder', function(Server $c) {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root(
@@ -388,7 +388,7 @@ 
 
 			return $root;
 		});
-		$this->registerService(HookConnector::class, function (Server $c) {
+		$this->registerService(HookConnector::class, function(Server $c) {
 			return new HookConnector(
 				$c->query(IRootFolder::class),
 				new View(),
@@ -400,8 +400,8 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class);
 
-		$this->registerService(IRootFolder::class, function (Server $c) {
-			return new LazyRoot(function () use ($c) {
+		$this->registerService(IRootFolder::class, function(Server $c) {
+			return new LazyRoot(function() use ($c) {
 				return $c->query('RootFolder');
 			});
 		});
@@ -412,44 +412,44 @@ 
 		$this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class);
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(Server $c) {
 			$groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $this->getLogger());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+			$groupManager->listen('\OC\Group', 'preCreate', function($gid) {
 				\OC_Hook::emit('OC_Group', 'pre_createGroup', ['run' => true, 'gid' => $gid]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid));
 			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_User', 'post_createGroup', ['gid' => $group->getGID()]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new GroupCreatedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', ['run' => true, 'gid' => $group->getGID()]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_User', 'post_deleteGroup', ['gid' => $group->getGID()]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new GroupDeletedEvent($group));
 			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				\OC_Hook::emit('OC_Group', 'pre_addToGroup', ['run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				\OC_Hook::emit('OC_Group', 'post_addToGroup', ['uid' => $user->getUID(), 'gid' => $group->getGID()]);
 				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
 				\OC_Hook::emit('OC_User', 'post_addToGroup', ['uid' => $user->getUID(), 'gid' => $group->getGID()]);
@@ -458,12 +458,12 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserAddedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user));
 			});
-			$groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserRemovedEvent($group, $user));
@@ -473,7 +473,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class);
 
-		$this->registerService(Store::class, function (Server $c) {
+		$this->registerService(Store::class, function(Server $c) {
 			$session = $c->getSession();
 			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 				$tokenProvider = $c->query(IProvider::class);
@@ -486,7 +486,7 @@ 
 		$this->registerAlias(IStore::class, Store::class);
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
 
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
+		$this->registerService(\OC\User\Session::class, function(Server $c) {
 			$manager = $c->getUserManager();
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -511,14 +511,14 @@ 
 				$c->getLogger(),
 				$c->query(IEventDispatcher::class)
 			);
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
 			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$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]);
 
@@ -526,7 +526,7 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
 			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) use ($legacyDispatcher) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
 				$legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
@@ -535,7 +535,7 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserDeletedEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
 
@@ -543,7 +543,7 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserDeletedEvent($user));
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$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]);
 
@@ -551,7 +551,7 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $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]);
 
@@ -559,14 +559,14 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$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->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password, $isTokenLogin) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $password, $isTokenLogin) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
 
@@ -574,12 +574,12 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $password, $isTokenLogin));
 			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+			$userSession->listen('\OC\User', 'preRememberedLogin', function($uid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$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]);
 
@@ -587,19 +587,19 @@ 
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
+			$userSession->listen('\OC\User', 'logout', function($user) {
 				\OC_Hook::emit('OC_User', 'logout', []);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
+			$userSession->listen('\OC\User', 'postLogout', function($user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->query(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+			$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]);
 
@@ -623,7 +623,7 @@ 
 		$this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class);
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+		$this->registerService(\OC\SystemConfig::class, function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 		/** @deprecated 19.0.0 */
@@ -633,7 +633,7 @@ 
 		$this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class);
 		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
 
-		$this->registerService(IFactory::class, function (Server $c) {
+		$this->registerService(IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->getConfig(),
 				$c->getRequest(),
@@ -653,13 +653,13 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class);
 
-		$this->registerService(ICache::class, function ($c) {
+		$this->registerService(ICache::class, function($c) {
 			return new Cache\File();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('UserCache', ICache::class);
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
 				ArrayCache::class,
 				ArrayCache::class,
@@ -673,7 +673,7 @@ 
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path);
 				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -686,12 +686,12 @@ 
 		$this->registerDeprecatedAlias('MemCacheFactory', Factory::class);
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			return new RedisFactory($systemConfig);
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			$l10n = $this->get(IFactory::class)->get('activity');
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
@@ -704,14 +704,14 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class);
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$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) {
+		$this->registerService(AvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->query(\OC\User\Manager::class),
 				$c->getAppDataDir('avatar'),
@@ -727,7 +727,7 @@ 
 		$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->registerService(\OC\Log::class, function (Server $c) {
+		$this->registerService(\OC\Log::class, function(Server $c) {
 			$logType = $c->query(AllConfig::class)->getSystemValue('log_type', 'file');
 			$factory = new LogFactory($c, $this->getSystemConfig());
 			$logger = $factory->get($logType);
@@ -741,7 +741,7 @@ 
 		// PSR-3 logger
 		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
 
-		$this->registerService(ILogFactory::class, function (Server $c) {
+		$this->registerService(ILogFactory::class, function(Server $c) {
 			return new LogFactory($c, $this->getSystemConfig());
 		});
 
@@ -749,7 +749,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('JobList', IJobList::class);
 
-		$this->registerService(IRouter::class, function (Server $c) {
+		$this->registerService(IRouter::class, function(Server $c) {
 			$cacheFactory = $c->getMemCacheFactory();
 			$logger = $c->getLogger();
 			if ($cacheFactory->isLocalCacheAvailable()) {
@@ -766,7 +766,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Search', ISearch::class);
 
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			return new \OC\Security\RateLimiting\Backend\MemoryCache(
 				$this->getMemCacheFactory(),
 				new \OC\AppFramework\Utility\TimeFactory()
@@ -789,7 +789,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class);
 
-		$this->registerService(IDBConnection::class, function (Server $c) {
+		$this->registerService(IDBConnection::class, function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -805,7 +805,7 @@ 
 		$this->registerDeprecatedAlias('DatabaseConnection', IDBConnection::class);
 
 
-		$this->registerService(IClientService::class, function (Server $c) {
+		$this->registerService(IClientService::class, function(Server $c) {
 			$user = \OC_User::getUser();
 			$uid = $user ? $user : null;
 			return new ClientService(
@@ -822,7 +822,7 @@ 
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (Server $c) {
+		$this->registerService(IEventLogger::class, function(Server $c) {
 			$eventLogger = new EventLogger();
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -833,7 +833,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('EventLogger', IEventLogger::class);
 
-		$this->registerService(IQueryLogger::class, function (Server $c) {
+		$this->registerService(IQueryLogger::class, function(Server $c) {
 			$queryLogger = new QueryLogger();
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -848,7 +848,7 @@ 
 		$this->registerDeprecatedAlias('TempManager', TempManager::class);
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (Server $c) {
+		$this->registerService(AppManager::class, function(Server $c) {
 			return new \OC\App\AppManager(
 				$c->getUserSession(),
 				$c->getConfig(),
@@ -867,7 +867,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class);
 
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -878,7 +878,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class);
 
-		$this->registerService(IUserMountCache::class, function (Server $c) {
+		$this->registerService(IUserMountCache::class, function(Server $c) {
 			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->getUserManager());
@@ -887,7 +887,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class);
 
-		$this->registerService(IMountProviderCollection::class, function (Server $c) {
+		$this->registerService(IMountProviderCollection::class, function(Server $c) {
 			$loader = \OC\Files\Filesystem::getLoader();
 			$mountCache = $c->query(IUserMountCache::class);
 			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
@@ -908,7 +908,7 @@ 
 
 		/** @deprecated 20.0.0 */
 		$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class);
-		$this->registerService('AsyncCommandBus', function (Server $c) {
+		$this->registerService('AsyncCommandBus', function(Server $c) {
 			$busClass = $c->getConfig()->getSystemValue('commandbus');
 			if ($busClass) {
 				[$app, $class] = explode('::', $busClass, 2);
@@ -928,7 +928,7 @@ 
 		$this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Throttler', Throttler::class);
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
+		$this->registerService('IntegrityCodeChecker', function(Server $c) {
 			// IConfig and IAppManager requires a working database. This code
 			// might however be called when ownCloud is not yet setup.
 			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
@@ -950,7 +950,7 @@ 
 				$c->getMimeTypeDetector()
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function ($c) {
+		$this->registerService(\OCP\IRequest::class, function($c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -987,7 +987,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Request', \OCP\IRequest::class);
 
-		$this->registerService(IMailer::class, function (Server $c) {
+		$this->registerService(IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->getConfig(),
 				$c->getLogger(),
@@ -1001,7 +1001,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Mailer', IMailer::class);
 
-		$this->registerService('LDAPProvider', function (Server $c) {
+		$this->registerService('LDAPProvider', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass)) {
@@ -1011,7 +1011,7 @@ 
 			$factory = new $factoryClass($this);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (Server $c) {
+		$this->registerService(ILockingProvider::class, function(Server $c) {
 			$ini = $c->getIniWrapper();
 			$config = $c->getConfig();
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -1039,12 +1039,12 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('MountManager', IMountManager::class);
 
-		$this->registerService(IMimeTypeDetector::class, function (Server $c) {
+		$this->registerService(IMimeTypeDetector::class, function(Server $c) {
 			return new \OC\Files\Type\Detection(
 				$c->getURLGenerator(),
 				$c->getLogger(),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 		/** @deprecated 19.0.0 */
@@ -1053,19 +1053,19 @@ 
 		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
 		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class);
 
-		$this->registerService(CapabilitiesManager::class, function (Server $c) {
+		$this->registerService(CapabilitiesManager::class, function(Server $c) {
 			$manager = new CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->getConfig());
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->query(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
@@ -1073,14 +1073,14 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class);
 
-		$this->registerService(ICommentsManager::class, function (Server $c) {
+		$this->registerService(ICommentsManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			$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->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->getUserManager();
 				$user = $manager->get($id);
 				if (is_null($user)) {
@@ -1098,7 +1098,7 @@ 
 		$this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class);
 
 		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			/*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
@@ -1126,7 +1126,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			return new JSCombiner(
 				$c->getAppDataDir('js'),
 				$c->getURLGenerator(),
@@ -1140,7 +1140,7 @@ 
 		$this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class);
 		$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class);
 
-		$this->registerService('CryptoWrapper', function (Server $c) {
+		$this->registerService('CryptoWrapper', function(Server $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1167,14 +1167,14 @@ 
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class);
-		$this->registerService(SessionStorage::class, function (Server $c) {
+		$this->registerService(SessionStorage::class, function(Server $c) {
 			return new SessionStorage($c->getSession());
 		});
 		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class);
 
-		$this->registerService(\OCP\Share\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Share\IManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1204,7 +1204,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class);
 
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
 			$instance = new Collaboration\Collaborators\Search($c);
 
 			// register default plugins
@@ -1225,7 +1225,7 @@ 
 		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
 		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
 
-		$this->registerService('SettingsManager', function (Server $c) {
+		$this->registerService('SettingsManager', function(Server $c) {
 			$manager = new \OC\Settings\Manager(
 				$c->getLogger(),
 				$c->getL10NFactory(),
@@ -1234,34 +1234,34 @@ 
 			);
 			return $manager;
 		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(Server $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->getRootFolder(),
 				$c->getSystemConfig()
 			);
 		});
 
-		$this->registerService('LockdownManager', function (Server $c) {
-			return new LockdownManager(function () use ($c) {
+		$this->registerService('LockdownManager', function(Server $c) {
+			return new LockdownManager(function() use ($c) {
 				return $c->getSession();
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(Server $c) {
 			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
 		});
 
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
+		$this->registerService(ICloudIdManager::class, function(Server $c) {
 			return new CloudIdManager();
 		});
 
 		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
 
-		$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
+		$this->registerService(ICloudFederationProviderManager::class, function(Server $c) {
 			return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
 		});
 
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
+		$this->registerService(ICloudFederationFactory::class, function(Server $c) {
 			return new CloudFederationFactory();
 		});
 
@@ -1273,7 +1273,7 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
+		$this->registerService(Defaults::class, function(Server $c) {
 			return new Defaults(
 				$c->getThemingDefaults()
 			);
@@ -1281,17 +1281,17 @@ 
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class);
 
-		$this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
+		$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
 			return $c->query(\OCP\IUserSession::class)->getSession();
 		});
 
-		$this->registerService(IShareHelper::class, function (Server $c) {
+		$this->registerService(IShareHelper::class, function(Server $c) {
 			return new ShareHelper(
 				$c->query(\OCP\Share\IManager::class)
 			);
 		});
 
-		$this->registerService(Installer::class, function (Server $c) {
+		$this->registerService(Installer::class, function(Server $c) {
 			return new Installer(
 				$c->getAppFetcher(),
 				$c->getHTTPClientService(),
@@ -1302,11 +1302,11 @@ 
 			);
 		});
 
-		$this->registerService(IApiFactory::class, function (Server $c) {
+		$this->registerService(IApiFactory::class, function(Server $c) {
 			return new ApiFactory($c->getHTTPClientService());
 		});
 
-		$this->registerService(IInstanceFactory::class, function (Server $c) {
+		$this->registerService(IInstanceFactory::class, function(Server $c) {
 			$memcacheFactory = $c->getMemCacheFactory();
 			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
 		});
@@ -1363,7 +1363,7 @@ 
 		$dispatcher = $this->getEventDispatcher();
 
 		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
 			$logger = $this->getLogger();
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
@@ -1376,11 +1376,11 @@ 
 				// no avatar to remove
 			} catch (\Exception $e) {
 				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
+				$logger->info('Could not cleanup avatar of '.$user->getUID());
 			}
 		});
 
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::changeUser', function(GenericEvent $e) {
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
 			$user = $e->getSubject();
@@ -2285,11 +2285,11 @@ 
 	}
 
 	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target, $alias) {
 			try {
 				/** @var ILogger $logger */
 				$logger = $container->get(ILogger::class);
-				$logger->debug('The requested alias "' . $alias . '" is depreacted. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+				$logger->debug('The requested alias "'.$alias.'" is depreacted. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
 			} catch (ContainerExceptionInterface $e) {
 				// Could not get logger. Continue
 			}

lib/private/URLGenerator.php

Indentation +195 added lines, -195 removed lines

@@ -51,224 +51,224 @@
  * Class to generate URLs
  */
 class URLGenerator implements IURLGenerator {
-	/** @var IConfig */
-	private $config;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var IRequest */
-	private $request;
-	/** @var IRouter*/
-	private $router;
+    /** @var IConfig */
+    private $config;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var IRequest */
+    private $request;
+    /** @var IRouter*/
+    private $router;
 
-	public function __construct(IConfig $config,
-								ICacheFactory $cacheFactory,
-								IRequest $request,
-								IRouter $router) {
-		$this->config = $config;
-		$this->cacheFactory = $cacheFactory;
-		$this->request = $request;
-		$this->router = $router;
-	}
+    public function __construct(IConfig $config,
+                                ICacheFactory $cacheFactory,
+                                IRequest $request,
+                                IRouter $router) {
+        $this->config = $config;
+        $this->cacheFactory = $cacheFactory;
+        $this->request = $request;
+        $this->router = $router;
+    }
 
-	/**
-	 * Creates an url using a defined route
-	 *
-	 * @param string $routeName
-	 * @param array $arguments args with param=>value, will be appended to the returned url
-	 * @return string the url
-	 *
-	 * Returns a url to the given route.
-	 */
-	public function linkToRoute(string $routeName, array $arguments = []): string {
-		return $this->router->generate($routeName, $arguments);
-	}
+    /**
+     * Creates an url using a defined route
+     *
+     * @param string $routeName
+     * @param array $arguments args with param=>value, will be appended to the returned url
+     * @return string the url
+     *
+     * Returns a url to the given route.
+     */
+    public function linkToRoute(string $routeName, array $arguments = []): string {
+        return $this->router->generate($routeName, $arguments);
+    }
 
-	/**
-	 * Creates an absolute url using a defined route
-	 * @param string $routeName
-	 * @param array $arguments args with param=>value, will be appended to the returned url
-	 * @return string the url
-	 *
-	 * Returns an absolute url to the given route.
-	 */
-	public function linkToRouteAbsolute(string $routeName, array $arguments = []): string {
-		return $this->getAbsoluteURL($this->linkToRoute($routeName, $arguments));
-	}
+    /**
+     * Creates an absolute url using a defined route
+     * @param string $routeName
+     * @param array $arguments args with param=>value, will be appended to the returned url
+     * @return string the url
+     *
+     * Returns an absolute url to the given route.
+     */
+    public function linkToRouteAbsolute(string $routeName, array $arguments = []): string {
+        return $this->getAbsoluteURL($this->linkToRoute($routeName, $arguments));
+    }
 
-	public function linkToOCSRouteAbsolute(string $routeName, array $arguments = []): string {
-		$route = $this->router->generate('ocs.'.$routeName, $arguments, false);
+    public function linkToOCSRouteAbsolute(string $routeName, array $arguments = []): string {
+        $route = $this->router->generate('ocs.'.$routeName, $arguments, false);
 
-		$indexPhpPos = strpos($route, '/index.php/');
-		if ($indexPhpPos !== false) {
-			$route = substr($route, $indexPhpPos + 10);
-		}
+        $indexPhpPos = strpos($route, '/index.php/');
+        if ($indexPhpPos !== false) {
+            $route = substr($route, $indexPhpPos + 10);
+        }
 
-		$route = substr($route, 7);
-		$route = '/ocs/v2.php' . $route;
+        $route = substr($route, 7);
+        $route = '/ocs/v2.php' . $route;
 
-		return $this->getAbsoluteURL($route);
-	}
+        return $this->getAbsoluteURL($route);
+    }
 
-	/**
-	 * Creates an url
-	 *
-	 * @param string $appName app
-	 * @param string $file file
-	 * @param array $args array with param=>value, will be appended to the returned url
-	 *    The value of $args will be urlencoded
-	 * @return string the url
-	 *
-	 * Returns a url to the given app and file.
-	 */
-	public function linkTo(string $appName, string $file, array $args = []): string {
-		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+    /**
+     * Creates an url
+     *
+     * @param string $appName app
+     * @param string $file file
+     * @param array $args array with param=>value, will be appended to the returned url
+     *    The value of $args will be urlencoded
+     * @return string the url
+     *
+     * Returns a url to the given app and file.
+     */
+    public function linkTo(string $appName, string $file, array $args = []): string {
+        $frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
 
-		if ($appName !== '') {
-			$app_path = \OC_App::getAppPath($appName);
-			// Check if the app is in the app folder
-			if ($app_path && file_exists($app_path . '/' . $file)) {
-				if (substr($file, -3) === 'php') {
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
-					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $appName;
-					}
-					$urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
-				} else {
-					$urlLinkTo = \OC_App::getAppWebPath($appName) . '/' . $file;
-				}
-			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $appName . '/' . $file;
-			}
-		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
-			} else {
-				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
-				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
-				}
-			}
-		}
+        if ($appName !== '') {
+            $app_path = \OC_App::getAppPath($appName);
+            // Check if the app is in the app folder
+            if ($app_path && file_exists($app_path . '/' . $file)) {
+                if (substr($file, -3) === 'php') {
+                    $urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
+                    if ($frontControllerActive) {
+                        $urlLinkTo = \OC::$WEBROOT . '/apps/' . $appName;
+                    }
+                    $urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
+                } else {
+                    $urlLinkTo = \OC_App::getAppWebPath($appName) . '/' . $file;
+                }
+            } else {
+                $urlLinkTo = \OC::$WEBROOT . '/' . $appName . '/' . $file;
+            }
+        } else {
+            if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
+                $urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+            } else {
+                if ($frontControllerActive && $file === 'index.php') {
+                    $urlLinkTo = \OC::$WEBROOT . '/';
+                } else {
+                    $urlLinkTo = \OC::$WEBROOT . '/' . $file;
+                }
+            }
+        }
 
-		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
-		}
+        if ($args && $query = http_build_query($args, '', '&')) {
+            $urlLinkTo .= '?' . $query;
+        }
 
-		return $urlLinkTo;
-	}
+        return $urlLinkTo;
+    }
 
-	/**
-	 * Creates path to an image
-	 *
-	 * @param string $appName app
-	 * @param string $file image name
-	 * @throws \RuntimeException If the image does not exist
-	 * @return string the url
-	 *
-	 * Returns the path to the image.
-	 */
-	public function imagePath(string $appName, string $file): string {
-		$cache = $this->cacheFactory->createDistributed('imagePath-'.md5($this->getBaseUrl()).'-');
-		$cacheKey = $appName.'-'.$file;
-		if ($key = $cache->get($cacheKey)) {
-			return $key;
-		}
+    /**
+     * Creates path to an image
+     *
+     * @param string $appName app
+     * @param string $file image name
+     * @throws \RuntimeException If the image does not exist
+     * @return string the url
+     *
+     * Returns the path to the image.
+     */
+    public function imagePath(string $appName, string $file): string {
+        $cache = $this->cacheFactory->createDistributed('imagePath-'.md5($this->getBaseUrl()).'-');
+        $cacheKey = $appName.'-'.$file;
+        if ($key = $cache->get($cacheKey)) {
+            return $key;
+        }
 
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
 
-		//if a theme has a png but not an svg always use the png
-		$basename = substr(basename($file),0,-4);
+        //if a theme has a png but not an svg always use the png
+        $basename = substr(basename($file),0,-4);
 
-		$appPath = \OC_App::getAppPath($appName);
+        $appPath = \OC_App::getAppPath($appName);
 
-		// Check if the app is in the app folder
-		$path = '';
-		$themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
-		$themingImagePath = false;
-		if ($themingEnabled) {
-			$themingDefaults = \OC::$server->getThemingDefaults();
-			if ($themingDefaults instanceof ThemingDefaults) {
-				$themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
-			}
-		}
+        // Check if the app is in the app folder
+        $path = '';
+        $themingEnabled = $this->config->getSystemValue('installed', false) && \OCP\App::isEnabled('theming') && \OC_App::isAppLoaded('theming');
+        $themingImagePath = false;
+        if ($themingEnabled) {
+            $themingDefaults = \OC::$server->getThemingDefaults();
+            if ($themingDefaults instanceof ThemingDefaults) {
+                $themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
+            }
+        }
 
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$file")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$file")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		} elseif ($themingEnabled && $themingImagePath) {
-			$path = $themingImagePath;
-		} elseif ($appPath && file_exists($appPath . "/img/$file")) {
-			$path =  \OC_App::getAppWebPath($appName) . "/img/$file";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path =  \OC_App::getAppWebPath($appName) . "/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/$appName/img/$file")) {
-			$path =  \OC::$WEBROOT . "/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.png"))) {
-			$path =  \OC::$WEBROOT . "/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$file")) {
-			$path =  \OC::$WEBROOT . "/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
-		}
+        if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$file")) {
+            $path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$file";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.png")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$basename.png";
+        } elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$file")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/$appName/img/$file";
+        } elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.png"))) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/$appName/img/$basename.png";
+        } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$file")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/core/img/$file";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+        } elseif ($themingEnabled && $themingImagePath) {
+            $path = $themingImagePath;
+        } elseif ($appPath && file_exists($appPath . "/img/$file")) {
+            $path =  \OC_App::getAppWebPath($appName) . "/img/$file";
+        } elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
+            && file_exists($appPath . "/img/$basename.png")) {
+            $path =  \OC_App::getAppWebPath($appName) . "/img/$basename.png";
+        } elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/$appName/img/$file")) {
+            $path =  \OC::$WEBROOT . "/$appName/img/$file";
+        } elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.svg")
+                && file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.png"))) {
+            $path =  \OC::$WEBROOT . "/$appName/img/$basename.png";
+        } elseif (file_exists(\OC::$SERVERROOT . "/core/img/$file")) {
+            $path =  \OC::$WEBROOT . "/core/img/$file";
+        } elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
+            && file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
+            $path =  \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+        }
 
-		if ($path !== '') {
-			$cache->set($cacheKey, $path);
-			return $path;
-		}
+        if ($path !== '') {
+            $cache->set($cacheKey, $path);
+            return $path;
+        }
 
-		throw new RuntimeException('image not found: image:' . $file . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
-	}
+        throw new RuntimeException('image not found: image:' . $file . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+    }
 
 
-	/**
-	 * Makes an URL absolute
-	 * @param string $url the url in the ownCloud host
-	 * @return string the absolute version of the url
-	 */
-	public function getAbsoluteURL(string $url): string {
-		$separator = strpos($url, '/') === 0 ? '' : '/';
+    /**
+     * Makes an URL absolute
+     * @param string $url the url in the ownCloud host
+     * @return string the absolute version of the url
+     */
+    public function getAbsoluteURL(string $url): string {
+        $separator = strpos($url, '/') === 0 ? '' : '/';
 
-		if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
-		}
-		// The ownCloud web root can already be prepended.
-		if (\OC::$WEBROOT !== '' && strpos($url, \OC::$WEBROOT) === 0) {
-			$url = substr($url, \strlen(\OC::$WEBROOT));
-		}
+        if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
+            return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+        }
+        // The ownCloud web root can already be prepended.
+        if (\OC::$WEBROOT !== '' && strpos($url, \OC::$WEBROOT) === 0) {
+            $url = substr($url, \strlen(\OC::$WEBROOT));
+        }
 
-		return $this->getBaseUrl() . $separator . $url;
-	}
+        return $this->getBaseUrl() . $separator . $url;
+    }
 
-	/**
-	 * @param string $key
-	 * @return string url to the online documentation
-	 */
-	public function linkToDocs(string $key): string {
-		$theme = \OC::$server->getThemingDefaults();
-		return $theme->buildDocLinkToKey($key);
-	}
+    /**
+     * @param string $key
+     * @return string url to the online documentation
+     */
+    public function linkToDocs(string $key): string {
+        $theme = \OC::$server->getThemingDefaults();
+        return $theme->buildDocLinkToKey($key);
+    }
 
-	/**
-	 * @return string base url of the current request
-	 */
-	public function getBaseUrl(): string {
-		return $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
-	}
+    /**
+     * @return string base url of the current request
+     */
+    public function getBaseUrl(): string {
+        return $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
+    }
 }

lib/private/Route/Router.php

Indentation +399 added lines, -399 removed lines

@@ -45,403 +45,403 @@
 use Symfony\Component\Routing\RouteCollection;
 
 class Router implements IRouter {
-	/** @var RouteCollection[] */
-	protected $collections = [];
-	/** @var null|RouteCollection */
-	protected $collection = null;
-	/** @var null|string */
-	protected $collectionName = null;
-	/** @var null|RouteCollection */
-	protected $root = null;
-	/** @var null|UrlGenerator */
-	protected $generator = null;
-	/** @var string[] */
-	protected $routingFiles;
-	/** @var bool */
-	protected $loaded = false;
-	/** @var array */
-	protected $loadedApps = [];
-	/** @var ILogger */
-	protected $logger;
-	/** @var RequestContext */
-	protected $context;
-
-	/**
-	 * @param ILogger $logger
-	 */
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-		$baseUrl = \OC::$WEBROOT;
-		if (!(\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
-			$baseUrl .= '/index.php';
-		}
-		if (!\OC::$CLI && isset($_SERVER['REQUEST_METHOD'])) {
-			$method = $_SERVER['REQUEST_METHOD'];
-		} else {
-			$method = 'GET';
-		}
-		$request = \OC::$server->getRequest();
-		$host = $request->getServerHost();
-		$schema = $request->getServerProtocol();
-		$this->context = new RequestContext($baseUrl, $method, $host, $schema);
-		// TODO cache
-		$this->root = $this->getCollection('root');
-	}
-
-	/**
-	 * Get the files to load the routes from
-	 *
-	 * @return string[]
-	 */
-	public function getRoutingFiles() {
-		if (!isset($this->routingFiles)) {
-			$this->routingFiles = [];
-			foreach (\OC_APP::getEnabledApps() as $app) {
-				$appPath = \OC_App::getAppPath($app);
-				if ($appPath !== false) {
-					$file = $appPath . '/appinfo/routes.php';
-					if (file_exists($file)) {
-						$this->routingFiles[$app] = $file;
-					}
-				}
-			}
-		}
-		return $this->routingFiles;
-	}
-
-	/**
-	 * Loads the routes
-	 *
-	 * @param null|string $app
-	 */
-	public function loadRoutes($app = null) {
-		if (is_string($app)) {
-			$app = \OC_App::cleanAppId($app);
-		}
-
-		$requestedApp = $app;
-		if ($this->loaded) {
-			return;
-		}
-		if (is_null($app)) {
-			$this->loaded = true;
-			$routingFiles = $this->getRoutingFiles();
-		} else {
-			if (isset($this->loadedApps[$app])) {
-				return;
-			}
-			$file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
-			if ($file !== false && file_exists($file)) {
-				$routingFiles = [$app => $file];
-			} else {
-				$routingFiles = [];
-			}
-		}
-		\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
-		foreach ($routingFiles as $app => $file) {
-			if (!isset($this->loadedApps[$app])) {
-				if (!\OC_App::isAppLoaded($app)) {
-					// app MUST be loaded before app routes
-					// try again next time loadRoutes() is called
-					$this->loaded = false;
-					continue;
-				}
-				$this->loadedApps[$app] = true;
-				$this->useCollection($app);
-				$this->requireRouteFile($file, $app);
-				$collection = $this->getCollection($app);
-				$this->root->addCollection($collection);
-
-				// Also add the OCS collection
-				$collection = $this->getCollection($app.'.ocs');
-				$collection->addPrefix('/ocsapp');
-				$this->root->addCollection($collection);
-			}
-		}
-		if (!isset($this->loadedApps['core'])) {
-			$this->loadedApps['core'] = true;
-			$this->useCollection('root');
-			require_once __DIR__ . '/../../../core/routes.php';
-
-			// Also add the OCS collection
-			$collection = $this->getCollection('root.ocs');
-			$collection->addPrefix('/ocsapp');
-			$this->root->addCollection($collection);
-		}
-		if ($this->loaded) {
-			$collection = $this->getCollection('ocs');
-			$collection->addPrefix('/ocs');
-			$this->root->addCollection($collection);
-		}
-		\OC::$server->getEventLogger()->end('loadroutes' . $requestedApp);
-	}
-
-	/**
-	 * @return string
-	 * @deprecated
-	 */
-	public function getCacheKey() {
-		return '';
-	}
-
-	/**
-	 * @param string $name
-	 * @return \Symfony\Component\Routing\RouteCollection
-	 */
-	protected function getCollection($name) {
-		if (!isset($this->collections[$name])) {
-			$this->collections[$name] = new RouteCollection();
-		}
-		return $this->collections[$name];
-	}
-
-	/**
-	 * Sets the collection to use for adding routes
-	 *
-	 * @param string $name Name of the collection to use.
-	 * @return void
-	 */
-	public function useCollection($name) {
-		$this->collection = $this->getCollection($name);
-		$this->collectionName = $name;
-	}
-
-	/**
-	 * returns the current collection name in use for adding routes
-	 *
-	 * @return string the collection name
-	 */
-	public function getCurrentCollection() {
-		return $this->collectionName;
-	}
-
-
-	/**
-	 * Create a \OC\Route\Route.
-	 *
-	 * @param string $name Name of the route to create.
-	 * @param string $pattern The pattern to match
-	 * @param array $defaults An array of default parameter values
-	 * @param array $requirements An array of requirements for parameters (regexes)
-	 * @return \OC\Route\Route
-	 */
-	public function create($name,
-						   $pattern,
-						   array $defaults = [],
-						   array $requirements = []) {
-		$route = new Route($pattern, $defaults, $requirements);
-		$this->collection->add($name, $route);
-		return $route;
-	}
-
-	/**
-	 * Find the route matching $url
-	 *
-	 * @param string $url The url to find
-	 * @throws \Exception
-	 * @return array
-	 */
-	public function findMatchingRoute(string $url): array {
-		if (substr($url, 0, 6) === '/apps/') {
-			// empty string / 'apps' / $app / rest of the route
-			list(, , $app,) = explode('/', $url, 4);
-
-			$app = \OC_App::cleanAppId($app);
-			\OC::$REQUESTEDAPP = $app;
-			$this->loadRoutes($app);
-		} elseif (substr($url, 0, 13) === '/ocsapp/apps/') {
-			// empty string / 'ocsapp' / 'apps' / $app / rest of the route
-			list(, , , $app,) = explode('/', $url, 5);
-
-			$app = \OC_App::cleanAppId($app);
-			\OC::$REQUESTEDAPP = $app;
-			$this->loadRoutes($app);
-		} elseif (substr($url, 0, 10) === '/settings/') {
-			$this->loadRoutes('settings');
-		} elseif (substr($url, 0, 6) === '/core/') {
-			\OC::$REQUESTEDAPP = $url;
-			if (!\OC::$server->getConfig()->getSystemValueBool('maintenance') && !Util::needUpgrade()) {
-				\OC_App::loadApps();
-			}
-			$this->loadRoutes('core');
-		} else {
-			$this->loadRoutes();
-		}
-
-		$matcher = new UrlMatcher($this->root, $this->context);
-		try {
-			$parameters = $matcher->match($url);
-		} catch (ResourceNotFoundException $e) {
-			if (substr($url, -1) !== '/') {
-				// We allow links to apps/files? for backwards compatibility reasons
-				// However, since Symfony does not allow empty route names, the route
-				// we need to match is '/', so we need to append the '/' here.
-				try {
-					$parameters = $matcher->match($url . '/');
-				} catch (ResourceNotFoundException $newException) {
-					// If we still didn't match a route, we throw the original exception
-					throw $e;
-				}
-			} else {
-				throw $e;
-			}
-		}
-
-		return $parameters;
-	}
-
-	/**
-	 * Find and execute the route matching $url
-	 *
-	 * @param string $url The url to find
-	 * @throws \Exception
-	 * @return void
-	 */
-	public function match($url) {
-		$parameters = $this->findMatchingRoute($url);
-
-		\OC::$server->getEventLogger()->start('run_route', 'Run route');
-		if (isset($parameters['caller'])) {
-			$caller = $parameters['caller'];
-			unset($parameters['caller']);
-			$application = $this->getApplicationClass($caller[0]);
-			\OC\AppFramework\App::main($caller[1], $caller[2], $application->getContainer(), $parameters);
-		} elseif (isset($parameters['action'])) {
-			$action = $parameters['action'];
-			if (!is_callable($action)) {
-				throw new \Exception('not a callable action');
-			}
-			unset($parameters['action']);
-			call_user_func($action, $parameters);
-		} elseif (isset($parameters['file'])) {
-			include $parameters['file'];
-		} else {
-			throw new \Exception('no action available');
-		}
-		\OC::$server->getEventLogger()->end('run_route');
-	}
-
-	/**
-	 * Get the url generator
-	 *
-	 * @return \Symfony\Component\Routing\Generator\UrlGenerator
-	 *
-	 */
-	public function getGenerator() {
-		if (null !== $this->generator) {
-			return $this->generator;
-		}
-
-		return $this->generator = new UrlGenerator($this->root, $this->context);
-	}
-
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 */
-	public function generate($name,
-							 $parameters = [],
-							 $absolute = false) {
-		$referenceType = UrlGenerator::ABSOLUTE_URL;
-		if ($absolute === false) {
-			$referenceType = UrlGenerator::ABSOLUTE_PATH;
-		}
-		$name = $this->fixLegacyRootName($name);
-		if (strpos($name, '.') !== false) {
-			list($appName, $other) = explode('.', $name, 3);
-			// OCS routes are prefixed with "ocs."
-			if ($appName === 'ocs') {
-				$appName = $other;
-			}
-			$this->loadRoutes($appName);
-			try {
-				return $this->getGenerator()->generate($name, $parameters, $referenceType);
-			} catch (RouteNotFoundException $e) {
-			}
-		}
-
-		// Fallback load all routes
-		$this->loadRoutes();
-		try {
-			return $this->getGenerator()->generate($name, $parameters, $referenceType);
-		} catch (RouteNotFoundException $e) {
-			$this->logger->logException($e, ['level' => ILogger::INFO]);
-			return '';
-		}
-	}
-
-	protected function fixLegacyRootName(string $routeName): string {
-		if ($routeName === 'files.viewcontroller.showFile') {
-			return 'files.View.showFile';
-		}
-		if ($routeName === 'files_sharing.sharecontroller.showShare') {
-			return 'files_sharing.Share.showShare';
-		}
-		if ($routeName === 'files_sharing.sharecontroller.showAuthenticate') {
-			return 'files_sharing.Share.showAuthenticate';
-		}
-		if ($routeName === 'files_sharing.sharecontroller.authenticate') {
-			return 'files_sharing.Share.authenticate';
-		}
-		if ($routeName === 'files_sharing.sharecontroller.downloadShare') {
-			return 'files_sharing.Share.downloadShare';
-		}
-		if ($routeName === 'files_sharing.publicpreview.directLink') {
-			return 'files_sharing.PublicPreview.directLink';
-		}
-		if ($routeName === 'cloud_federation_api.requesthandlercontroller.addShare') {
-			return 'cloud_federation_api.RequestHandler.addShare';
-		}
-		if ($routeName === 'cloud_federation_api.requesthandlercontroller.receiveNotification') {
-			return 'cloud_federation_api.RequestHandler.receiveNotification';
-		}
-		return $routeName;
-	}
-
-	/**
-	 * To isolate the variable scope used inside the $file it is required in it's own method
-	 *
-	 * @param string $file the route file location to include
-	 * @param string $appName
-	 */
-	private function requireRouteFile($file, $appName) {
-		$this->setupRoutes(include_once $file, $appName);
-	}
-
-
-	/**
-	 * If a routes.php file returns an array, try to set up the application and
-	 * register the routes for the app. The application class will be chosen by
-	 * camelcasing the appname, e.g.: my_app will be turned into
-	 * \OCA\MyApp\AppInfo\Application. If that class does not exist, a default
-	 * App will be intialized. This makes it optional to ship an
-	 * appinfo/application.php by using the built in query resolver
-	 *
-	 * @param array $routes the application routes
-	 * @param string $appName the name of the app.
-	 */
-	private function setupRoutes($routes, $appName) {
-		if (is_array($routes)) {
-			$application = $this->getApplicationClass($appName);
-			$application->registerRoutes($this, $routes);
-		}
-	}
-
-	private function getApplicationClass(string $appName) {
-		$appNameSpace = App::buildAppNamespace($appName);
-
-		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
-
-		if (class_exists($applicationClassName)) {
-			$application = \OC::$server->query($applicationClassName);
-		} else {
-			$application = new App($appName);
-		}
-
-		return $application;
-	}
+    /** @var RouteCollection[] */
+    protected $collections = [];
+    /** @var null|RouteCollection */
+    protected $collection = null;
+    /** @var null|string */
+    protected $collectionName = null;
+    /** @var null|RouteCollection */
+    protected $root = null;
+    /** @var null|UrlGenerator */
+    protected $generator = null;
+    /** @var string[] */
+    protected $routingFiles;
+    /** @var bool */
+    protected $loaded = false;
+    /** @var array */
+    protected $loadedApps = [];
+    /** @var ILogger */
+    protected $logger;
+    /** @var RequestContext */
+    protected $context;
+
+    /**
+     * @param ILogger $logger
+     */
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+        $baseUrl = \OC::$WEBROOT;
+        if (!(\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
+            $baseUrl .= '/index.php';
+        }
+        if (!\OC::$CLI && isset($_SERVER['REQUEST_METHOD'])) {
+            $method = $_SERVER['REQUEST_METHOD'];
+        } else {
+            $method = 'GET';
+        }
+        $request = \OC::$server->getRequest();
+        $host = $request->getServerHost();
+        $schema = $request->getServerProtocol();
+        $this->context = new RequestContext($baseUrl, $method, $host, $schema);
+        // TODO cache
+        $this->root = $this->getCollection('root');
+    }
+
+    /**
+     * Get the files to load the routes from
+     *
+     * @return string[]
+     */
+    public function getRoutingFiles() {
+        if (!isset($this->routingFiles)) {
+            $this->routingFiles = [];
+            foreach (\OC_APP::getEnabledApps() as $app) {
+                $appPath = \OC_App::getAppPath($app);
+                if ($appPath !== false) {
+                    $file = $appPath . '/appinfo/routes.php';
+                    if (file_exists($file)) {
+                        $this->routingFiles[$app] = $file;
+                    }
+                }
+            }
+        }
+        return $this->routingFiles;
+    }
+
+    /**
+     * Loads the routes
+     *
+     * @param null|string $app
+     */
+    public function loadRoutes($app = null) {
+        if (is_string($app)) {
+            $app = \OC_App::cleanAppId($app);
+        }
+
+        $requestedApp = $app;
+        if ($this->loaded) {
+            return;
+        }
+        if (is_null($app)) {
+            $this->loaded = true;
+            $routingFiles = $this->getRoutingFiles();
+        } else {
+            if (isset($this->loadedApps[$app])) {
+                return;
+            }
+            $file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
+            if ($file !== false && file_exists($file)) {
+                $routingFiles = [$app => $file];
+            } else {
+                $routingFiles = [];
+            }
+        }
+        \OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
+        foreach ($routingFiles as $app => $file) {
+            if (!isset($this->loadedApps[$app])) {
+                if (!\OC_App::isAppLoaded($app)) {
+                    // app MUST be loaded before app routes
+                    // try again next time loadRoutes() is called
+                    $this->loaded = false;
+                    continue;
+                }
+                $this->loadedApps[$app] = true;
+                $this->useCollection($app);
+                $this->requireRouteFile($file, $app);
+                $collection = $this->getCollection($app);
+                $this->root->addCollection($collection);
+
+                // Also add the OCS collection
+                $collection = $this->getCollection($app.'.ocs');
+                $collection->addPrefix('/ocsapp');
+                $this->root->addCollection($collection);
+            }
+        }
+        if (!isset($this->loadedApps['core'])) {
+            $this->loadedApps['core'] = true;
+            $this->useCollection('root');
+            require_once __DIR__ . '/../../../core/routes.php';
+
+            // Also add the OCS collection
+            $collection = $this->getCollection('root.ocs');
+            $collection->addPrefix('/ocsapp');
+            $this->root->addCollection($collection);
+        }
+        if ($this->loaded) {
+            $collection = $this->getCollection('ocs');
+            $collection->addPrefix('/ocs');
+            $this->root->addCollection($collection);
+        }
+        \OC::$server->getEventLogger()->end('loadroutes' . $requestedApp);
+    }
+
+    /**
+     * @return string
+     * @deprecated
+     */
+    public function getCacheKey() {
+        return '';
+    }
+
+    /**
+     * @param string $name
+     * @return \Symfony\Component\Routing\RouteCollection
+     */
+    protected function getCollection($name) {
+        if (!isset($this->collections[$name])) {
+            $this->collections[$name] = new RouteCollection();
+        }
+        return $this->collections[$name];
+    }
+
+    /**
+     * Sets the collection to use for adding routes
+     *
+     * @param string $name Name of the collection to use.
+     * @return void
+     */
+    public function useCollection($name) {
+        $this->collection = $this->getCollection($name);
+        $this->collectionName = $name;
+    }
+
+    /**
+     * returns the current collection name in use for adding routes
+     *
+     * @return string the collection name
+     */
+    public function getCurrentCollection() {
+        return $this->collectionName;
+    }
+
+
+    /**
+     * Create a \OC\Route\Route.
+     *
+     * @param string $name Name of the route to create.
+     * @param string $pattern The pattern to match
+     * @param array $defaults An array of default parameter values
+     * @param array $requirements An array of requirements for parameters (regexes)
+     * @return \OC\Route\Route
+     */
+    public function create($name,
+                            $pattern,
+                            array $defaults = [],
+                            array $requirements = []) {
+        $route = new Route($pattern, $defaults, $requirements);
+        $this->collection->add($name, $route);
+        return $route;
+    }
+
+    /**
+     * Find the route matching $url
+     *
+     * @param string $url The url to find
+     * @throws \Exception
+     * @return array
+     */
+    public function findMatchingRoute(string $url): array {
+        if (substr($url, 0, 6) === '/apps/') {
+            // empty string / 'apps' / $app / rest of the route
+            list(, , $app,) = explode('/', $url, 4);
+
+            $app = \OC_App::cleanAppId($app);
+            \OC::$REQUESTEDAPP = $app;
+            $this->loadRoutes($app);
+        } elseif (substr($url, 0, 13) === '/ocsapp/apps/') {
+            // empty string / 'ocsapp' / 'apps' / $app / rest of the route
+            list(, , , $app,) = explode('/', $url, 5);
+
+            $app = \OC_App::cleanAppId($app);
+            \OC::$REQUESTEDAPP = $app;
+            $this->loadRoutes($app);
+        } elseif (substr($url, 0, 10) === '/settings/') {
+            $this->loadRoutes('settings');
+        } elseif (substr($url, 0, 6) === '/core/') {
+            \OC::$REQUESTEDAPP = $url;
+            if (!\OC::$server->getConfig()->getSystemValueBool('maintenance') && !Util::needUpgrade()) {
+                \OC_App::loadApps();
+            }
+            $this->loadRoutes('core');
+        } else {
+            $this->loadRoutes();
+        }
+
+        $matcher = new UrlMatcher($this->root, $this->context);
+        try {
+            $parameters = $matcher->match($url);
+        } catch (ResourceNotFoundException $e) {
+            if (substr($url, -1) !== '/') {
+                // We allow links to apps/files? for backwards compatibility reasons
+                // However, since Symfony does not allow empty route names, the route
+                // we need to match is '/', so we need to append the '/' here.
+                try {
+                    $parameters = $matcher->match($url . '/');
+                } catch (ResourceNotFoundException $newException) {
+                    // If we still didn't match a route, we throw the original exception
+                    throw $e;
+                }
+            } else {
+                throw $e;
+            }
+        }
+
+        return $parameters;
+    }
+
+    /**
+     * Find and execute the route matching $url
+     *
+     * @param string $url The url to find
+     * @throws \Exception
+     * @return void
+     */
+    public function match($url) {
+        $parameters = $this->findMatchingRoute($url);
+
+        \OC::$server->getEventLogger()->start('run_route', 'Run route');
+        if (isset($parameters['caller'])) {
+            $caller = $parameters['caller'];
+            unset($parameters['caller']);
+            $application = $this->getApplicationClass($caller[0]);
+            \OC\AppFramework\App::main($caller[1], $caller[2], $application->getContainer(), $parameters);
+        } elseif (isset($parameters['action'])) {
+            $action = $parameters['action'];
+            if (!is_callable($action)) {
+                throw new \Exception('not a callable action');
+            }
+            unset($parameters['action']);
+            call_user_func($action, $parameters);
+        } elseif (isset($parameters['file'])) {
+            include $parameters['file'];
+        } else {
+            throw new \Exception('no action available');
+        }
+        \OC::$server->getEventLogger()->end('run_route');
+    }
+
+    /**
+     * Get the url generator
+     *
+     * @return \Symfony\Component\Routing\Generator\UrlGenerator
+     *
+     */
+    public function getGenerator() {
+        if (null !== $this->generator) {
+            return $this->generator;
+        }
+
+        return $this->generator = new UrlGenerator($this->root, $this->context);
+    }
+
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     */
+    public function generate($name,
+                                $parameters = [],
+                                $absolute = false) {
+        $referenceType = UrlGenerator::ABSOLUTE_URL;
+        if ($absolute === false) {
+            $referenceType = UrlGenerator::ABSOLUTE_PATH;
+        }
+        $name = $this->fixLegacyRootName($name);
+        if (strpos($name, '.') !== false) {
+            list($appName, $other) = explode('.', $name, 3);
+            // OCS routes are prefixed with "ocs."
+            if ($appName === 'ocs') {
+                $appName = $other;
+            }
+            $this->loadRoutes($appName);
+            try {
+                return $this->getGenerator()->generate($name, $parameters, $referenceType);
+            } catch (RouteNotFoundException $e) {
+            }
+        }
+
+        // Fallback load all routes
+        $this->loadRoutes();
+        try {
+            return $this->getGenerator()->generate($name, $parameters, $referenceType);
+        } catch (RouteNotFoundException $e) {
+            $this->logger->logException($e, ['level' => ILogger::INFO]);
+            return '';
+        }
+    }
+
+    protected function fixLegacyRootName(string $routeName): string {
+        if ($routeName === 'files.viewcontroller.showFile') {
+            return 'files.View.showFile';
+        }
+        if ($routeName === 'files_sharing.sharecontroller.showShare') {
+            return 'files_sharing.Share.showShare';
+        }
+        if ($routeName === 'files_sharing.sharecontroller.showAuthenticate') {
+            return 'files_sharing.Share.showAuthenticate';
+        }
+        if ($routeName === 'files_sharing.sharecontroller.authenticate') {
+            return 'files_sharing.Share.authenticate';
+        }
+        if ($routeName === 'files_sharing.sharecontroller.downloadShare') {
+            return 'files_sharing.Share.downloadShare';
+        }
+        if ($routeName === 'files_sharing.publicpreview.directLink') {
+            return 'files_sharing.PublicPreview.directLink';
+        }
+        if ($routeName === 'cloud_federation_api.requesthandlercontroller.addShare') {
+            return 'cloud_federation_api.RequestHandler.addShare';
+        }
+        if ($routeName === 'cloud_federation_api.requesthandlercontroller.receiveNotification') {
+            return 'cloud_federation_api.RequestHandler.receiveNotification';
+        }
+        return $routeName;
+    }
+
+    /**
+     * To isolate the variable scope used inside the $file it is required in it's own method
+     *
+     * @param string $file the route file location to include
+     * @param string $appName
+     */
+    private function requireRouteFile($file, $appName) {
+        $this->setupRoutes(include_once $file, $appName);
+    }
+
+
+    /**
+     * If a routes.php file returns an array, try to set up the application and
+     * register the routes for the app. The application class will be chosen by
+     * camelcasing the appname, e.g.: my_app will be turned into
+     * \OCA\MyApp\AppInfo\Application. If that class does not exist, a default
+     * App will be intialized. This makes it optional to ship an
+     * appinfo/application.php by using the built in query resolver
+     *
+     * @param array $routes the application routes
+     * @param string $appName the name of the app.
+     */
+    private function setupRoutes($routes, $appName) {
+        if (is_array($routes)) {
+            $application = $this->getApplicationClass($appName);
+            $application->registerRoutes($this, $routes);
+        }
+    }
+
+    private function getApplicationClass(string $appName) {
+        $appNameSpace = App::buildAppNamespace($appName);
+
+        $applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+
+        if (class_exists($applicationClassName)) {
+            $application = \OC::$server->query($applicationClassName);
+        } else {
+            $application = new App($appName);
+        }
+
+        return $application;
+    }
 }