instances added god may help

This commit is contained in:
2026-02-23 12:58:19 +01:00
parent 25370a1a55
commit 99db252f60
290 changed files with 9858 additions and 4914 deletions

View File

@@ -9,24 +9,24 @@ class ThemeConfigService
'dark' => 'Dark',
];
private static ?array $themes = null;
private ?array $themes = null;
public static function all(): array
public function all(): array
{
if (self::$themes !== null) {
return self::$themes;
if ($this->themes !== null) {
return $this->themes;
}
$file = dirname(__DIR__, 3) . '/config/themes.php';
if (!is_file($file)) {
self::$themes = self::DEFAULT_THEMES;
return self::$themes;
$this->themes = self::DEFAULT_THEMES;
return $this->themes;
}
$loaded = include $file;
if (!is_array($loaded)) {
self::$themes = self::DEFAULT_THEMES;
return self::$themes;
$this->themes = self::DEFAULT_THEMES;
return $this->themes;
}
$clean = [];
@@ -39,7 +39,7 @@ class ThemeConfigService
$clean[$themeKey] = $themeLabel;
}
self::$themes = $clean ?: self::DEFAULT_THEMES;
return self::$themes;
$this->themes = $clean ?: self::DEFAULT_THEMES;
return $this->themes;
}
}