upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

chore: Remove static vars in TemplateLayout

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2026-03-26 23:15:17 +01:00
parent b848be3513
commit ac8cd6846d
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/private/TemplateLayout.php
View file

@ -43,9 +43,9 @@ use OCP\Template\ITemplateManager;
use OCP\Util;
class TemplateLayout {
private static string $versionHash = '';
private string $versionHash = '';
/** @var string[] */
private static array $cacheBusterCache = [];
private array $cacheBusterCache = [];
public ?CSSResourceLocator $cssLocator = null;
public ?JSResourceLocator $jsLocator = null;
@ -214,13 +214,13 @@ class TemplateLayout {
$page->assign('enabledThemes', $themesService?->getEnabledThemes() ?? []);
if ($this->config->getSystemValueBool('installed', false)) {
if (empty(self::$versionHash)) {
if (empty($this->versionHash)) {
$v = $this->appManager->getAppInstalledVersions(true);
$v['core'] = implode('.', $this->serverVersion->getVersion());
self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
$this->versionHash = substr(md5(implode(',', $v)), 0, 8);
}
} else {
self::$versionHash = md5('not installed');
$this->versionHash = md5('not installed');
}
// Add the js files
@ -250,7 +250,7 @@ class TemplateLayout {
if (Server::get(ContentSecurityPolicyNonceManager::class)->browserSupportsCspV3()) {
$page->assign('inline_ocjs', $config);
} else {
$page->append('jsfiles', Server::get(IURLGenerator::class)->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
$page->append('jsfiles', Server::get(IURLGenerator::class)->linkToRoute('core.OCJS.getConfig', ['v' => $this->versionHash]));
}
}
foreach ($jsFiles as $info) {
@ -283,7 +283,7 @@ class TemplateLayout {
$page->assign('cssfiles', []);
$page->assign('printcssfiles', []);
$this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
$this->initialState->provideInitialState('core', 'versionHash', $this->versionHash);
foreach ($cssFiles as $info) {
$web = $info[1];
$file = $info[2];
@ -323,7 +323,7 @@ class TemplateLayout {
if ($this->config->getSystemValueBool('installed', false) === false) {
// if not installed just return the version hash
return '?v=' . self::$versionHash;
return '?v=' . $this->versionHash;
}
$hash = false;
@ -337,7 +337,7 @@ class TemplateLayout {
}
// As a last resort we use the server version hash
if ($hash === false) {
$hash = self::$versionHash;
$hash = $this->versionHash;
}
// The theming app is force-enabled thus the cache buster is always available
@ -347,7 +347,7 @@ class TemplateLayout {
}
private function getVersionHashByPath(string $path): string|false {
if (array_key_exists($path, self::$cacheBusterCache) === false) {
if (array_key_exists($path, $this->cacheBusterCache) === false) {
// Not yet cached, so lets find the cache buster string
$appId = $this->getAppNamefromPath($path);
if ($appId === false) {
@ -357,20 +357,20 @@ class TemplateLayout {
if ($appId === 'core') {
// core is not a real app but the server itself
$hash = self::$versionHash;
$hash = $this->versionHash;
} else {
$appVersion = $this->appManager->getAppVersion($appId);
// For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
if ($this->appManager->isShipped($appId)) {
$appVersion .= '-' . self::$versionHash;
$appVersion .= '-' . $this->versionHash;
}
$hash = substr(md5($appVersion), 0, 8);
}
self::$cacheBusterCache[$path] = $hash;
$this->cacheBusterCache[$path] = $hash;
}
return self::$cacheBusterCache[$path];
return $this->cacheBusterCache[$path];
}
private function findStylesheetFiles(array $styles): array {