nextcloud / server

lib/private/Server.php

Indentation +1379 added lines, -1379 removed lines

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

apps/theming/lib/ThemingDefaults.php

Indentation +512 added lines, -512 removed lines

@@ -22,516 +22,516 @@
 
 class ThemingDefaults extends \OC_Defaults {
 
-	private string $name;
-	private string $title;
-	private string $entity;
-	private string $productName;
-	private string $url;
-	private string $backgroundColor;
-	private string $primaryColor;
-	private string $docBaseUrl;
-
-	private string $iTunesAppId;
-	private string $iOSClientUrl;
-	private string $AndroidClientUrl;
-	private string $FDroidClientUrl;
-
-	/**
-	 * ThemingDefaults constructor.
-	 */
-	public function __construct(
-		private IConfig $config,
-		private IAppConfig $appConfig,
-		private IL10N $l,
-		private IUserSession $userSession,
-		private IURLGenerator $urlGenerator,
-		private ICacheFactory $cacheFactory,
-		private Util $util,
-		private ImageManager $imageManager,
-		private IAppManager $appManager,
-		private INavigationManager $navigationManager,
-		private BackgroundService $backgroundService,
-	) {
-		parent::__construct();
-
-		$this->name = parent::getName();
-		$this->title = parent::getTitle();
-		$this->entity = parent::getEntity();
-		$this->productName = parent::getProductName();
-		$this->url = parent::getBaseUrl();
-		$this->primaryColor = parent::getColorPrimary();
-		$this->backgroundColor = parent::getColorBackground();
-		$this->iTunesAppId = parent::getiTunesAppId();
-		$this->iOSClientUrl = parent::getiOSClientUrl();
-		$this->AndroidClientUrl = parent::getAndroidClientUrl();
-		$this->FDroidClientUrl = parent::getFDroidClientUrl();
-		$this->docBaseUrl = parent::getDocBaseUrl();
-	}
-
-	public function getName() {
-		return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->name));
-	}
-
-	public function getHTMLName() {
-		return $this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->name);
-	}
-
-	public function getTitle() {
-		return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->title));
-	}
-
-	public function getEntity() {
-		return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->entity));
-	}
-
-	public function getProductName() {
-		return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::PRODUCT_NAME, $this->productName));
-	}
-
-	public function getBaseUrl() {
-		return $this->appConfig->getAppValueString(ConfigLexicon::BASE_URL, $this->url);
-	}
-
-	/**
-	 * We pass a string and sanitizeHTML will return a string too in that case
-	 * @psalm-suppress InvalidReturnStatement
-	 * @psalm-suppress InvalidReturnType
-	 */
-	public function getSlogan(?string $lang = null): string {
-		return \OCP\Util::sanitizeHTML($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_SLOGAN, parent::getSlogan($lang)));
-	}
-
-	public function getImprintUrl(): string {
-		return $this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_IMPRINT_URL, '');
-	}
-
-	public function getPrivacyUrl(): string {
-		return $this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_PRIVACY_URL, '');
-	}
-
-	public function getDocBaseUrl(): string {
-		return $this->appConfig->getAppValueString(ConfigLexicon::DOC_BASE_URL, $this->docBaseUrl);
-	}
-
-	public function getShortFooter() {
-		$slogan = $this->getSlogan();
-		$baseUrl = $this->getBaseUrl();
-		$entity = $this->getEntity();
-		$footer = '';
-
-		if ($entity !== '') {
-			if ($baseUrl !== '') {
-				$footer = '<a href="' . $baseUrl . '" target="_blank"'
-					. ' rel="noreferrer noopener" class="entity-name">' . $entity . '</a>';
-			} else {
-				$footer = '<span class="entity-name">' . $entity . '</span>';
-			}
-		}
-		$footer .= ($slogan !== '' ? ' – ' . $slogan : '');
-
-		$links = [
-			[
-				'text' => $this->l->t('Legal notice'),
-				'url' => $this->getImprintUrl()
-			],
-			[
-				'text' => $this->l->t('Privacy policy'),
-				'url' => $this->getPrivacyUrl()
-			],
-		];
-
-		$navigation = $this->navigationManager->getAll(INavigationManager::TYPE_GUEST);
-		$guestNavigation = array_map(function ($nav) {
-			return [
-				'text' => $nav['name'],
-				'url' => $nav['href']
-			];
-		}, $navigation);
-		$links = array_merge($links, $guestNavigation);
-
-		$legalLinks = '';
-		$divider = '';
-		foreach ($links as $link) {
-			if ($link['url'] !== ''
-				&& filter_var($link['url'], FILTER_VALIDATE_URL)
-			) {
-				$legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"'
-					. ' rel="noreferrer noopener">' . $link['text'] . '</a>';
-				$divider = ' · ';
-			}
-		}
-		if ($legalLinks !== '') {
-			$footer .= '<br/><span class="footer__legal-links">' . $legalLinks . '</span>';
-		}
-
-		return $footer;
-	}
-
-	/**
-	 * Color that is used for highlighting elements like important buttons
-	 * If user theming is enabled then the user defined value is returned
-	 */
-	public function getColorPrimary(): string {
-		$user = $this->userSession->getUser();
-
-		// admin-defined primary color
-		$defaultColor = $this->getDefaultColorPrimary();
-
-		if ($this->isUserThemingDisabled()) {
-			return $defaultColor;
-		}
-
-		// user-defined primary color
-		if (!empty($user)) {
-			$userPrimaryColor = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'primary_color', '');
-			if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $userPrimaryColor)) {
-				return $userPrimaryColor;
-			}
-		}
-
-		// Finally, return the system global primary color
-		return $defaultColor;
-	}
-
-	/**
-	 * Color that is used for the page background (e.g. the header)
-	 * If user theming is enabled then the user defined value is returned
-	 */
-	public function getColorBackground(): string {
-		$user = $this->userSession->getUser();
-
-		// admin-defined background color
-		$defaultColor = $this->getDefaultColorBackground();
-
-		if ($this->isUserThemingDisabled()) {
-			return $defaultColor;
-		}
-
-		// user-defined background color
-		if (!empty($user)) {
-			$userBackgroundColor = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_color', '');
-			if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $userBackgroundColor)) {
-				return $userBackgroundColor;
-			}
-		}
-
-		// Finally, return the system global background color
-		return $defaultColor;
-	}
-
-	/**
-	 * Return the default primary color - only taking admin setting into account
-	 */
-	public function getDefaultColorPrimary(): string {
-		// try admin color
-		$defaultColor = $this->appConfig->getAppValueString('primary_color', '');
-		if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $defaultColor)) {
-			return $defaultColor;
-		}
-
-		// fall back to default primary color
-		return $this->primaryColor;
-	}
-
-	/**
-	 * Default background color only taking admin setting into account
-	 */
-	public function getDefaultColorBackground(): string {
-		$defaultColor = $this->appConfig->getAppValueString('background_color');
-		if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $defaultColor)) {
-			return $defaultColor;
-		}
-
-		return $this->backgroundColor;
-	}
-
-	/**
-	 * Themed logo url
-	 *
-	 * @param bool $useSvg Whether to point to the SVG image or a fallback
-	 * @return string
-	 */
-	public function getLogo($useSvg = true): string {
-		$logo = $this->appConfig->getAppValueString('logoMime', '');
-
-		// short cut to avoid setting up the filesystem just to check if the logo is there
-		//
-		// explanation: if an SVG is requested and the app config value for logoMime is set then the logo is there.
-		// otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which
-		// needs to be called then)
-		if ($useSvg === true && $logo !== '') {
-			$logoExists = true;
-		} else {
-			try {
-				$this->imageManager->getImage('logo', $useSvg);
-				$logoExists = true;
-			} catch (\Exception $e) {
-				$logoExists = false;
-			}
-		}
-
-		$cacheBusterCounter = (string)$this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
-		if (!$logo || !$logoExists) {
-			if ($useSvg) {
-				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
-			} else {
-				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
-			}
-			return $logo . '?v=' . $cacheBusterCounter;
-		}
-
-		return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
-	}
-
-	/**
-	 * Themed background image url
-	 *
-	 * @param bool $darkVariant if the dark variant (if available) of the background should be used
-	 * @return string
-	 */
-	public function getBackground(bool $darkVariant = false): string {
-		return $this->imageManager->getImageUrl('background' . ($darkVariant ? 'Dark' : ''));
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getiTunesAppId() {
-		return $this->appConfig->getAppValueString('iTunesAppId', $this->iTunesAppId);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getiOSClientUrl() {
-		return $this->appConfig->getAppValueString('iOSClientUrl', $this->iOSClientUrl);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAndroidClientUrl() {
-		return $this->appConfig->getAppValueString('AndroidClientUrl', $this->AndroidClientUrl);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getFDroidClientUrl() {
-		return $this->appConfig->getAppValueString('FDroidClientUrl', $this->FDroidClientUrl);
-	}
-
-	/**
-	 * @return array scss variables to overwrite
-	 * @deprecated since Nextcloud 22 - https://github.com/nextcloud/server/issues/9940
-	 */
-	public function getScssVariables() {
-		$cacheBuster = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
-		$cache = $this->cacheFactory->createDistributed('theming-' . (string)$cacheBuster . '-' . $this->urlGenerator->getBaseUrl());
-		if ($value = $cache->get('getScssVariables')) {
-			return $value;
-		}
-
-		$variables = [
-			'theming-cachebuster' => "'" . $cacheBuster . "'",
-			'theming-logo-mime' => "'" . $this->appConfig->getAppValueString('logoMime') . "'",
-			'theming-background-mime' => "'" . $this->appConfig->getAppValueString('backgroundMime') . "'",
-			'theming-logoheader-mime' => "'" . $this->appConfig->getAppValueString('logoheaderMime') . "'",
-			'theming-favicon-mime' => "'" . $this->appConfig->getAppValueString('faviconMime') . "'"
-		];
-
-		$variables['image-logo'] = "url('" . $this->imageManager->getImageUrl('logo') . "')";
-		$variables['image-logoheader'] = "url('" . $this->imageManager->getImageUrl('logoheader') . "')";
-		$variables['image-favicon'] = "url('" . $this->imageManager->getImageUrl('favicon') . "')";
-		$variables['image-login-background'] = "url('" . $this->imageManager->getImageUrl('background') . "')";
-		$variables['image-login-plain'] = 'false';
-
-		if ($this->appConfig->getAppValueString('primary_color', '') !== '') {
-			$variables['color-primary'] = $this->getColorPrimary();
-			$variables['color-primary-text'] = $this->getTextColorPrimary();
-			$variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
-		}
-
-		if ($this->appConfig->getAppValueString('backgroundMime', '') === 'backgroundColor') {
-			$variables['image-login-plain'] = 'true';
-		}
-
-		$variables['has-legal-links'] = 'false';
-		if ($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
-			$variables['has-legal-links'] = 'true';
-		}
-
-		$cache->set('getScssVariables', $variables);
-		return $variables;
-	}
-
-	/**
-	 * Check if the image should be replaced by the theming app
-	 * and return the new image location then
-	 *
-	 * @param string $app name of the app
-	 * @param string $image filename of the image
-	 * @return bool|string false if image should not replaced, otherwise the location of the image
-	 */
-	public function replaceImagePath($app, $image) {
-		if ($app === '' || $app === 'files_sharing') {
-			$app = 'core';
-		}
-
-		$route = false;
-		if ($image === 'favicon.ico' && ($this->imageManager->shouldReplaceIcons() || $this->getCustomFavicon() !== null)) {
-			$route = $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]);
-		}
-		if (($image === 'favicon-touch.png' || $image === 'favicon-fb.png') && ($this->imageManager->shouldReplaceIcons() || $this->getCustomFavicon() !== null)) {
-			$route = $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]);
-		}
-		if ($image === 'manifest.json') {
-			try {
-				$appPath = $this->appManager->getAppPath($app);
-				if (file_exists($appPath . '/img/manifest.json')) {
-					return false;
-				}
-			} catch (AppPathNotFoundException $e) {
-			}
-			$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest', ['app' => $app ]);
-		}
-		if (str_starts_with($image, 'filetypes/') && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) {
-			$route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
-		}
-
-		if ($route) {
-			return $route . '?v=' . $this->util->getCacheBuster();
-		}
-
-		return false;
-	}
-
-	protected function getCustomFavicon(): ?ISimpleFile {
-		try {
-			return $this->imageManager->getImage('favicon');
-		} catch (NotFoundException $e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Increases the cache buster key
-	 */
-	public function increaseCacheBuster(): void {
-		$cacheBusterKey = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
-		$this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, $cacheBusterKey + 1);
-		$this->cacheFactory->createDistributed('theming-')->clear();
-		$this->cacheFactory->createDistributed('imagePath')->clear();
-	}
-
-	/**
-	 * Update setting in the database
-	 *
-	 * @param string $setting
-	 * @param string $value
-	 */
-	public function set($setting, $value): void {
-		switch ($value) {
-			case ConfigLexicon::CACHE_BUSTER:
-				$this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, (int)$value);
-				break;
-			case ConfigLexicon::USER_THEMING_DISABLED:
-				$value = $value === 'true' || $value === 'yes' || $value === '1';
-				$this->appConfig->setAppValueBool(ConfigLexicon::USER_THEMING_DISABLED, $value);
-				break;
-			default:
-				$this->appConfig->setAppValueString($setting, $value);
-				break;
-		}
-		$this->increaseCacheBuster();
-	}
-
-	/**
-	 * Revert all settings to the default value
-	 */
-	public function undoAll(): void {
-		// Remember the current cachebuster value, as we do not want to reset this value
-		// Otherwise this can lead to caching issues as the value might be known to a browser already
-		$cacheBusterKey = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
-		$this->appConfig->deleteAppValues();
-		$this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, $cacheBusterKey);
-		$this->increaseCacheBuster();
-	}
-
-	/**
-	 * Revert admin settings to the default value
-	 *
-	 * @param string $setting setting which should be reverted
-	 * @return string default value
-	 */
-	public function undo($setting): string {
-		$this->appConfig->deleteAppValue($setting);
-		$this->increaseCacheBuster();
-
-		$returnValue = '';
-		switch ($setting) {
-			case 'name':
-				$returnValue = $this->getEntity();
-				break;
-			case 'url':
-				$returnValue = $this->getBaseUrl();
-				break;
-			case 'slogan':
-				$returnValue = $this->getSlogan();
-				break;
-			case 'primary_color':
-				$returnValue = BackgroundService::DEFAULT_COLOR;
-				break;
-			case 'background_color':
-				// If a background image is set we revert to the mean image color
-				if ($this->imageManager->hasImage('background')) {
-					$file = $this->imageManager->getImage('background');
-					$returnValue = $this->backgroundService->setGlobalBackground($file->read()) ?? '';
-				}
-				break;
-			case 'logo':
-			case 'logoheader':
-			case 'background':
-			case 'favicon':
-				$this->imageManager->delete($setting);
-				$this->appConfig->deleteAppValue($setting . 'Mime');
-				break;
-		}
-
-		return $returnValue;
-	}
-
-	/**
-	 * Color of text in the header menu
-	 *
-	 * @return string
-	 */
-	public function getTextColorBackground() {
-		return $this->util->invertTextColor($this->getColorBackground()) ? '#000000' : '#ffffff';
-	}
-
-	/**
-	 * Color of text on primary buttons and other elements
-	 *
-	 * @return string
-	 */
-	public function getTextColorPrimary() {
-		return $this->util->invertTextColor($this->getColorPrimary()) ? '#000000' : '#ffffff';
-	}
-
-	/**
-	 * Color of text in the header and primary buttons
-	 *
-	 * @return string
-	 */
-	public function getDefaultTextColorPrimary() {
-		return $this->util->invertTextColor($this->getDefaultColorPrimary()) ? '#000000' : '#ffffff';
-	}
-
-	/**
-	 * Has the admin disabled user customization
-	 */
-	public function isUserThemingDisabled(): bool {
-		return $this->appConfig->getAppValueBool(ConfigLexicon::USER_THEMING_DISABLED, false);
-	}
+    private string $name;
+    private string $title;
+    private string $entity;
+    private string $productName;
+    private string $url;
+    private string $backgroundColor;
+    private string $primaryColor;
+    private string $docBaseUrl;
+
+    private string $iTunesAppId;
+    private string $iOSClientUrl;
+    private string $AndroidClientUrl;
+    private string $FDroidClientUrl;
+
+    /**
+     * ThemingDefaults constructor.
+     */
+    public function __construct(
+        private IConfig $config,
+        private IAppConfig $appConfig,
+        private IL10N $l,
+        private IUserSession $userSession,
+        private IURLGenerator $urlGenerator,
+        private ICacheFactory $cacheFactory,
+        private Util $util,
+        private ImageManager $imageManager,
+        private IAppManager $appManager,
+        private INavigationManager $navigationManager,
+        private BackgroundService $backgroundService,
+    ) {
+        parent::__construct();
+
+        $this->name = parent::getName();
+        $this->title = parent::getTitle();
+        $this->entity = parent::getEntity();
+        $this->productName = parent::getProductName();
+        $this->url = parent::getBaseUrl();
+        $this->primaryColor = parent::getColorPrimary();
+        $this->backgroundColor = parent::getColorBackground();
+        $this->iTunesAppId = parent::getiTunesAppId();
+        $this->iOSClientUrl = parent::getiOSClientUrl();
+        $this->AndroidClientUrl = parent::getAndroidClientUrl();
+        $this->FDroidClientUrl = parent::getFDroidClientUrl();
+        $this->docBaseUrl = parent::getDocBaseUrl();
+    }
+
+    public function getName() {
+        return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->name));
+    }
+
+    public function getHTMLName() {
+        return $this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->name);
+    }
+
+    public function getTitle() {
+        return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->title));
+    }
+
+    public function getEntity() {
+        return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_NAME, $this->entity));
+    }
+
+    public function getProductName() {
+        return strip_tags($this->appConfig->getAppValueString(ConfigLexicon::PRODUCT_NAME, $this->productName));
+    }
+
+    public function getBaseUrl() {
+        return $this->appConfig->getAppValueString(ConfigLexicon::BASE_URL, $this->url);
+    }
+
+    /**
+     * We pass a string and sanitizeHTML will return a string too in that case
+     * @psalm-suppress InvalidReturnStatement
+     * @psalm-suppress InvalidReturnType
+     */
+    public function getSlogan(?string $lang = null): string {
+        return \OCP\Util::sanitizeHTML($this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_SLOGAN, parent::getSlogan($lang)));
+    }
+
+    public function getImprintUrl(): string {
+        return $this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_IMPRINT_URL, '');
+    }
+
+    public function getPrivacyUrl(): string {
+        return $this->appConfig->getAppValueString(ConfigLexicon::INSTANCE_PRIVACY_URL, '');
+    }
+
+    public function getDocBaseUrl(): string {
+        return $this->appConfig->getAppValueString(ConfigLexicon::DOC_BASE_URL, $this->docBaseUrl);
+    }
+
+    public function getShortFooter() {
+        $slogan = $this->getSlogan();
+        $baseUrl = $this->getBaseUrl();
+        $entity = $this->getEntity();
+        $footer = '';
+
+        if ($entity !== '') {
+            if ($baseUrl !== '') {
+                $footer = '<a href="' . $baseUrl . '" target="_blank"'
+                    . ' rel="noreferrer noopener" class="entity-name">' . $entity . '</a>';
+            } else {
+                $footer = '<span class="entity-name">' . $entity . '</span>';
+            }
+        }
+        $footer .= ($slogan !== '' ? ' – ' . $slogan : '');
+
+        $links = [
+            [
+                'text' => $this->l->t('Legal notice'),
+                'url' => $this->getImprintUrl()
+            ],
+            [
+                'text' => $this->l->t('Privacy policy'),
+                'url' => $this->getPrivacyUrl()
+            ],
+        ];
+
+        $navigation = $this->navigationManager->getAll(INavigationManager::TYPE_GUEST);
+        $guestNavigation = array_map(function ($nav) {
+            return [
+                'text' => $nav['name'],
+                'url' => $nav['href']
+            ];
+        }, $navigation);
+        $links = array_merge($links, $guestNavigation);
+
+        $legalLinks = '';
+        $divider = '';
+        foreach ($links as $link) {
+            if ($link['url'] !== ''
+                && filter_var($link['url'], FILTER_VALIDATE_URL)
+            ) {
+                $legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"'
+                    . ' rel="noreferrer noopener">' . $link['text'] . '</a>';
+                $divider = ' · ';
+            }
+        }
+        if ($legalLinks !== '') {
+            $footer .= '<br/><span class="footer__legal-links">' . $legalLinks . '</span>';
+        }
+
+        return $footer;
+    }
+
+    /**
+     * Color that is used for highlighting elements like important buttons
+     * If user theming is enabled then the user defined value is returned
+     */
+    public function getColorPrimary(): string {
+        $user = $this->userSession->getUser();
+
+        // admin-defined primary color
+        $defaultColor = $this->getDefaultColorPrimary();
+
+        if ($this->isUserThemingDisabled()) {
+            return $defaultColor;
+        }
+
+        // user-defined primary color
+        if (!empty($user)) {
+            $userPrimaryColor = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'primary_color', '');
+            if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $userPrimaryColor)) {
+                return $userPrimaryColor;
+            }
+        }
+
+        // Finally, return the system global primary color
+        return $defaultColor;
+    }
+
+    /**
+     * Color that is used for the page background (e.g. the header)
+     * If user theming is enabled then the user defined value is returned
+     */
+    public function getColorBackground(): string {
+        $user = $this->userSession->getUser();
+
+        // admin-defined background color
+        $defaultColor = $this->getDefaultColorBackground();
+
+        if ($this->isUserThemingDisabled()) {
+            return $defaultColor;
+        }
+
+        // user-defined background color
+        if (!empty($user)) {
+            $userBackgroundColor = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_color', '');
+            if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $userBackgroundColor)) {
+                return $userBackgroundColor;
+            }
+        }
+
+        // Finally, return the system global background color
+        return $defaultColor;
+    }
+
+    /**
+     * Return the default primary color - only taking admin setting into account
+     */
+    public function getDefaultColorPrimary(): string {
+        // try admin color
+        $defaultColor = $this->appConfig->getAppValueString('primary_color', '');
+        if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $defaultColor)) {
+            return $defaultColor;
+        }
+
+        // fall back to default primary color
+        return $this->primaryColor;
+    }
+
+    /**
+     * Default background color only taking admin setting into account
+     */
+    public function getDefaultColorBackground(): string {
+        $defaultColor = $this->appConfig->getAppValueString('background_color');
+        if (preg_match('/^\#([0-9a-f]{3}|[0-9a-f]{6})$/i', $defaultColor)) {
+            return $defaultColor;
+        }
+
+        return $this->backgroundColor;
+    }
+
+    /**
+     * Themed logo url
+     *
+     * @param bool $useSvg Whether to point to the SVG image or a fallback
+     * @return string
+     */
+    public function getLogo($useSvg = true): string {
+        $logo = $this->appConfig->getAppValueString('logoMime', '');
+
+        // short cut to avoid setting up the filesystem just to check if the logo is there
+        //
+        // explanation: if an SVG is requested and the app config value for logoMime is set then the logo is there.
+        // otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which
+        // needs to be called then)
+        if ($useSvg === true && $logo !== '') {
+            $logoExists = true;
+        } else {
+            try {
+                $this->imageManager->getImage('logo', $useSvg);
+                $logoExists = true;
+            } catch (\Exception $e) {
+                $logoExists = false;
+            }
+        }
+
+        $cacheBusterCounter = (string)$this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
+        if (!$logo || !$logoExists) {
+            if ($useSvg) {
+                $logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
+            } else {
+                $logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
+            }
+            return $logo . '?v=' . $cacheBusterCounter;
+        }
+
+        return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
+    }
+
+    /**
+     * Themed background image url
+     *
+     * @param bool $darkVariant if the dark variant (if available) of the background should be used
+     * @return string
+     */
+    public function getBackground(bool $darkVariant = false): string {
+        return $this->imageManager->getImageUrl('background' . ($darkVariant ? 'Dark' : ''));
+    }
+
+    /**
+     * @return string
+     */
+    public function getiTunesAppId() {
+        return $this->appConfig->getAppValueString('iTunesAppId', $this->iTunesAppId);
+    }
+
+    /**
+     * @return string
+     */
+    public function getiOSClientUrl() {
+        return $this->appConfig->getAppValueString('iOSClientUrl', $this->iOSClientUrl);
+    }
+
+    /**
+     * @return string
+     */
+    public function getAndroidClientUrl() {
+        return $this->appConfig->getAppValueString('AndroidClientUrl', $this->AndroidClientUrl);
+    }
+
+    /**
+     * @return string
+     */
+    public function getFDroidClientUrl() {
+        return $this->appConfig->getAppValueString('FDroidClientUrl', $this->FDroidClientUrl);
+    }
+
+    /**
+     * @return array scss variables to overwrite
+     * @deprecated since Nextcloud 22 - https://github.com/nextcloud/server/issues/9940
+     */
+    public function getScssVariables() {
+        $cacheBuster = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
+        $cache = $this->cacheFactory->createDistributed('theming-' . (string)$cacheBuster . '-' . $this->urlGenerator->getBaseUrl());
+        if ($value = $cache->get('getScssVariables')) {
+            return $value;
+        }
+
+        $variables = [
+            'theming-cachebuster' => "'" . $cacheBuster . "'",
+            'theming-logo-mime' => "'" . $this->appConfig->getAppValueString('logoMime') . "'",
+            'theming-background-mime' => "'" . $this->appConfig->getAppValueString('backgroundMime') . "'",
+            'theming-logoheader-mime' => "'" . $this->appConfig->getAppValueString('logoheaderMime') . "'",
+            'theming-favicon-mime' => "'" . $this->appConfig->getAppValueString('faviconMime') . "'"
+        ];
+
+        $variables['image-logo'] = "url('" . $this->imageManager->getImageUrl('logo') . "')";
+        $variables['image-logoheader'] = "url('" . $this->imageManager->getImageUrl('logoheader') . "')";
+        $variables['image-favicon'] = "url('" . $this->imageManager->getImageUrl('favicon') . "')";
+        $variables['image-login-background'] = "url('" . $this->imageManager->getImageUrl('background') . "')";
+        $variables['image-login-plain'] = 'false';
+
+        if ($this->appConfig->getAppValueString('primary_color', '') !== '') {
+            $variables['color-primary'] = $this->getColorPrimary();
+            $variables['color-primary-text'] = $this->getTextColorPrimary();
+            $variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
+        }
+
+        if ($this->appConfig->getAppValueString('backgroundMime', '') === 'backgroundColor') {
+            $variables['image-login-plain'] = 'true';
+        }
+
+        $variables['has-legal-links'] = 'false';
+        if ($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
+            $variables['has-legal-links'] = 'true';
+        }
+
+        $cache->set('getScssVariables', $variables);
+        return $variables;
+    }
+
+    /**
+     * Check if the image should be replaced by the theming app
+     * and return the new image location then
+     *
+     * @param string $app name of the app
+     * @param string $image filename of the image
+     * @return bool|string false if image should not replaced, otherwise the location of the image
+     */
+    public function replaceImagePath($app, $image) {
+        if ($app === '' || $app === 'files_sharing') {
+            $app = 'core';
+        }
+
+        $route = false;
+        if ($image === 'favicon.ico' && ($this->imageManager->shouldReplaceIcons() || $this->getCustomFavicon() !== null)) {
+            $route = $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]);
+        }
+        if (($image === 'favicon-touch.png' || $image === 'favicon-fb.png') && ($this->imageManager->shouldReplaceIcons() || $this->getCustomFavicon() !== null)) {
+            $route = $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]);
+        }
+        if ($image === 'manifest.json') {
+            try {
+                $appPath = $this->appManager->getAppPath($app);
+                if (file_exists($appPath . '/img/manifest.json')) {
+                    return false;
+                }
+            } catch (AppPathNotFoundException $e) {
+            }
+            $route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest', ['app' => $app ]);
+        }
+        if (str_starts_with($image, 'filetypes/') && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) {
+            $route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
+        }
+
+        if ($route) {
+            return $route . '?v=' . $this->util->getCacheBuster();
+        }
+
+        return false;
+    }
+
+    protected function getCustomFavicon(): ?ISimpleFile {
+        try {
+            return $this->imageManager->getImage('favicon');
+        } catch (NotFoundException $e) {
+            return null;
+        }
+    }
+
+    /**
+     * Increases the cache buster key
+     */
+    public function increaseCacheBuster(): void {
+        $cacheBusterKey = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
+        $this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, $cacheBusterKey + 1);
+        $this->cacheFactory->createDistributed('theming-')->clear();
+        $this->cacheFactory->createDistributed('imagePath')->clear();
+    }
+
+    /**
+     * Update setting in the database
+     *
+     * @param string $setting
+     * @param string $value
+     */
+    public function set($setting, $value): void {
+        switch ($value) {
+            case ConfigLexicon::CACHE_BUSTER:
+                $this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, (int)$value);
+                break;
+            case ConfigLexicon::USER_THEMING_DISABLED:
+                $value = $value === 'true' || $value === 'yes' || $value === '1';
+                $this->appConfig->setAppValueBool(ConfigLexicon::USER_THEMING_DISABLED, $value);
+                break;
+            default:
+                $this->appConfig->setAppValueString($setting, $value);
+                break;
+        }
+        $this->increaseCacheBuster();
+    }
+
+    /**
+     * Revert all settings to the default value
+     */
+    public function undoAll(): void {
+        // Remember the current cachebuster value, as we do not want to reset this value
+        // Otherwise this can lead to caching issues as the value might be known to a browser already
+        $cacheBusterKey = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
+        $this->appConfig->deleteAppValues();
+        $this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, $cacheBusterKey);
+        $this->increaseCacheBuster();
+    }
+
+    /**
+     * Revert admin settings to the default value
+     *
+     * @param string $setting setting which should be reverted
+     * @return string default value
+     */
+    public function undo($setting): string {
+        $this->appConfig->deleteAppValue($setting);
+        $this->increaseCacheBuster();
+
+        $returnValue = '';
+        switch ($setting) {
+            case 'name':
+                $returnValue = $this->getEntity();
+                break;
+            case 'url':
+                $returnValue = $this->getBaseUrl();
+                break;
+            case 'slogan':
+                $returnValue = $this->getSlogan();
+                break;
+            case 'primary_color':
+                $returnValue = BackgroundService::DEFAULT_COLOR;
+                break;
+            case 'background_color':
+                // If a background image is set we revert to the mean image color
+                if ($this->imageManager->hasImage('background')) {
+                    $file = $this->imageManager->getImage('background');
+                    $returnValue = $this->backgroundService->setGlobalBackground($file->read()) ?? '';
+                }
+                break;
+            case 'logo':
+            case 'logoheader':
+            case 'background':
+            case 'favicon':
+                $this->imageManager->delete($setting);
+                $this->appConfig->deleteAppValue($setting . 'Mime');
+                break;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Color of text in the header menu
+     *
+     * @return string
+     */
+    public function getTextColorBackground() {
+        return $this->util->invertTextColor($this->getColorBackground()) ? '#000000' : '#ffffff';
+    }
+
+    /**
+     * Color of text on primary buttons and other elements
+     *
+     * @return string
+     */
+    public function getTextColorPrimary() {
+        return $this->util->invertTextColor($this->getColorPrimary()) ? '#000000' : '#ffffff';
+    }
+
+    /**
+     * Color of text in the header and primary buttons
+     *
+     * @return string
+     */
+    public function getDefaultTextColorPrimary() {
+        return $this->util->invertTextColor($this->getDefaultColorPrimary()) ? '#000000' : '#ffffff';
+    }
+
+    /**
+     * Has the admin disabled user customization
+     */
+    public function isUserThemingDisabled(): bool {
+        return $this->appConfig->getAppValueBool(ConfigLexicon::USER_THEMING_DISABLED, false);
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -121,13 +121,13 @@ 
 
 		if ($entity !== '') {
 			if ($baseUrl !== '') {
-				$footer = '<a href="' . $baseUrl . '" target="_blank"'
-					. ' rel="noreferrer noopener" class="entity-name">' . $entity . '</a>';
+				$footer = '<a href="'.$baseUrl.'" target="_blank"'
+					. ' rel="noreferrer noopener" class="entity-name">'.$entity.'</a>';
 			} else {
-				$footer = '<span class="entity-name">' . $entity . '</span>';
+				$footer = '<span class="entity-name">'.$entity.'</span>';
 			}
 		}
-		$footer .= ($slogan !== '' ? ' – ' . $slogan : '');
+		$footer .= ($slogan !== '' ? ' – '.$slogan : '');
 
 		$links = [
 			[
@@ -141,7 +141,7 @@ 
 		];
 
 		$navigation = $this->navigationManager->getAll(INavigationManager::TYPE_GUEST);
-		$guestNavigation = array_map(function ($nav) {
+		$guestNavigation = array_map(function($nav) {
 			return [
 				'text' => $nav['name'],
 				'url' => $nav['href']
@@ -155,13 +155,13 @@ 
 			if ($link['url'] !== ''
 				&& filter_var($link['url'], FILTER_VALIDATE_URL)
 			) {
-				$legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"'
-					. ' rel="noreferrer noopener">' . $link['text'] . '</a>';
+				$legalLinks .= $divider.'<a href="'.$link['url'].'" class="legal" target="_blank"'
+					. ' rel="noreferrer noopener">'.$link['text'].'</a>';
 				$divider = ' · ';
 			}
 		}
 		if ($legalLinks !== '') {
-			$footer .= '<br/><span class="footer__legal-links">' . $legalLinks . '</span>';
+			$footer .= '<br/><span class="footer__legal-links">'.$legalLinks.'</span>';
 		}
 
 		return $footer;
@@ -270,17 +270,17 @@ 
 			}
 		}
 
-		$cacheBusterCounter = (string)$this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
+		$cacheBusterCounter = (string) $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
 		if (!$logo || !$logoExists) {
 			if ($useSvg) {
 				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
 			} else {
 				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
 			}
-			return $logo . '?v=' . $cacheBusterCounter;
+			return $logo.'?v='.$cacheBusterCounter;
 		}
 
-		return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
+		return $this->urlGenerator->linkToRoute('theming.Theming.getImage', ['key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter]);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return string
 	 */
 	public function getBackground(bool $darkVariant = false): string {
-		return $this->imageManager->getImageUrl('background' . ($darkVariant ? 'Dark' : ''));
+		return $this->imageManager->getImageUrl('background'.($darkVariant ? 'Dark' : ''));
 	}
 
 	/**
@@ -327,23 +327,23 @@ 
 	 */
 	public function getScssVariables() {
 		$cacheBuster = $this->appConfig->getAppValueInt(ConfigLexicon::CACHE_BUSTER);
-		$cache = $this->cacheFactory->createDistributed('theming-' . (string)$cacheBuster . '-' . $this->urlGenerator->getBaseUrl());
+		$cache = $this->cacheFactory->createDistributed('theming-'.(string) $cacheBuster.'-'.$this->urlGenerator->getBaseUrl());
 		if ($value = $cache->get('getScssVariables')) {
 			return $value;
 		}
 
 		$variables = [
-			'theming-cachebuster' => "'" . $cacheBuster . "'",
-			'theming-logo-mime' => "'" . $this->appConfig->getAppValueString('logoMime') . "'",
-			'theming-background-mime' => "'" . $this->appConfig->getAppValueString('backgroundMime') . "'",
-			'theming-logoheader-mime' => "'" . $this->appConfig->getAppValueString('logoheaderMime') . "'",
-			'theming-favicon-mime' => "'" . $this->appConfig->getAppValueString('faviconMime') . "'"
+			'theming-cachebuster' => "'".$cacheBuster."'",
+			'theming-logo-mime' => "'".$this->appConfig->getAppValueString('logoMime')."'",
+			'theming-background-mime' => "'".$this->appConfig->getAppValueString('backgroundMime')."'",
+			'theming-logoheader-mime' => "'".$this->appConfig->getAppValueString('logoheaderMime')."'",
+			'theming-favicon-mime' => "'".$this->appConfig->getAppValueString('faviconMime')."'"
 		];
 
-		$variables['image-logo'] = "url('" . $this->imageManager->getImageUrl('logo') . "')";
-		$variables['image-logoheader'] = "url('" . $this->imageManager->getImageUrl('logoheader') . "')";
-		$variables['image-favicon'] = "url('" . $this->imageManager->getImageUrl('favicon') . "')";
-		$variables['image-login-background'] = "url('" . $this->imageManager->getImageUrl('background') . "')";
+		$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
+		$variables['image-logoheader'] = "url('".$this->imageManager->getImageUrl('logoheader')."')";
+		$variables['image-favicon'] = "url('".$this->imageManager->getImageUrl('favicon')."')";
+		$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
 		$variables['image-login-plain'] = 'false';
 
 		if ($this->appConfig->getAppValueString('primary_color', '') !== '') {
@@ -388,19 +388,19 @@ 
 		if ($image === 'manifest.json') {
 			try {
 				$appPath = $this->appManager->getAppPath($app);
-				if (file_exists($appPath . '/img/manifest.json')) {
+				if (file_exists($appPath.'/img/manifest.json')) {
 					return false;
 				}
 			} catch (AppPathNotFoundException $e) {
 			}
-			$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest', ['app' => $app ]);
+			$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest', ['app' => $app]);
 		}
-		if (str_starts_with($image, 'filetypes/') && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) {
+		if (str_starts_with($image, 'filetypes/') && file_exists(\OC::$SERVERROOT.'/core/img/'.$image)) {
 			$route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
 		}
 
 		if ($route) {
-			return $route . '?v=' . $this->util->getCacheBuster();
+			return $route.'?v='.$this->util->getCacheBuster();
 		}
 
 		return false;
@@ -433,7 +433,7 @@ 
 	public function set($setting, $value): void {
 		switch ($value) {
 			case ConfigLexicon::CACHE_BUSTER:
-				$this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, (int)$value);
+				$this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, (int) $value);
 				break;
 			case ConfigLexicon::USER_THEMING_DISABLED:
 				$value = $value === 'true' || $value === 'yes' || $value === '1';
@@ -494,7 +494,7 @@ 
 			case 'background':
 			case 'favicon':
 				$this->imageManager->delete($setting);
-				$this->appConfig->deleteAppValue($setting . 'Mime');
+				$this->appConfig->deleteAppValue($setting.'Mime');
 				break;
 		}
 

apps/theming/lib/ConfigLexicon.php

Indentation +85 added lines, -85 removed lines

@@ -21,96 +21,96 @@
  * {@see ILexicon}
  */
 class ConfigLexicon implements ILexicon {
-	/** The cache buster index */
-	public const CACHE_BUSTER = 'cachebuster';
-	public const USER_THEMING_DISABLED = 'disable-user-theming';
+    /** The cache buster index */
+    public const CACHE_BUSTER = 'cachebuster';
+    public const USER_THEMING_DISABLED = 'disable-user-theming';
 
-	/** Name of the software running on this instance (usually "Nextcloud") */
-	public const PRODUCT_NAME = 'productName';
-	/** Short name of this instance */
-	public const INSTANCE_NAME = 'name';
-	/** Slogan of this instance */
-	public const INSTANCE_SLOGAN = 'slogan';
-	/** Imprint URL of this instance */
-	public const INSTANCE_IMPRINT_URL = 'imprintUrl';
-	/** Privacy URL of this instance */
-	public const INSTANCE_PRIVACY_URL = 'privacyUrl';
+    /** Name of the software running on this instance (usually "Nextcloud") */
+    public const PRODUCT_NAME = 'productName';
+    /** Short name of this instance */
+    public const INSTANCE_NAME = 'name';
+    /** Slogan of this instance */
+    public const INSTANCE_SLOGAN = 'slogan';
+    /** Imprint URL of this instance */
+    public const INSTANCE_IMPRINT_URL = 'imprintUrl';
+    /** Privacy URL of this instance */
+    public const INSTANCE_PRIVACY_URL = 'privacyUrl';
 
-	// legacy theming
-	/** Base URL of this instance */
-	public const BASE_URL = 'url';
-	/** Base URL for documentation */
-	public const DOC_BASE_URL = 'docBaseUrl';
+    // legacy theming
+    /** Base URL of this instance */
+    public const BASE_URL = 'url';
+    /** Base URL for documentation */
+    public const DOC_BASE_URL = 'docBaseUrl';
 
-	public function getStrictness(): Strictness {
-		return Strictness::NOTICE;
-	}
+    public function getStrictness(): Strictness {
+        return Strictness::NOTICE;
+    }
 
-	public function getAppConfigs(): array {
-		return [
-			// internals
-			new Entry(
-				self::CACHE_BUSTER,
-				ValueType::INT,
-				defaultRaw: 0,
-				definition: 'The current cache buster key for theming assets.',
-			),
-			new Entry(
-				self::USER_THEMING_DISABLED,
-				ValueType::BOOL,
-				defaultRaw: false,
-				definition: 'Whether user theming is disabled.',
-			),
+    public function getAppConfigs(): array {
+        return [
+            // internals
+            new Entry(
+                self::CACHE_BUSTER,
+                ValueType::INT,
+                defaultRaw: 0,
+                definition: 'The current cache buster key for theming assets.',
+            ),
+            new Entry(
+                self::USER_THEMING_DISABLED,
+                ValueType::BOOL,
+                defaultRaw: false,
+                definition: 'Whether user theming is disabled.',
+            ),
 
-			// instance theming
-			new Entry(
-				self::PRODUCT_NAME,
-				ValueType::STRING,
-				defaultRaw: 'Nextcloud',
-				definition: 'The name of the software running on this instance (usually "Nextcloud").',
-			),
-			new Entry(
-				self::INSTANCE_NAME,
-				ValueType::STRING,
-				defaultRaw: '',
-				definition: 'Short name of this instance.',
-			),
-			new Entry(
-				self::INSTANCE_SLOGAN,
-				ValueType::STRING,
-				defaultRaw: '',
-				definition: 'Slogan of this instance.',
-			),
-			new Entry(
-				self::INSTANCE_IMPRINT_URL,
-				ValueType::STRING,
-				defaultRaw: '',
-				definition: 'Imprint URL of this instance.',
-			),
-			new Entry(
-				self::INSTANCE_PRIVACY_URL,
-				ValueType::STRING,
-				defaultRaw: '',
-				definition: 'Privacy URL of this instance.',
-			),
+            // instance theming
+            new Entry(
+                self::PRODUCT_NAME,
+                ValueType::STRING,
+                defaultRaw: 'Nextcloud',
+                definition: 'The name of the software running on this instance (usually "Nextcloud").',
+            ),
+            new Entry(
+                self::INSTANCE_NAME,
+                ValueType::STRING,
+                defaultRaw: '',
+                definition: 'Short name of this instance.',
+            ),
+            new Entry(
+                self::INSTANCE_SLOGAN,
+                ValueType::STRING,
+                defaultRaw: '',
+                definition: 'Slogan of this instance.',
+            ),
+            new Entry(
+                self::INSTANCE_IMPRINT_URL,
+                ValueType::STRING,
+                defaultRaw: '',
+                definition: 'Imprint URL of this instance.',
+            ),
+            new Entry(
+                self::INSTANCE_PRIVACY_URL,
+                ValueType::STRING,
+                defaultRaw: '',
+                definition: 'Privacy URL of this instance.',
+            ),
 
-			// legacy theming
-			new Entry(
-				self::BASE_URL,
-				ValueType::STRING,
-				defaultRaw: '',
-				definition: 'Base URL of this instance.',
-			),
-			new Entry(
-				self::DOC_BASE_URL,
-				ValueType::STRING,
-				defaultRaw: '',
-				definition: 'Base URL for documentation.',
-			),
-		];
-	}
+            // legacy theming
+            new Entry(
+                self::BASE_URL,
+                ValueType::STRING,
+                defaultRaw: '',
+                definition: 'Base URL of this instance.',
+            ),
+            new Entry(
+                self::DOC_BASE_URL,
+                ValueType::STRING,
+                defaultRaw: '',
+                definition: 'Base URL for documentation.',
+            ),
+        ];
+    }
 
-	public function getUserConfigs(): array {
-		return [];
-	}
+    public function getUserConfigs(): array {
+        return [];
+    }
 }

apps/theming/composer/composer/autoload_static.php

Spacing +43 added lines, -43 removed lines

@@ -6,62 +6,62 @@
 
 class ComposerStaticInitTheming
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Theming\\' => 12,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Theming\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Theming\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Theming\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Theming\\Command\\UpdateConfig' => __DIR__ . '/..' . '/../lib/Command/UpdateConfig.php',
-        'OCA\\Theming\\ConfigLexicon' => __DIR__ . '/..' . '/../lib/ConfigLexicon.php',
-        'OCA\\Theming\\Controller\\IconController' => __DIR__ . '/..' . '/../lib/Controller/IconController.php',
-        'OCA\\Theming\\Controller\\ThemingController' => __DIR__ . '/..' . '/../lib/Controller/ThemingController.php',
-        'OCA\\Theming\\Controller\\UserThemeController' => __DIR__ . '/..' . '/../lib/Controller/UserThemeController.php',
-        'OCA\\Theming\\ITheme' => __DIR__ . '/..' . '/../lib/ITheme.php',
-        'OCA\\Theming\\IconBuilder' => __DIR__ . '/..' . '/../lib/IconBuilder.php',
-        'OCA\\Theming\\ImageManager' => __DIR__ . '/..' . '/../lib/ImageManager.php',
-        'OCA\\Theming\\Jobs\\MigrateBackgroundImages' => __DIR__ . '/..' . '/../lib/Jobs/MigrateBackgroundImages.php',
-        'OCA\\Theming\\Jobs\\RestoreBackgroundImageColor' => __DIR__ . '/..' . '/../lib/Jobs/RestoreBackgroundImageColor.php',
-        'OCA\\Theming\\Listener\\BeforePreferenceListener' => __DIR__ . '/..' . '/../lib/Listener/BeforePreferenceListener.php',
-        'OCA\\Theming\\Listener\\BeforeTemplateRenderedListener' => __DIR__ . '/..' . '/../lib/Listener/BeforeTemplateRenderedListener.php',
-        'OCA\\Theming\\Migration\\InitBackgroundImagesMigration' => __DIR__ . '/..' . '/../lib/Migration/InitBackgroundImagesMigration.php',
-        'OCA\\Theming\\Migration\\Version2006Date20240905111627' => __DIR__ . '/..' . '/../lib/Migration/Version2006Date20240905111627.php',
-        'OCA\\Theming\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
-        'OCA\\Theming\\Service\\BackgroundService' => __DIR__ . '/..' . '/../lib/Service/BackgroundService.php',
-        'OCA\\Theming\\Service\\JSDataService' => __DIR__ . '/..' . '/../lib/Service/JSDataService.php',
-        'OCA\\Theming\\Service\\ThemeInjectionService' => __DIR__ . '/..' . '/../lib/Service/ThemeInjectionService.php',
-        'OCA\\Theming\\Service\\ThemesService' => __DIR__ . '/..' . '/../lib/Service/ThemesService.php',
-        'OCA\\Theming\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\Theming\\Settings\\AdminSection' => __DIR__ . '/..' . '/../lib/Settings/AdminSection.php',
-        'OCA\\Theming\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Theming\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
-        'OCA\\Theming\\SetupChecks\\PhpImagickModule' => __DIR__ . '/..' . '/../lib/SetupChecks/PhpImagickModule.php',
-        'OCA\\Theming\\Themes\\CommonThemeTrait' => __DIR__ . '/..' . '/../lib/Themes/CommonThemeTrait.php',
-        'OCA\\Theming\\Themes\\DarkHighContrastTheme' => __DIR__ . '/..' . '/../lib/Themes/DarkHighContrastTheme.php',
-        'OCA\\Theming\\Themes\\DarkTheme' => __DIR__ . '/..' . '/../lib/Themes/DarkTheme.php',
-        'OCA\\Theming\\Themes\\DefaultTheme' => __DIR__ . '/..' . '/../lib/Themes/DefaultTheme.php',
-        'OCA\\Theming\\Themes\\DyslexiaFont' => __DIR__ . '/..' . '/../lib/Themes/DyslexiaFont.php',
-        'OCA\\Theming\\Themes\\HighContrastTheme' => __DIR__ . '/..' . '/../lib/Themes/HighContrastTheme.php',
-        'OCA\\Theming\\Themes\\LightTheme' => __DIR__ . '/..' . '/../lib/Themes/LightTheme.php',
-        'OCA\\Theming\\ThemingDefaults' => __DIR__ . '/..' . '/../lib/ThemingDefaults.php',
-        'OCA\\Theming\\Util' => __DIR__ . '/..' . '/../lib/Util.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Theming\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Theming\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Theming\\Command\\UpdateConfig' => __DIR__.'/..'.'/../lib/Command/UpdateConfig.php',
+        'OCA\\Theming\\ConfigLexicon' => __DIR__.'/..'.'/../lib/ConfigLexicon.php',
+        'OCA\\Theming\\Controller\\IconController' => __DIR__.'/..'.'/../lib/Controller/IconController.php',
+        'OCA\\Theming\\Controller\\ThemingController' => __DIR__.'/..'.'/../lib/Controller/ThemingController.php',
+        'OCA\\Theming\\Controller\\UserThemeController' => __DIR__.'/..'.'/../lib/Controller/UserThemeController.php',
+        'OCA\\Theming\\ITheme' => __DIR__.'/..'.'/../lib/ITheme.php',
+        'OCA\\Theming\\IconBuilder' => __DIR__.'/..'.'/../lib/IconBuilder.php',
+        'OCA\\Theming\\ImageManager' => __DIR__.'/..'.'/../lib/ImageManager.php',
+        'OCA\\Theming\\Jobs\\MigrateBackgroundImages' => __DIR__.'/..'.'/../lib/Jobs/MigrateBackgroundImages.php',
+        'OCA\\Theming\\Jobs\\RestoreBackgroundImageColor' => __DIR__.'/..'.'/../lib/Jobs/RestoreBackgroundImageColor.php',
+        'OCA\\Theming\\Listener\\BeforePreferenceListener' => __DIR__.'/..'.'/../lib/Listener/BeforePreferenceListener.php',
+        'OCA\\Theming\\Listener\\BeforeTemplateRenderedListener' => __DIR__.'/..'.'/../lib/Listener/BeforeTemplateRenderedListener.php',
+        'OCA\\Theming\\Migration\\InitBackgroundImagesMigration' => __DIR__.'/..'.'/../lib/Migration/InitBackgroundImagesMigration.php',
+        'OCA\\Theming\\Migration\\Version2006Date20240905111627' => __DIR__.'/..'.'/../lib/Migration/Version2006Date20240905111627.php',
+        'OCA\\Theming\\ResponseDefinitions' => __DIR__.'/..'.'/../lib/ResponseDefinitions.php',
+        'OCA\\Theming\\Service\\BackgroundService' => __DIR__.'/..'.'/../lib/Service/BackgroundService.php',
+        'OCA\\Theming\\Service\\JSDataService' => __DIR__.'/..'.'/../lib/Service/JSDataService.php',
+        'OCA\\Theming\\Service\\ThemeInjectionService' => __DIR__.'/..'.'/../lib/Service/ThemeInjectionService.php',
+        'OCA\\Theming\\Service\\ThemesService' => __DIR__.'/..'.'/../lib/Service/ThemesService.php',
+        'OCA\\Theming\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\Theming\\Settings\\AdminSection' => __DIR__.'/..'.'/../lib/Settings/AdminSection.php',
+        'OCA\\Theming\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\Theming\\Settings\\PersonalSection' => __DIR__.'/..'.'/../lib/Settings/PersonalSection.php',
+        'OCA\\Theming\\SetupChecks\\PhpImagickModule' => __DIR__.'/..'.'/../lib/SetupChecks/PhpImagickModule.php',
+        'OCA\\Theming\\Themes\\CommonThemeTrait' => __DIR__.'/..'.'/../lib/Themes/CommonThemeTrait.php',
+        'OCA\\Theming\\Themes\\DarkHighContrastTheme' => __DIR__.'/..'.'/../lib/Themes/DarkHighContrastTheme.php',
+        'OCA\\Theming\\Themes\\DarkTheme' => __DIR__.'/..'.'/../lib/Themes/DarkTheme.php',
+        'OCA\\Theming\\Themes\\DefaultTheme' => __DIR__.'/..'.'/../lib/Themes/DefaultTheme.php',
+        'OCA\\Theming\\Themes\\DyslexiaFont' => __DIR__.'/..'.'/../lib/Themes/DyslexiaFont.php',
+        'OCA\\Theming\\Themes\\HighContrastTheme' => __DIR__.'/..'.'/../lib/Themes/HighContrastTheme.php',
+        'OCA\\Theming\\Themes\\LightTheme' => __DIR__.'/..'.'/../lib/Themes/LightTheme.php',
+        'OCA\\Theming\\ThemingDefaults' => __DIR__.'/..'.'/../lib/ThemingDefaults.php',
+        'OCA\\Theming\\Util' => __DIR__.'/..'.'/../lib/Util.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitTheming::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitTheming::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitTheming::$classMap;

apps/theming/composer/composer/autoload_classmap.php

Spacing +36 added lines, -36 removed lines

@@ -6,40 +6,40 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Theming\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Theming\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Theming\\Command\\UpdateConfig' => $baseDir . '/../lib/Command/UpdateConfig.php',
-    'OCA\\Theming\\ConfigLexicon' => $baseDir . '/../lib/ConfigLexicon.php',
-    'OCA\\Theming\\Controller\\IconController' => $baseDir . '/../lib/Controller/IconController.php',
-    'OCA\\Theming\\Controller\\ThemingController' => $baseDir . '/../lib/Controller/ThemingController.php',
-    'OCA\\Theming\\Controller\\UserThemeController' => $baseDir . '/../lib/Controller/UserThemeController.php',
-    'OCA\\Theming\\ITheme' => $baseDir . '/../lib/ITheme.php',
-    'OCA\\Theming\\IconBuilder' => $baseDir . '/../lib/IconBuilder.php',
-    'OCA\\Theming\\ImageManager' => $baseDir . '/../lib/ImageManager.php',
-    'OCA\\Theming\\Jobs\\MigrateBackgroundImages' => $baseDir . '/../lib/Jobs/MigrateBackgroundImages.php',
-    'OCA\\Theming\\Jobs\\RestoreBackgroundImageColor' => $baseDir . '/../lib/Jobs/RestoreBackgroundImageColor.php',
-    'OCA\\Theming\\Listener\\BeforePreferenceListener' => $baseDir . '/../lib/Listener/BeforePreferenceListener.php',
-    'OCA\\Theming\\Listener\\BeforeTemplateRenderedListener' => $baseDir . '/../lib/Listener/BeforeTemplateRenderedListener.php',
-    'OCA\\Theming\\Migration\\InitBackgroundImagesMigration' => $baseDir . '/../lib/Migration/InitBackgroundImagesMigration.php',
-    'OCA\\Theming\\Migration\\Version2006Date20240905111627' => $baseDir . '/../lib/Migration/Version2006Date20240905111627.php',
-    'OCA\\Theming\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
-    'OCA\\Theming\\Service\\BackgroundService' => $baseDir . '/../lib/Service/BackgroundService.php',
-    'OCA\\Theming\\Service\\JSDataService' => $baseDir . '/../lib/Service/JSDataService.php',
-    'OCA\\Theming\\Service\\ThemeInjectionService' => $baseDir . '/../lib/Service/ThemeInjectionService.php',
-    'OCA\\Theming\\Service\\ThemesService' => $baseDir . '/../lib/Service/ThemesService.php',
-    'OCA\\Theming\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\Theming\\Settings\\AdminSection' => $baseDir . '/../lib/Settings/AdminSection.php',
-    'OCA\\Theming\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\Theming\\Settings\\PersonalSection' => $baseDir . '/../lib/Settings/PersonalSection.php',
-    'OCA\\Theming\\SetupChecks\\PhpImagickModule' => $baseDir . '/../lib/SetupChecks/PhpImagickModule.php',
-    'OCA\\Theming\\Themes\\CommonThemeTrait' => $baseDir . '/../lib/Themes/CommonThemeTrait.php',
-    'OCA\\Theming\\Themes\\DarkHighContrastTheme' => $baseDir . '/../lib/Themes/DarkHighContrastTheme.php',
-    'OCA\\Theming\\Themes\\DarkTheme' => $baseDir . '/../lib/Themes/DarkTheme.php',
-    'OCA\\Theming\\Themes\\DefaultTheme' => $baseDir . '/../lib/Themes/DefaultTheme.php',
-    'OCA\\Theming\\Themes\\DyslexiaFont' => $baseDir . '/../lib/Themes/DyslexiaFont.php',
-    'OCA\\Theming\\Themes\\HighContrastTheme' => $baseDir . '/../lib/Themes/HighContrastTheme.php',
-    'OCA\\Theming\\Themes\\LightTheme' => $baseDir . '/../lib/Themes/LightTheme.php',
-    'OCA\\Theming\\ThemingDefaults' => $baseDir . '/../lib/ThemingDefaults.php',
-    'OCA\\Theming\\Util' => $baseDir . '/../lib/Util.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Theming\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Theming\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Theming\\Command\\UpdateConfig' => $baseDir.'/../lib/Command/UpdateConfig.php',
+    'OCA\\Theming\\ConfigLexicon' => $baseDir.'/../lib/ConfigLexicon.php',
+    'OCA\\Theming\\Controller\\IconController' => $baseDir.'/../lib/Controller/IconController.php',
+    'OCA\\Theming\\Controller\\ThemingController' => $baseDir.'/../lib/Controller/ThemingController.php',
+    'OCA\\Theming\\Controller\\UserThemeController' => $baseDir.'/../lib/Controller/UserThemeController.php',
+    'OCA\\Theming\\ITheme' => $baseDir.'/../lib/ITheme.php',
+    'OCA\\Theming\\IconBuilder' => $baseDir.'/../lib/IconBuilder.php',
+    'OCA\\Theming\\ImageManager' => $baseDir.'/../lib/ImageManager.php',
+    'OCA\\Theming\\Jobs\\MigrateBackgroundImages' => $baseDir.'/../lib/Jobs/MigrateBackgroundImages.php',
+    'OCA\\Theming\\Jobs\\RestoreBackgroundImageColor' => $baseDir.'/../lib/Jobs/RestoreBackgroundImageColor.php',
+    'OCA\\Theming\\Listener\\BeforePreferenceListener' => $baseDir.'/../lib/Listener/BeforePreferenceListener.php',
+    'OCA\\Theming\\Listener\\BeforeTemplateRenderedListener' => $baseDir.'/../lib/Listener/BeforeTemplateRenderedListener.php',
+    'OCA\\Theming\\Migration\\InitBackgroundImagesMigration' => $baseDir.'/../lib/Migration/InitBackgroundImagesMigration.php',
+    'OCA\\Theming\\Migration\\Version2006Date20240905111627' => $baseDir.'/../lib/Migration/Version2006Date20240905111627.php',
+    'OCA\\Theming\\ResponseDefinitions' => $baseDir.'/../lib/ResponseDefinitions.php',
+    'OCA\\Theming\\Service\\BackgroundService' => $baseDir.'/../lib/Service/BackgroundService.php',
+    'OCA\\Theming\\Service\\JSDataService' => $baseDir.'/../lib/Service/JSDataService.php',
+    'OCA\\Theming\\Service\\ThemeInjectionService' => $baseDir.'/../lib/Service/ThemeInjectionService.php',
+    'OCA\\Theming\\Service\\ThemesService' => $baseDir.'/../lib/Service/ThemesService.php',
+    'OCA\\Theming\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\Theming\\Settings\\AdminSection' => $baseDir.'/../lib/Settings/AdminSection.php',
+    'OCA\\Theming\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
+    'OCA\\Theming\\Settings\\PersonalSection' => $baseDir.'/../lib/Settings/PersonalSection.php',
+    'OCA\\Theming\\SetupChecks\\PhpImagickModule' => $baseDir.'/../lib/SetupChecks/PhpImagickModule.php',
+    'OCA\\Theming\\Themes\\CommonThemeTrait' => $baseDir.'/../lib/Themes/CommonThemeTrait.php',
+    'OCA\\Theming\\Themes\\DarkHighContrastTheme' => $baseDir.'/../lib/Themes/DarkHighContrastTheme.php',
+    'OCA\\Theming\\Themes\\DarkTheme' => $baseDir.'/../lib/Themes/DarkTheme.php',
+    'OCA\\Theming\\Themes\\DefaultTheme' => $baseDir.'/../lib/Themes/DefaultTheme.php',
+    'OCA\\Theming\\Themes\\DyslexiaFont' => $baseDir.'/../lib/Themes/DyslexiaFont.php',
+    'OCA\\Theming\\Themes\\HighContrastTheme' => $baseDir.'/../lib/Themes/HighContrastTheme.php',
+    'OCA\\Theming\\Themes\\LightTheme' => $baseDir.'/../lib/Themes/LightTheme.php',
+    'OCA\\Theming\\ThemingDefaults' => $baseDir.'/../lib/ThemingDefaults.php',
+    'OCA\\Theming\\Util' => $baseDir.'/../lib/Util.php',
 );

apps/theming/tests/ThemingDefaultsTest.php

Indentation +799 added lines, -799 removed lines

@@ -26,803 +26,803 @@
 use Test\TestCase;
 
 class ThemingDefaultsTest extends TestCase {
-	private IAppConfig&MockObject $appConfig;
-	private IConfig&MockObject $config;
-	private IL10N&MockObject $l10n;
-	private IUserSession&MockObject $userSession;
-	private IURLGenerator&MockObject $urlGenerator;
-	private ICacheFactory&MockObject $cacheFactory;
-	private Util&MockObject $util;
-	private ICache&MockObject $cache;
-	private IAppManager&MockObject $appManager;
-	private ImageManager&MockObject $imageManager;
-	private INavigationManager&MockObject $navigationManager;
-	private BackgroundService&MockObject $backgroundService;
-
-	private \OC_Defaults $defaults;
-	private ThemingDefaults $template;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->cache = $this->createMock(ICache::class);
-		$this->util = $this->createMock(Util::class);
-		$this->imageManager = $this->createMock(ImageManager::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->navigationManager = $this->createMock(INavigationManager::class);
-		$this->backgroundService = $this->createMock(BackgroundService::class);
-		$this->defaults = new \OC_Defaults();
-		$this->urlGenerator
-			->expects($this->any())
-			->method('getBaseUrl')
-			->willReturn('');
-		$this->template = new ThemingDefaults(
-			$this->config,
-			$this->appConfig,
-			$this->l10n,
-			$this->userSession,
-			$this->urlGenerator,
-			$this->cacheFactory,
-			$this->util,
-			$this->imageManager,
-			$this->appManager,
-			$this->navigationManager,
-			$this->backgroundService,
-		);
-	}
-
-	public function testGetNameWithDefault(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getName());
-	}
-
-	public function testGetNameWithCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getName());
-	}
-
-	public function testGetHTMLNameWithDefault(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getHTMLName());
-	}
-
-	public function testGetHTMLNameWithCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getHTMLName());
-	}
-
-	public function testGetTitleWithDefault(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getTitle());
-	}
-
-	public function testGetTitleWithCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getTitle());
-	}
-
-
-	public function testGetEntityWithDefault(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getEntity());
-	}
-
-	public function testGetEntityWithCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getEntity());
-	}
-
-	public function testGetBaseUrlWithDefault(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('url', $this->defaults->getBaseUrl())
-			->willReturn($this->defaults->getBaseUrl());
-
-		$this->assertEquals($this->defaults->getBaseUrl(), $this->template->getBaseUrl());
-	}
-
-	public function testGetBaseUrlWithCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('url', $this->defaults->getBaseUrl())
-			->willReturn('https://example.com/');
-
-		$this->assertEquals('https://example.com/', $this->template->getBaseUrl());
-	}
-
-	public static function legalUrlProvider(): array {
-		return [
-			[''],
-			['https://example.com/legal.html'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
-	public function testGetImprintURL(string $imprintUrl): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('imprintUrl', '')
-			->willReturn($imprintUrl);
-
-		$this->assertEquals($imprintUrl, $this->template->getImprintUrl());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
-	public function testGetPrivacyURL(string $privacyUrl): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('privacyUrl', '')
-			->willReturn($privacyUrl);
-
-		$this->assertEquals($privacyUrl, $this->template->getPrivacyUrl());
-	}
-
-	public function testGetSloganWithDefault(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('slogan', $this->defaults->getSlogan())
-			->willReturn($this->defaults->getSlogan());
-
-		$this->assertEquals($this->defaults->getSlogan(), $this->template->getSlogan());
-	}
-
-	public function testGetSloganWithCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('slogan', $this->defaults->getSlogan())
-			->willReturn('My custom Slogan');
-
-		$this->assertEquals('My custom Slogan', $this->template->getSlogan());
-	}
-
-	public function testGetShortFooter(): void {
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', ''],
-				['privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterEmptyUrl(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), ''],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', ''],
-				['privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<span class="entity-name">Name</span> – Slogan', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterEmptySlogan(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), ''],
-				['imprintUrl', '', ''],
-				['privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a>', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterImprint(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', 'https://example.com/imprint'],
-				['privacyUrl', '', ''],
-			]);
-
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a></span>', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterPrivacy(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', ''],
-				['privacyUrl', '', 'https://example.com/privacy'],
-			]);
-
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterAllLegalLinks(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', 'https://example.com/imprint'],
-				['privacyUrl', '', 'https://example.com/privacy'],
-			]);
-
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
-	}
-
-	public static function invalidLegalUrlProvider(): array {
-		return [
-			['example.com/legal'],  # missing scheme
-			['https:///legal'],     # missing host
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
-	public function testGetShortFooterInvalidImprint(string $invalidImprintUrl): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', $invalidImprintUrl],
-				['privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
-	public function testGetShortFooterInvalidPrivacy(string $invalidPrivacyUrl): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->appConfig
-			->expects($this->exactly(5))
-			->method('getAppValueString')
-			->willReturnMap([
-				['url', $this->defaults->getBaseUrl(), 'url'],
-				['name', 'Nextcloud', 'Name'],
-				['slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['imprintUrl', '', ''],
-				['privacyUrl', '', $invalidPrivacyUrl],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
-	}
-
-	public function testGetColorPrimaryWithDefault(): void {
-		$this->appConfig
-			->expects(self::once())
-			->method('getAppValueBool')
-			->with('disable-user-theming')
-			->willReturn(false);
-		$this->appConfig
-			->expects(self::once())
-			->method('getAppValueString')
-			->with('primary_color', '')
-			->willReturn($this->defaults->getColorPrimary());
-
-		$this->assertEquals($this->defaults->getColorPrimary(), $this->template->getColorPrimary());
-	}
-
-	public function testGetColorPrimaryWithCustom(): void {
-		$this->appConfig
-			->expects(self::once())
-			->method('getAppValueBool')
-			->with('disable-user-theming')
-			->willReturn(false);
-		$this->appConfig
-			->expects(self::once())
-			->method('getAppValueString')
-			->with('primary_color', '')
-			->willReturn('#fff');
-
-		$this->assertEquals('#fff', $this->template->getColorPrimary());
-	}
-
-	public static function dataGetColorPrimary(): array {
-		return [
-			'with fallback default' => [
-				'disableTheming' => false,
-				'primaryColor' => '',
-				'userPrimaryColor' => '',
-				'expected' => BackgroundService::DEFAULT_COLOR,
-			],
-			'with custom admin primary' => [
-				'disableTheming' => false,
-				'primaryColor' => '#aaa',
-				'userPrimaryColor' => '',
-				'expected' => '#aaa',
-			],
-			'with custom invalid admin primary' => [
-				'disableTheming' => false,
-				'primaryColor' => 'invalid',
-				'userPrimaryColor' => '',
-				'expected' => BackgroundService::DEFAULT_COLOR,
-			],
-			'with custom invalid user primary' => [
-				'disableTheming' => false,
-				'primaryColor' => '',
-				'userPrimaryColor' => 'invalid-name',
-				'expected' => BackgroundService::DEFAULT_COLOR,
-			],
-			'with custom user primary' => [
-				'disableTheming' => false,
-				'primaryColor' => '',
-				'userPrimaryColor' => '#bbb',
-				'expected' => '#bbb',
-			],
-			'with disabled user theming primary' => [
-				'disableTheming' => true,
-				'primaryColor' => '#aaa',
-				'userPrimaryColor' => '#bbb',
-				'expected' => '#aaa',
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetColorPrimary')]
-	public function testGetColorPrimary(bool $disableTheming, string $primaryColor, string $userPrimaryColor, string $expected): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-		$this->appConfig
-			->expects(self::any())
-			->method('getAppValueBool')
-			->with('disable-user-theming')
-			->willReturn($disableTheming);
-		$this->appConfig
-			->expects(self::any())
-			->method('getAppValueString')
-			->with('primary_color', '')
-			->willReturn($primaryColor);
-		$this->config
-			->expects($this->any())
-			->method('getUserValue')
-			->with('user', 'theming', 'primary_color', '')
-			->willReturn($userPrimaryColor);
-
-		$this->assertEquals($expected, $this->template->getColorPrimary());
-	}
-
-	public function testSet(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueInt')
-			->with('cachebuster', 16);
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueString')
-			->with('MySetting', 'MyValue');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(15);
-		$this->cacheFactory
-			->expects($this->exactly(2))
-			->method('createDistributed')
-			->willReturnMap([
-				['theming-', $this->cache],
-				['imagePath', $this->cache],
-			]);
-		$this->cache
-			->expects($this->any())
-			->method('clear')
-			->with('');
-		$this->template->set('MySetting', 'MyValue');
-	}
-
-	public function testUndoName(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('name');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(15);
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('name', 'Nextcloud')
-			->willReturn('Nextcloud');
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueInt')
-			->with('cachebuster', 16);
-
-		$this->assertSame('Nextcloud', $this->template->undo('name'));
-	}
-
-	public function testUndoBaseUrl(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('url');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(15);
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('url', $this->defaults->getBaseUrl())
-			->willReturn($this->defaults->getBaseUrl());
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueInt')
-			->with('cachebuster', 16);
-
-		$this->assertSame($this->defaults->getBaseUrl(), $this->template->undo('url'));
-	}
-
-	public function testUndoSlogan(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('slogan');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(15);
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('slogan', $this->defaults->getSlogan())
-			->willReturn($this->defaults->getSlogan());
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueInt')
-			->with('cachebuster', 16);
-
-		$this->assertSame($this->defaults->getSlogan(), $this->template->undo('slogan'));
-	}
-
-	public function testUndoPrimaryColor(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('primary_color');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(15);
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueInt')
-			->with('cachebuster', 16);
-
-		$this->assertSame($this->defaults->getColorPrimary(), $this->template->undo('primary_color'));
-	}
-
-	public function testUndoDefaultAction(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('defaultitem');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster', '0')
-			->willReturn(15);
-		$this->appConfig
-			->expects($this->once())
-			->method('setAppValueInt')
-			->with('cachebuster', 16);
-
-		$this->assertSame('', $this->template->undo('defaultitem'));
-	}
-
-	public function testGetBackground(): void {
-		$this->imageManager
-			->expects($this->once())
-			->method('getImageUrl')
-			->with('background')
-			->willReturn('custom-background?v=0');
-		$this->assertEquals('custom-background?v=0', $this->template->getBackground());
-	}
-
-	private function getLogoHelper($withName, $useSvg) {
-		$this->imageManager->expects($this->any())
-			->method('getImage')
-			->with('logo')
-			->willThrowException(new NotFoundException());
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('logoMime', '')
-			->willReturn('');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(0);
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->with('core', $withName)
-			->willReturn('core-logo');
-		$this->assertEquals('core-logo?v=0', $this->template->getLogo($useSvg));
-	}
-
-	public function testGetLogoDefaultWithSvg(): void {
-		$this->getLogoHelper('logo/logo.svg', true);
-	}
-
-	public function testGetLogoDefaultWithoutSvg(): void {
-		$this->getLogoHelper('logo/logo.png', false);
-	}
-
-	public function testGetLogoCustom(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('logoMime', '')
-			->willReturn('image/svg+xml');
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(0);
-		$this->urlGenerator->expects($this->once())
-			->method('linkToRoute')
-			->with('theming.Theming.getImage')
-			->willReturn('custom-logo?v=0');
-		$this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
-	}
-
-	public function testGetScssVariablesCached(): void {
-		$this->appConfig->expects($this->any())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(1);
-		$this->cacheFactory->expects($this->once())
-			->method('createDistributed')
-			->with('theming-1-')
-			->willReturn($this->cache);
-		$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(['foo' => 'bar']);
-		$this->assertEquals(['foo' => 'bar'], $this->template->getScssVariables());
-	}
-
-	public function testGetScssVariables(): void {
-		$this->appConfig->expects($this->any())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(0);
-		$this->appConfig
-			->expects($this->any())
-			->method('getAppValueString')
-			->willReturnMap([
-				['imprintUrl', '', ''],
-				['privacyUrl', '', ''],
-				['logoMime', '', 'jpeg'],
-				['backgroundMime', '', 'jpeg'],
-				['logoheaderMime', '', 'jpeg'],
-				['faviconMime', '', 'jpeg'],
-				['primary_color', '', false, $this->defaults->getColorPrimary()],
-				['primary_color', $this->defaults->getColorPrimary(), false, $this->defaults->getColorPrimary()],
-			]);
-
-		$this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
-		$this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
-		$this->cacheFactory->expects($this->once())
-			->method('createDistributed')
-			->with('theming-0-')
-			->willReturn($this->cache);
-		$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);
-		$this->imageManager->expects($this->exactly(4))
-			->method('getImageUrl')
-			->willReturnMap([
-				['logo', 'custom-logo?v=0'],
-				['logoheader', 'custom-logoheader?v=0'],
-				['favicon', 'custom-favicon?v=0'],
-				['background', 'custom-background?v=0'],
-			]);
-
-		$expected = [
-			'theming-cachebuster' => '\'0\'',
-			'theming-logo-mime' => '\'jpeg\'',
-			'theming-background-mime' => '\'jpeg\'',
-			'image-logo' => "url('custom-logo?v=0')",
-			'image-login-background' => "url('custom-background?v=0')",
-			'color-primary' => $this->defaults->getColorPrimary(),
-			'color-primary-text' => '#ffffff',
-			'image-login-plain' => 'false',
-			'color-primary-element' => '#aaaaaa',
-			'theming-logoheader-mime' => '\'jpeg\'',
-			'theming-favicon-mime' => '\'jpeg\'',
-			'image-logoheader' => "url('custom-logoheader?v=0')",
-			'image-favicon' => "url('custom-favicon?v=0')",
-			'has-legal-links' => 'false'
-		];
-		$this->assertEquals($expected, $this->template->getScssVariables());
-	}
-
-	public function testGetDefaultAndroidURL(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
-			->willReturn('https://play.google.com/store/apps/details?id=com.nextcloud.client');
-
-		$this->assertEquals('https://play.google.com/store/apps/details?id=com.nextcloud.client', $this->template->getAndroidClientUrl());
-	}
-
-	public function testGetCustomAndroidURL(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
-			->willReturn('https://play.google.com/store/apps/details?id=com.mycloud.client');
-
-		$this->assertEquals('https://play.google.com/store/apps/details?id=com.mycloud.client', $this->template->getAndroidClientUrl());
-	}
-
-	public function testGetDefaultiOSURL(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
-			->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8');
-
-		$this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', $this->template->getiOSClientUrl());
-	}
-
-	public function testGetCustomiOSURL(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
-			->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8');
-
-		$this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8', $this->template->getiOSClientUrl());
-	}
-
-	public function testGetDefaultiTunesAppId(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('iTunesAppId', '1125420102')
-			->willReturn('1125420102');
-
-		$this->assertEquals('1125420102', $this->template->getiTunesAppId());
-	}
-
-	public function testGetCustomiTunesAppId(): void {
-		$this->appConfig
-			->expects($this->once())
-			->method('getAppValueString')
-			->with('iTunesAppId', '1125420102')
-			->willReturn('1234567890');
-
-		$this->assertEquals('1234567890', $this->template->getiTunesAppId());
-	}
-
-	public static function dataReplaceImagePath(): array {
-		return [
-			['core', 'test.png', false],
-			['core', 'manifest.json'],
-			['core', 'favicon.ico'],
-			['core', 'favicon-touch.png']
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataReplaceImagePath')]
-	public function testReplaceImagePath(string $app, string $image, string|bool $result = 'themingRoute?v=1234abcd'): void {
-		$this->cache->expects($this->any())
-			->method('get')
-			->with('shouldReplaceIcons')
-			->willReturn(true);
-		$this->appConfig
-			->expects($this->any())
-			->method('getAppValueInt')
-			->with('cachebuster')
-			->willReturn(0);
-		$this->urlGenerator
-			->expects($this->any())
-			->method('linkToRoute')
-			->willReturn('themingRoute');
-		if ($result) {
-			$this->util
-				->expects($this->once())
-				->method('getCacheBuster')
-				->willReturn('1234abcd');
-		}
-		$this->assertEquals($result, $this->template->replaceImagePath($app, $image));
-	}
+    private IAppConfig&MockObject $appConfig;
+    private IConfig&MockObject $config;
+    private IL10N&MockObject $l10n;
+    private IUserSession&MockObject $userSession;
+    private IURLGenerator&MockObject $urlGenerator;
+    private ICacheFactory&MockObject $cacheFactory;
+    private Util&MockObject $util;
+    private ICache&MockObject $cache;
+    private IAppManager&MockObject $appManager;
+    private ImageManager&MockObject $imageManager;
+    private INavigationManager&MockObject $navigationManager;
+    private BackgroundService&MockObject $backgroundService;
+
+    private \OC_Defaults $defaults;
+    private ThemingDefaults $template;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->cache = $this->createMock(ICache::class);
+        $this->util = $this->createMock(Util::class);
+        $this->imageManager = $this->createMock(ImageManager::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->navigationManager = $this->createMock(INavigationManager::class);
+        $this->backgroundService = $this->createMock(BackgroundService::class);
+        $this->defaults = new \OC_Defaults();
+        $this->urlGenerator
+            ->expects($this->any())
+            ->method('getBaseUrl')
+            ->willReturn('');
+        $this->template = new ThemingDefaults(
+            $this->config,
+            $this->appConfig,
+            $this->l10n,
+            $this->userSession,
+            $this->urlGenerator,
+            $this->cacheFactory,
+            $this->util,
+            $this->imageManager,
+            $this->appManager,
+            $this->navigationManager,
+            $this->backgroundService,
+        );
+    }
+
+    public function testGetNameWithDefault(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getName());
+    }
+
+    public function testGetNameWithCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getName());
+    }
+
+    public function testGetHTMLNameWithDefault(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getHTMLName());
+    }
+
+    public function testGetHTMLNameWithCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getHTMLName());
+    }
+
+    public function testGetTitleWithDefault(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getTitle());
+    }
+
+    public function testGetTitleWithCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getTitle());
+    }
+
+
+    public function testGetEntityWithDefault(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getEntity());
+    }
+
+    public function testGetEntityWithCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getEntity());
+    }
+
+    public function testGetBaseUrlWithDefault(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('url', $this->defaults->getBaseUrl())
+            ->willReturn($this->defaults->getBaseUrl());
+
+        $this->assertEquals($this->defaults->getBaseUrl(), $this->template->getBaseUrl());
+    }
+
+    public function testGetBaseUrlWithCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('url', $this->defaults->getBaseUrl())
+            ->willReturn('https://example.com/');
+
+        $this->assertEquals('https://example.com/', $this->template->getBaseUrl());
+    }
+
+    public static function legalUrlProvider(): array {
+        return [
+            [''],
+            ['https://example.com/legal.html'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
+    public function testGetImprintURL(string $imprintUrl): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('imprintUrl', '')
+            ->willReturn($imprintUrl);
+
+        $this->assertEquals($imprintUrl, $this->template->getImprintUrl());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
+    public function testGetPrivacyURL(string $privacyUrl): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('privacyUrl', '')
+            ->willReturn($privacyUrl);
+
+        $this->assertEquals($privacyUrl, $this->template->getPrivacyUrl());
+    }
+
+    public function testGetSloganWithDefault(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('slogan', $this->defaults->getSlogan())
+            ->willReturn($this->defaults->getSlogan());
+
+        $this->assertEquals($this->defaults->getSlogan(), $this->template->getSlogan());
+    }
+
+    public function testGetSloganWithCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('slogan', $this->defaults->getSlogan())
+            ->willReturn('My custom Slogan');
+
+        $this->assertEquals('My custom Slogan', $this->template->getSlogan());
+    }
+
+    public function testGetShortFooter(): void {
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', ''],
+                ['privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterEmptyUrl(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), ''],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', ''],
+                ['privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<span class="entity-name">Name</span> – Slogan', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterEmptySlogan(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), ''],
+                ['imprintUrl', '', ''],
+                ['privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a>', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterImprint(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', 'https://example.com/imprint'],
+                ['privacyUrl', '', ''],
+            ]);
+
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a></span>', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterPrivacy(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', ''],
+                ['privacyUrl', '', 'https://example.com/privacy'],
+            ]);
+
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterAllLegalLinks(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', 'https://example.com/imprint'],
+                ['privacyUrl', '', 'https://example.com/privacy'],
+            ]);
+
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
+    }
+
+    public static function invalidLegalUrlProvider(): array {
+        return [
+            ['example.com/legal'],  # missing scheme
+            ['https:///legal'],     # missing host
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
+    public function testGetShortFooterInvalidImprint(string $invalidImprintUrl): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', $invalidImprintUrl],
+                ['privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
+    public function testGetShortFooterInvalidPrivacy(string $invalidPrivacyUrl): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->appConfig
+            ->expects($this->exactly(5))
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['url', $this->defaults->getBaseUrl(), 'url'],
+                ['name', 'Nextcloud', 'Name'],
+                ['slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['imprintUrl', '', ''],
+                ['privacyUrl', '', $invalidPrivacyUrl],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
+    }
+
+    public function testGetColorPrimaryWithDefault(): void {
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getAppValueBool')
+            ->with('disable-user-theming')
+            ->willReturn(false);
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getAppValueString')
+            ->with('primary_color', '')
+            ->willReturn($this->defaults->getColorPrimary());
+
+        $this->assertEquals($this->defaults->getColorPrimary(), $this->template->getColorPrimary());
+    }
+
+    public function testGetColorPrimaryWithCustom(): void {
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getAppValueBool')
+            ->with('disable-user-theming')
+            ->willReturn(false);
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getAppValueString')
+            ->with('primary_color', '')
+            ->willReturn('#fff');
+
+        $this->assertEquals('#fff', $this->template->getColorPrimary());
+    }
+
+    public static function dataGetColorPrimary(): array {
+        return [
+            'with fallback default' => [
+                'disableTheming' => false,
+                'primaryColor' => '',
+                'userPrimaryColor' => '',
+                'expected' => BackgroundService::DEFAULT_COLOR,
+            ],
+            'with custom admin primary' => [
+                'disableTheming' => false,
+                'primaryColor' => '#aaa',
+                'userPrimaryColor' => '',
+                'expected' => '#aaa',
+            ],
+            'with custom invalid admin primary' => [
+                'disableTheming' => false,
+                'primaryColor' => 'invalid',
+                'userPrimaryColor' => '',
+                'expected' => BackgroundService::DEFAULT_COLOR,
+            ],
+            'with custom invalid user primary' => [
+                'disableTheming' => false,
+                'primaryColor' => '',
+                'userPrimaryColor' => 'invalid-name',
+                'expected' => BackgroundService::DEFAULT_COLOR,
+            ],
+            'with custom user primary' => [
+                'disableTheming' => false,
+                'primaryColor' => '',
+                'userPrimaryColor' => '#bbb',
+                'expected' => '#bbb',
+            ],
+            'with disabled user theming primary' => [
+                'disableTheming' => true,
+                'primaryColor' => '#aaa',
+                'userPrimaryColor' => '#bbb',
+                'expected' => '#aaa',
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetColorPrimary')]
+    public function testGetColorPrimary(bool $disableTheming, string $primaryColor, string $userPrimaryColor, string $expected): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+        $this->appConfig
+            ->expects(self::any())
+            ->method('getAppValueBool')
+            ->with('disable-user-theming')
+            ->willReturn($disableTheming);
+        $this->appConfig
+            ->expects(self::any())
+            ->method('getAppValueString')
+            ->with('primary_color', '')
+            ->willReturn($primaryColor);
+        $this->config
+            ->expects($this->any())
+            ->method('getUserValue')
+            ->with('user', 'theming', 'primary_color', '')
+            ->willReturn($userPrimaryColor);
+
+        $this->assertEquals($expected, $this->template->getColorPrimary());
+    }
+
+    public function testSet(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueInt')
+            ->with('cachebuster', 16);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueString')
+            ->with('MySetting', 'MyValue');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(15);
+        $this->cacheFactory
+            ->expects($this->exactly(2))
+            ->method('createDistributed')
+            ->willReturnMap([
+                ['theming-', $this->cache],
+                ['imagePath', $this->cache],
+            ]);
+        $this->cache
+            ->expects($this->any())
+            ->method('clear')
+            ->with('');
+        $this->template->set('MySetting', 'MyValue');
+    }
+
+    public function testUndoName(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('name');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(15);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueInt')
+            ->with('cachebuster', 16);
+
+        $this->assertSame('Nextcloud', $this->template->undo('name'));
+    }
+
+    public function testUndoBaseUrl(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('url');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(15);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('url', $this->defaults->getBaseUrl())
+            ->willReturn($this->defaults->getBaseUrl());
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueInt')
+            ->with('cachebuster', 16);
+
+        $this->assertSame($this->defaults->getBaseUrl(), $this->template->undo('url'));
+    }
+
+    public function testUndoSlogan(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('slogan');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(15);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('slogan', $this->defaults->getSlogan())
+            ->willReturn($this->defaults->getSlogan());
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueInt')
+            ->with('cachebuster', 16);
+
+        $this->assertSame($this->defaults->getSlogan(), $this->template->undo('slogan'));
+    }
+
+    public function testUndoPrimaryColor(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('primary_color');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(15);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueInt')
+            ->with('cachebuster', 16);
+
+        $this->assertSame($this->defaults->getColorPrimary(), $this->template->undo('primary_color'));
+    }
+
+    public function testUndoDefaultAction(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('defaultitem');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster', '0')
+            ->willReturn(15);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('setAppValueInt')
+            ->with('cachebuster', 16);
+
+        $this->assertSame('', $this->template->undo('defaultitem'));
+    }
+
+    public function testGetBackground(): void {
+        $this->imageManager
+            ->expects($this->once())
+            ->method('getImageUrl')
+            ->with('background')
+            ->willReturn('custom-background?v=0');
+        $this->assertEquals('custom-background?v=0', $this->template->getBackground());
+    }
+
+    private function getLogoHelper($withName, $useSvg) {
+        $this->imageManager->expects($this->any())
+            ->method('getImage')
+            ->with('logo')
+            ->willThrowException(new NotFoundException());
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('logoMime', '')
+            ->willReturn('');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(0);
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->with('core', $withName)
+            ->willReturn('core-logo');
+        $this->assertEquals('core-logo?v=0', $this->template->getLogo($useSvg));
+    }
+
+    public function testGetLogoDefaultWithSvg(): void {
+        $this->getLogoHelper('logo/logo.svg', true);
+    }
+
+    public function testGetLogoDefaultWithoutSvg(): void {
+        $this->getLogoHelper('logo/logo.png', false);
+    }
+
+    public function testGetLogoCustom(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('logoMime', '')
+            ->willReturn('image/svg+xml');
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(0);
+        $this->urlGenerator->expects($this->once())
+            ->method('linkToRoute')
+            ->with('theming.Theming.getImage')
+            ->willReturn('custom-logo?v=0');
+        $this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
+    }
+
+    public function testGetScssVariablesCached(): void {
+        $this->appConfig->expects($this->any())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(1);
+        $this->cacheFactory->expects($this->once())
+            ->method('createDistributed')
+            ->with('theming-1-')
+            ->willReturn($this->cache);
+        $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $this->template->getScssVariables());
+    }
+
+    public function testGetScssVariables(): void {
+        $this->appConfig->expects($this->any())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(0);
+        $this->appConfig
+            ->expects($this->any())
+            ->method('getAppValueString')
+            ->willReturnMap([
+                ['imprintUrl', '', ''],
+                ['privacyUrl', '', ''],
+                ['logoMime', '', 'jpeg'],
+                ['backgroundMime', '', 'jpeg'],
+                ['logoheaderMime', '', 'jpeg'],
+                ['faviconMime', '', 'jpeg'],
+                ['primary_color', '', false, $this->defaults->getColorPrimary()],
+                ['primary_color', $this->defaults->getColorPrimary(), false, $this->defaults->getColorPrimary()],
+            ]);
+
+        $this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
+        $this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
+        $this->cacheFactory->expects($this->once())
+            ->method('createDistributed')
+            ->with('theming-0-')
+            ->willReturn($this->cache);
+        $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);
+        $this->imageManager->expects($this->exactly(4))
+            ->method('getImageUrl')
+            ->willReturnMap([
+                ['logo', 'custom-logo?v=0'],
+                ['logoheader', 'custom-logoheader?v=0'],
+                ['favicon', 'custom-favicon?v=0'],
+                ['background', 'custom-background?v=0'],
+            ]);
+
+        $expected = [
+            'theming-cachebuster' => '\'0\'',
+            'theming-logo-mime' => '\'jpeg\'',
+            'theming-background-mime' => '\'jpeg\'',
+            'image-logo' => "url('custom-logo?v=0')",
+            'image-login-background' => "url('custom-background?v=0')",
+            'color-primary' => $this->defaults->getColorPrimary(),
+            'color-primary-text' => '#ffffff',
+            'image-login-plain' => 'false',
+            'color-primary-element' => '#aaaaaa',
+            'theming-logoheader-mime' => '\'jpeg\'',
+            'theming-favicon-mime' => '\'jpeg\'',
+            'image-logoheader' => "url('custom-logoheader?v=0')",
+            'image-favicon' => "url('custom-favicon?v=0')",
+            'has-legal-links' => 'false'
+        ];
+        $this->assertEquals($expected, $this->template->getScssVariables());
+    }
+
+    public function testGetDefaultAndroidURL(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
+            ->willReturn('https://play.google.com/store/apps/details?id=com.nextcloud.client');
+
+        $this->assertEquals('https://play.google.com/store/apps/details?id=com.nextcloud.client', $this->template->getAndroidClientUrl());
+    }
+
+    public function testGetCustomAndroidURL(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
+            ->willReturn('https://play.google.com/store/apps/details?id=com.mycloud.client');
+
+        $this->assertEquals('https://play.google.com/store/apps/details?id=com.mycloud.client', $this->template->getAndroidClientUrl());
+    }
+
+    public function testGetDefaultiOSURL(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
+            ->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8');
+
+        $this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', $this->template->getiOSClientUrl());
+    }
+
+    public function testGetCustomiOSURL(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
+            ->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8');
+
+        $this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8', $this->template->getiOSClientUrl());
+    }
+
+    public function testGetDefaultiTunesAppId(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('iTunesAppId', '1125420102')
+            ->willReturn('1125420102');
+
+        $this->assertEquals('1125420102', $this->template->getiTunesAppId());
+    }
+
+    public function testGetCustomiTunesAppId(): void {
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getAppValueString')
+            ->with('iTunesAppId', '1125420102')
+            ->willReturn('1234567890');
+
+        $this->assertEquals('1234567890', $this->template->getiTunesAppId());
+    }
+
+    public static function dataReplaceImagePath(): array {
+        return [
+            ['core', 'test.png', false],
+            ['core', 'manifest.json'],
+            ['core', 'favicon.ico'],
+            ['core', 'favicon-touch.png']
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataReplaceImagePath')]
+    public function testReplaceImagePath(string $app, string $image, string|bool $result = 'themingRoute?v=1234abcd'): void {
+        $this->cache->expects($this->any())
+            ->method('get')
+            ->with('shouldReplaceIcons')
+            ->willReturn(true);
+        $this->appConfig
+            ->expects($this->any())
+            ->method('getAppValueInt')
+            ->with('cachebuster')
+            ->willReturn(0);
+        $this->urlGenerator
+            ->expects($this->any())
+            ->method('linkToRoute')
+            ->willReturn('themingRoute');
+        if ($result) {
+            $this->util
+                ->expects($this->once())
+                ->method('getCacheBuster')
+                ->willReturn('1234abcd');
+        }
+        $this->assertEquals($result, $this->template->replaceImagePath($app, $image));
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -338,8 +338,8 @@ 
 
 	public static function invalidLegalUrlProvider(): array {
 		return [
-			['example.com/legal'],  # missing scheme
-			['https:///legal'],     # missing host
+			['example.com/legal'], # missing scheme
+			['https:///legal'], # missing host
 		];
 	}
 
@@ -663,7 +663,7 @@ 
 			->method('linkToRoute')
 			->with('theming.Theming.getImage')
 			->willReturn('custom-logo?v=0');
-		$this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
+		$this->assertEquals('custom-logo'.'?v=0', $this->template->getLogo());
 	}
 
 	public function testGetScssVariablesCached(): void {
@@ -803,7 +803,7 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataReplaceImagePath')]
-	public function testReplaceImagePath(string $app, string $image, string|bool $result = 'themingRoute?v=1234abcd'): void {
+	public function testReplaceImagePath(string $app, string $image, string | bool $result = 'themingRoute?v=1234abcd'): void {
 		$this->cache->expects($this->any())
 			->method('get')
 			->with('shouldReplaceIcons')