refactor: Reduce complexity of `TemplateLayout` constructorrefactor/template-layout

This restructures the constructor to be easier to understand,
by splitting things into different helper functions.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

1 files changed, 278 insertions, 222 deletions

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 60c7526435e..d1e4515d90d 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -19,9 +19,10 @@ use OCP\App\IAppManager;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Defaults;
 use OCP\IConfig;
-use OCP\IInitialStateService;
+use OCP\IGroupManager;
 use OCP\INavigationManager;
 use OCP\IRequest;
+use OCP\ISession;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
@@ -38,242 +39,162 @@ class TemplateLayout extends \OC_Template {
 	/** @var JSResourceLocator|null */
 	public static $jsLocator = null;
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IInitialStateService */
-	private $initialState;
-
-	/** @var INavigationManager */
-	private $navigationManager;
+	private IConfig $config;
+	private IRequest $request;
+	private IAppManager $appManager;
+	private InitialStateService $initialState;
+	private INavigationManager $navigationManager;
 
 	/**
 	 * @param string $renderAs
 	 * @param string $appId application id
 	 */
-	public function __construct($renderAs, $appId = '') {
-		/** @var IConfig */
-		$this->config = \OC::$server->get(IConfig::class);
-
-		/** @var IInitialStateService */
-		$this->initialState = \OC::$server->get(IInitialStateService::class);
-
-		// Add fallback theming variables if theming is disabled
-		if ($renderAs !== TemplateResponse::RENDER_AS_USER
-			|| !\OC::$server->getAppManager()->isEnabledForUser('theming')) {
-			// TODO cache generated default theme if enabled for fallback if server is erroring ?
-			Util::addStyle('theming', 'default');
-		}
+	public function __construct(
+		$renderAs,
+		private string $appId = '',
+	) {
+		$this->config = \OCP\Server::get(IConfig::class);
+		$this->request = \OCP\Server::get(IRequest::class);
+		$this->appManager = \OCP\Server::get(IAppManager::class);
+		$this->initialState = \OCP\Server::get(InitialStateService::class);
+		$this->navigationManager = \OCP\Server::get(INavigationManager::class);
 
 		// Decide which page we show
-		if ($renderAs === TemplateResponse::RENDER_AS_USER) {
-			/** @var INavigationManager */
-			$this->navigationManager = \OC::$server->get(INavigationManager::class);
-
-			parent::__construct('core', 'layout.user');
-			if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
-				$this->assign('bodyid', 'body-settings');
-			} else {
-				$this->assign('bodyid', 'body-user');
-			}
-
-			$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
-			$this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
-
-			if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
-				$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
-				$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
-				$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
-				Util::addScript('core', 'legacy-unified-search', 'core');
-			} else {
-				Util::addScript('core', 'unified-search', 'core');
-			}
-			// Set body data-theme
-			$this->assign('enabledThemes', []);
-			if (\OC::$server->getAppManager()->isEnabledForUser('theming') && class_exists('\OCA\Theming\Service\ThemesService')) {
-				/** @var \OCA\Theming\Service\ThemesService */
-				$themesService = \OC::$server->get(\OCA\Theming\Service\ThemesService::class);
-				$this->assign('enabledThemes', $themesService->getEnabledThemes());
-			}
-
-			// Set logo link target
-			$logoUrl = $this->config->getSystemValueString('logo_url', '');
-			$this->assign('logoUrl', $logoUrl);
-
-			// Set default entry name
-			$defaultEntryId = \OCP\Server::get(INavigationManager::class)->getDefaultEntryIdForUser();
-			$defaultEntry = \OCP\Server::get(INavigationManager::class)->get($defaultEntryId);
-			$this->assign('defaultAppName', $defaultEntry['name']);
-
-			// Add navigation entry
-			$this->assign('application', '');
-			$this->assign('appid', $appId);
-
-			$navigation = $this->navigationManager->getAll();
-			$this->assign('navigation', $navigation);
-			$settingsNavigation = $this->navigationManager->getAll('settings');
-			$this->initialState->provideInitialState('core', 'settingsNavEntries', $settingsNavigation);
-
-			foreach ($navigation as $entry) {
-				if ($entry['active']) {
-					$this->assign('application', $entry['name']);
-					break;
-				}
-			}
+		switch ($renderAs) {
+			case TemplateResponse::RENDER_AS_ERROR:
+				parent::__construct('core', 'layout.guest', '', false);
+				$this->setupLayoutError();
+				break;
+			case TemplateResponse::RENDER_AS_GUEST:
+				parent::__construct('core', 'layout.guest');
+				$this->setupLayoutGuest();
+				break;
+			case TemplateResponse::RENDER_AS_PUBLIC:
+				parent::__construct('core', 'layout.public');
+				$this->setupLayoutPublic();
+				break;
+			case TemplateResponse::RENDER_AS_USER:
+				parent::__construct('core', 'layout.user');
+				$this->setupLayoutUser();
+				break;
+			case TemplateResponse::RENDER_AS_BASE:
+			case TemplateResponse::RENDER_AS_BLANK:
+			default:
+				parent::__construct('core', 'layout.base');
+		}
 
-			foreach ($settingsNavigation as $entry) {
-				if ($entry['active']) {
-					$this->assign('application', $entry['name']);
-					break;
-				}
+		// Setup version hash
+		if ($this->config->getSystemValueBool('installed', false)) {
+			if (empty(self::$versionHash)) {
+				$serverVersion = \OCP\Server::get(ServerVersion::class);
+				$v = \OC_App::getAppVersions();
+				$v['core'] = implode('.', $serverVersion->getVersion());
+				self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
 			}
+		} else {
+			self::$versionHash = md5('not installed');
+		}
+		$this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
 
-			$userDisplayName = false;
-			$user = \OC::$server->get(IUserSession::class)->getUser();
-			if ($user) {
-				$userDisplayName = $user->getDisplayName();
-			}
-			$this->assign('user_displayname', $userDisplayName);
-			$this->assign('user_uid', \OC_User::getUser());
+		// Setup common parameters
+		$this->assign('appid', $appId);
+		$this->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
+		$this->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
 
-			if ($user === null) {
-				$this->assign('userAvatarSet', false);
-				$this->assign('userStatus', false);
-			} else {
-				$this->assign('userAvatarSet', true);
-				$this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
-			}
-		} elseif ($renderAs === TemplateResponse::RENDER_AS_ERROR) {
-			parent::__construct('core', 'layout.guest', '', false);
-			$this->assign('bodyid', 'body-login');
-			$this->assign('user_displayname', '');
-			$this->assign('user_uid', '');
-		} elseif ($renderAs === TemplateResponse::RENDER_AS_GUEST) {
-			parent::__construct('core', 'layout.guest');
-			\OC_Util::addStyle('guest');
-			$this->assign('bodyid', 'body-login');
+		// Send the language, locale, and direction to our layouts
+		$this->setupLanguageInformation();
 
-			$userDisplayName = false;
-			$user = \OC::$server->get(IUserSession::class)->getUser();
-			if ($user) {
-				$userDisplayName = $user->getDisplayName();
-			}
-			$this->assign('user_displayname', $userDisplayName);
-			$this->assign('user_uid', \OC_User::getUser());
-		} elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {
-			parent::__construct('core', 'layout.public');
-			$this->assign('appid', $appId);
-			$this->assign('bodyid', 'body-public');
-
-			// Set logo link target
-			$logoUrl = $this->config->getSystemValueString('logo_url', '');
-			$this->assign('logoUrl', $logoUrl);
-
-			/** @var IRegistry $subscription */
-			$subscription = \OCP\Server::get(IRegistry::class);
-			$showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
-			if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
-				$showSimpleSignup = false;
-			}
+		// Prevent auto zoom with iOS but still allow user zoom
+		if ($this->request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
+			// On chrome (and others) this does not work (will also disable user zoom)
+			$this->assign('viewport_maximum_scale', '1.0');
+		}
 
-			$defaultSignUpLink = 'https://nextcloud.com/signup/';
-			$signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
-			if ($signUpLink !== $defaultSignUpLink) {
-				$showSimpleSignup = true;
-			}
+		// Add fallback theming variables if theming is disabled
+		if ($renderAs !== TemplateResponse::RENDER_AS_USER) {
+			// TODO cache generated default theme if enabled for fallback if server is erroring ?
+			Util::addStyle('theming', 'default');
+		}
 
-			$appManager = \OCP\Server::get(IAppManager::class);
-			if ($appManager->isEnabledForUser('registration')) {
-				$urlGenerator = \OCP\Server::get(IURLGenerator::class);
-				$signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
-			}
+		// Add the CSS files
+		$this->setupCssFiles();
 
-			$this->assign('showSimpleSignUpLink', $showSimpleSignup);
-			$this->assign('signUpLink', $signUpLink);
-		} else {
-			parent::__construct('core', 'layout.base');
+		// Add the JS config
+		if ($this->config->getSystemValueBool('installed', false) && $renderAs !== TemplateResponse::RENDER_AS_ERROR) {
+			$this->setupJsConfig();
 		}
-		// Send the language, locale, and direction to our layouts
-		$lang = \OC::$server->get(IFactory::class)->findLanguage();
-		$locale = \OC::$server->get(IFactory::class)->findLocale($lang);
-		$direction = \OC::$server->getL10NFactory()->getLanguageDirection($lang);
 
-		$lang = str_replace('_', '-', $lang);
-		$this->assign('language', $lang);
-		$this->assign('locale', $locale);
-		$this->assign('direction', $direction);
+		// Add the JavaScript files
+		$this->setupJavaScriptFiles();
 
-		if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			if (empty(self::$versionHash)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode('.', \OCP\Util::getVersion());
-				self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
-			}
-		} else {
-			self::$versionHash = md5('not installed');
-		}
+		// Add all initial states
+		$this->assign('initialStates', $this->initialState->getInitialStates());
+	}
 
-		// Add the js files
+	/**
+	 * Add all registered JavaScript files to the response
+	 */
+	private function setupJavaScriptFiles(): void {
+		$this->assign('jsfiles', []);
 		// TODO: remove deprecated OC_Util injection
 		$jsFiles = self::findJavascriptFiles(array_merge(\OC_Util::$scripts, Util::getScripts()));
-		$this->assign('jsfiles', []);
-		if ($this->config->getSystemValueBool('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
-			// this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)
-			// see https://github.com/nextcloud/server/pull/22636 for details
-			$jsConfigHelper = new JSConfigHelper(
-				\OCP\Server::get(ServerVersion::class),
-				\OCP\Util::getL10N('lib'),
-				\OCP\Server::get(Defaults::class),
-				\OC::$server->getAppManager(),
-				\OC::$server->getSession(),
-				\OC::$server->getUserSession()->getUser(),
-				$this->config,
-				\OC::$server->getGroupManager(),
-				\OC::$server->get(IniGetWrapper::class),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->get(CapabilitiesManager::class),
-				\OCP\Server::get(IInitialStateService::class),
-				\OCP\Server::get(IProvider::class),
-				\OCP\Server::get(FilenameValidator::class),
-			);
-			$config = $jsConfigHelper->getConfig();
-			if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
-				$this->assign('inline_ocjs', $config);
-			} else {
-				$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
-			}
-		}
 		foreach ($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
 			$this->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
 		}
+	}
+
+	/**
+	 * Add the JS initial-config to the response
+	 */
+	private function setupJsConfig(): void {
+		$jsConfigHelper = new JSConfigHelper(
+			\OCP\Server::get(ServerVersion::class),
+			\OCP\Util::getL10N('lib'),
+			\OCP\Server::get(Defaults::class),
+			$this->appManager,
+			\OCP\Server::get(ISession::class),
+			\OCP\Server::get(IUserSession::class)->getUser(),
+			$this->config,
+			\OCP\Server::get(IGroupManager::class),
+			\OCP\Server::get(IniGetWrapper::class),
+			\OCP\Server::get(IURLGenerator::class),
+			\OCP\Server::get(CapabilitiesManager::class),
+			$this->initialState,
+			\OCP\Server::get(IProvider::class),
+			\OCP\Server::get(FilenameValidator::class),
+		);
+		$config = $jsConfigHelper->getConfig();
+		$this->assign('inline_ocjs', $config);
+	}
+
+	/**
+	 * Add all registered CSS files
+	 */
+	private function setupCssFiles(): void {
+		$this->assign('cssfiles', []);
+		$this->assign('printcssfiles', []);
 
+		// Try to get path info
 		try {
-			$pathInfo = \OC::$server->getRequest()->getPathInfo();
-		} catch (\Exception $e) {
+			$pathInfo = $this->request->getPathInfo();
+		} catch (\Exception) {
 			$pathInfo = '';
 		}
 
-		// Do not initialise scss appdata until we have a fully installed instance
-		// Do not load scss for update, errors, installation or login page
-		if (\OC::$server->getSystemConfig()->getValue('installed', false)
-			&& !\OCP\Util::needUpgrade()
-			&& $pathInfo !== ''
-			&& !preg_match('/^\/login/', $pathInfo)
-			&& $renderAs !== TemplateResponse::RENDER_AS_ERROR
+		// Add the guest styles as fallback if needed
+		if ($this->config->getSystemValueBool('installed', false) === false
+			|| \OCP\Util::needUpgrade()
+			|| $pathInfo === ''
+			|| preg_match('/^\/login/', $pathInfo)
 		) {
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
-		} else {
-			// If we ignore the scss compiler,
-			// we need to load the guest css fallback
 			\OC_Util::addStyle('guest');
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false);
 		}
 
-		$this->assign('cssfiles', []);
-		$this->assign('printcssfiles', []);
-		$this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
+		// Find all CSS files
+		$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
+		// Add CSS files with version hash (cache buster)
 		foreach ($cssFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
@@ -282,7 +203,6 @@ class TemplateLayout extends \OC_Template {
 				$this->append('printcssfiles', $web . '/' . $file . $this->getVersionHashSuffix());
 			} else {
 				$suffix = $this->getVersionHashSuffix($web, $file);
-
 				if (!str_contains($file, '?v=')) {
 					$this->append('cssfiles', $web . '/' . $file . $suffix);
 				} else {
@@ -290,26 +210,162 @@ class TemplateLayout extends \OC_Template {
 				}
 			}
 		}
+	}
 
-		$request = \OCP\Server::get(IRequest::class);
-		if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
-			// Prevent auto zoom with iOS but still allow user zoom
-			// On chrome (and others) this does not work (will also disable user zoom)
-			$this->assign('viewport_maximum_scale', '1.0');
+	/**
+	 * Setup user information on the template parameters
+	 *
+	 * @param bool $anonymous If set no user information will be set (same as if no user would have been logged-in)
+	 */
+	private function setupUserInformation(bool $anonymous = false): void {
+		$user = $anonymous
+			? null
+			: \OCP\Server::get(IUserSession::class)->getUser();
+		$userUid = $user?->getUID() ?? false;
+		$userDisplayName = $user?->getDisplayName() ?? false;
+
+		$this->assign('user_displayname', $userDisplayName);
+		$this->assign('user_uid', $userUid);
+
+		if ($user === null) {
+			$this->assign('userAvatarSet', false);
+			$this->assign('userStatus', false);
+		} else {
+			$this->assign('userAvatarSet', true);
+			$this->assign('userAvatarVersion', $this->config->getUserValue($userUid, 'avatar', 'version', 0));
 		}
+	}
 
-		$this->assign('initialStates', $this->initialState->getInitialStates());
+	/**
+	 * Setup language and locale information on the template response
+	 */
+	private function setupLanguageInformation(): void {
+		$l10n = \OCP\Server::get(IFactory::class);
+		$lang = $l10n->findLanguage();
+		$locale = $l10n->findLocale($lang);
+		$direction = $l10n->getLanguageDirection($lang);
+		// Make the language BCP47 compatible
+		$lang = str_replace('_', '-', $lang);
+		$this->assign('language', $lang);
+		$this->assign('locale', $locale);
+		$this->assign('direction', $direction);
+	}
 
-		$this->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
-		$this->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
+	/**
+	 * Helper function to setup the layout for `renderAs = TemplateResponse::RENDER_AS_ERROR`
+	 */
+	private function setupLayoutError(): void {
+		$this->assign('bodyid', 'body-login');
+		$this->setupUserInformation(true);
+		// Handle error always as guest page so we also need the guest styles
+		\OC_Util::addStyle('guest');
 	}
 
 	/**
-	 * @param string $path
-	 * @param string $file
-	 * @return string
+	 * Helper function to setup the layout for `renderAs = TemplateResponse::RENDER_AS_GUEST`
+	 */
+	private function setupLayoutGuest(): void {
+		\OC_Util::addStyle('guest');
+		$this->assign('bodyid', 'body-login');
+		$this->setupUserInformation();
+	}
+
+	/**
+	 * Helper function to setup the layout for `renderAs = TemplateResponse::RENDER_AS_PUBLIC`
+	 */
+	private function setupLayoutPublic(): void {
+		$this->setupUserInformation(true);
+		$this->assign('bodyid', 'body-public');
+
+		// Set logo link target
+		$logoUrl = $this->config->getSystemValueString('logo_url', '');
+		$this->assign('logoUrl', $logoUrl);
+
+		/** @var IRegistry $subscription */
+		$subscription = \OCP\Server::get(IRegistry::class);
+		$showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
+		if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
+			$showSimpleSignup = false;
+		}
+
+		$defaultSignUpLink = 'https://nextcloud.com/signup/';
+		$signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
+		if ($signUpLink !== $defaultSignUpLink) {
+			$showSimpleSignup = true;
+		}
+
+		if ($this->appManager->isEnabledForUser('registration')) {
+			$urlGenerator = \OCP\Server::get(IURLGenerator::class);
+			$signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
+		}
+
+		$this->assign('showSimpleSignUpLink', $showSimpleSignup);
+		$this->assign('signUpLink', $signUpLink);
+	}
+
+	/**
+	 * Helper function to setup the layout for `renderAs = TemplateResponse::RENDER_AS_USER`
 	 */
-	protected function getVersionHashSuffix($path = false, $file = false) {
+	private function setupLayoutUser(): void {
+		$this->setupUserInformation();
+		if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+			$this->assign('bodyid', 'body-settings');
+		} else {
+			$this->assign('bodyid', 'body-user');
+		}
+
+		$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
+		$this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
+
+		if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
+			$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
+			$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
+			$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
+			Util::addScript('core', 'legacy-unified-search', 'core');
+		} else {
+			Util::addScript('core', 'unified-search', 'core');
+		}
+		// Set body data-theme
+		$this->assign('enabledThemes', []);
+		if ($this->appManager->isEnabledForUser('theming') && class_exists('\OCA\Theming\Service\ThemesService')) {
+			/** @var \OCA\Theming\Service\ThemesService */
+			$themesService = \OCP\Server::get(\OCA\Theming\Service\ThemesService::class);
+			$this->assign('enabledThemes', $themesService->getEnabledThemes());
+		}
+
+		// Set logo link target
+		$logoUrl = $this->config->getSystemValueString('logo_url', '');
+		$this->assign('logoUrl', $logoUrl);
+
+		// Set default entry name
+		$defaultEntryId = $this->navigationManager->getDefaultEntryIdForUser();
+		$defaultEntry = $this->navigationManager->get($defaultEntryId);
+		$this->assign('defaultAppName', $defaultEntry['name']);
+
+		// Add navigation entry
+		$this->assign('application', '');
+
+		$navigation = $this->navigationManager->getAll();
+		$this->assign('navigation', $navigation);
+		$settingsNavigation = $this->navigationManager->getAll('settings');
+		$this->initialState->provideInitialState('core', 'settingsNavEntries', $settingsNavigation);
+
+		foreach ($navigation as $entry) {
+			if ($entry['active']) {
+				$this->assign('application', $entry['name']);
+				break;
+			}
+		}
+
+		foreach ($settingsNavigation as $entry) {
+			if ($entry['active']) {
+				$this->assign('application', $entry['name']);
+				break;
+			}
+		}
+	}
+
+	protected function getVersionHashSuffix(?string $path = null, ?string $file = null) {
 		if ($this->config->getSystemValueBool('debug', false)) {
 			// allows chrome workspace mapping in debug mode
 			return '';
@@ -318,23 +374,23 @@ class TemplateLayout extends \OC_Template {
 		$v = [];
 
 		if ($this->config->getSystemValueBool('installed', false)) {
-			if (\OC::$server->getAppManager()->isInstalled('theming')) {
+			if ($this->appManager->isInstalled('theming')) {
 				$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
 			}
 			$v = \OC_App::getAppVersions();
 		}
 
 		// Try the webroot path for a match
-		if ($path !== false && $path !== '') {
-			$appName = $this->getAppNamefromPath($path);
+		if ($path !== null && $path !== '') {
+			$appName = $this->getAppNameFromPath($path);
 			if (array_key_exists($appName, $v)) {
 				$appVersion = $v[$appName];
 				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
 			}
 		}
 		// fallback to the file path instead
-		if ($file !== false && $file !== '') {
-			$appName = $this->getAppNamefromPath($file);
+		if ($file !== null && $file !== '') {
+			$appName = $this->getAppNameFromPath($file);
 			if (array_key_exists($appName, $v)) {
 				$appVersion = $v[$appName];
 				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
@@ -348,7 +404,7 @@ class TemplateLayout extends \OC_Template {
 	 * @param array $styles
 	 * @return array
 	 */
-	public static function findStylesheetFiles($styles, $compileScss = true) {
+	public static function findStylesheetFiles($styles) {
 		if (!self::$cssLocator) {
 			self::$cssLocator = \OCP\Server::get(CSSResourceLocator::class);
 		}
@@ -360,7 +416,7 @@ class TemplateLayout extends \OC_Template {
 	 * @param string $path
 	 * @return string|boolean
 	 */
-	public function getAppNamefromPath($path) {
+	public function getAppNameFromPath($path) {
 		if ($path !== '' && is_string($path)) {
 			$pathParts = explode('/', $path);
 			if ($pathParts[0] === 'css') {