Removes the global app_theme, app_theme_user and app_primary_color settings from the admin/settings area and the underlying service/cache/API/i18n/docs layers. The tenant columns (tenants.primary_color, default_theme, allow_user_theme) become the single source of truth for appearance. Branding helpers are tenant-only and fall back to a hardcoded 'light' theme with no brand color when no tenant context is available (login, error, pre-session pages). The APP_THEME env var is removed. Scope: - UI: Appearance tab gone from /admin/settings; tenant edit form drops the global-fallback color preview. - Service: SettingsAppGateway no longer exposes setting-backed accessors for theme/user-theme/primary-color. Theme catalog utilities (listThemes, isAllowedTheme, normalizeTheme, resolveDefaultTheme) stay and are used across Tenant / Auth / User flows; resolveDefaultTheme now hardcodes 'light' with a catalog fallback (no global/env lookup). - AdminSettingsService: buildPageData, sanitization, audit snapshot, apply step and cache payload are all stripped of the three keys. Dead helper applyAppPrimaryColor + normalizePrimaryColor removed. - Cache: SettingCacheService HOT_PATH_KEYS drops the three keys. - API: /settings (GET/PUT) and /settings/public (GET) no longer expose appearance fields; OpenAPI schemas pruned accordingly. - Audit redaction list shortened. - DB: db/init/init.sql seed rows removed. No migration for existing installs — legacy rows stay inert. - i18n + docs: setting.app_theme, setting.app_theme_user, setting.app_primary_color removed from de+en locales; reference and explanation docs updated. - Tests: covering tests for the removed methods pruned; ThemeResolutionTest rewritten for tenant-only semantics. One unrelated PHP-CS-Fixer issue in UserRegistrar.php cleaned up to keep QG-006 green. Workflow: .agents/runs/SETTINGS-APPEARANCE-TENANT-ONLY/ (gitignored). Gates: QG-001..003, QG-006, QG-008 all pass (1985 tests, 28764 assertions). Reviews: code, security, acceptance all pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
204 lines
6.2 KiB
PHP
204 lines
6.2 KiB
PHP
<?php
|
|
|
|
namespace MintyPHP\Tests\Support;
|
|
|
|
use MintyPHP\App\AppContainer;
|
|
use MintyPHP\Service\Settings\SettingCacheService;
|
|
use MintyPHP\Service\Settings\ThemeConfigGateway;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
/**
|
|
* Appearance resolution is tenant-scoped:
|
|
*
|
|
* - appDefaultTheme() uses tenant.default_theme, else hardcoded 'light'.
|
|
* - allowUserTheme() uses tenant.allow_user_theme, else defaults to true.
|
|
* - Global app settings no longer participate — this class verifies the
|
|
* fallback chain and confirms global settings are inert.
|
|
*/
|
|
class ThemeResolutionTest extends TestCase
|
|
{
|
|
use AppContainerIsolationTrait;
|
|
|
|
private AppContainer $container;
|
|
|
|
protected function setUp(): void
|
|
{
|
|
$_SESSION = [];
|
|
|
|
$this->container = new AppContainer();
|
|
|
|
$themeConfig = $this->createMock(ThemeConfigGateway::class);
|
|
$themeConfig->method('all')->willReturn(['light' => 'Light', 'dark' => 'Dark']);
|
|
$this->container->set(ThemeConfigGateway::class, fn () => $themeConfig);
|
|
|
|
$this->setAppSettings([]);
|
|
|
|
$this->pushAppContainer($this->container);
|
|
}
|
|
|
|
protected function tearDown(): void
|
|
{
|
|
$this->restoreAppContainer();
|
|
$_SESSION = [];
|
|
}
|
|
|
|
// -- appDefaultTheme priority chain --
|
|
|
|
public function testDefaultThemeFallsBackToLightWithoutTenant(): void
|
|
{
|
|
$this->assertSame('light', appDefaultTheme());
|
|
}
|
|
|
|
public function testDefaultThemeIgnoresGlobalAppSetting(): void
|
|
{
|
|
// A stale global setting in the cache must no longer influence the
|
|
// resolution — appearance is tenant-scoped, no global fallback.
|
|
$this->setAppSettings(['app_theme' => 'dark']);
|
|
|
|
$this->assertSame('light', appDefaultTheme());
|
|
}
|
|
|
|
public function testDefaultThemeUsesTenantValue(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['default_theme' => 'dark'];
|
|
|
|
$this->assertSame('dark', appDefaultTheme());
|
|
}
|
|
|
|
public function testDefaultThemeIgnoresInvalidTenantTheme(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['default_theme' => 'nonexistent'];
|
|
|
|
$this->assertSame('light', appDefaultTheme());
|
|
}
|
|
|
|
public function testDefaultThemeIgnoresEmptyTenantTheme(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['default_theme' => ''];
|
|
|
|
$this->assertSame('light', appDefaultTheme());
|
|
}
|
|
|
|
// -- currentTheme with user override --
|
|
|
|
public function testCurrentThemeReturnsDefaultWhenUserThemeDisabled(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'dark'];
|
|
$_SESSION['user'] = ['theme' => 'light'];
|
|
|
|
$this->assertSame('dark', currentTheme());
|
|
}
|
|
|
|
public function testCurrentThemeReturnsUserThemeWhenAllowed(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '1', 'default_theme' => 'light'];
|
|
$_SESSION['user'] = ['theme' => 'dark'];
|
|
|
|
$this->assertSame('dark', currentTheme());
|
|
}
|
|
|
|
public function testCurrentThemeFallsBackToDefaultForEmptyUserTheme(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '1', 'default_theme' => 'dark'];
|
|
$_SESSION['user'] = ['theme' => ''];
|
|
|
|
$this->assertSame('dark', currentTheme());
|
|
}
|
|
|
|
public function testCurrentThemeFallsBackToDefaultForInvalidUserTheme(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '1'];
|
|
$_SESSION['user'] = ['theme' => 'nonexistent'];
|
|
|
|
$this->assertSame('light', currentTheme());
|
|
}
|
|
|
|
// -- allowUserTheme feature flag --
|
|
|
|
public function testAllowUserThemeDefaultsToTrueWithoutTenant(): void
|
|
{
|
|
$this->assertTrue(allowUserTheme());
|
|
}
|
|
|
|
public function testAllowUserThemeTenantExplicitlyEnabled(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '1'];
|
|
|
|
$this->assertTrue(allowUserTheme());
|
|
}
|
|
|
|
public function testAllowUserThemeTenantExplicitlyDisabled(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '0'];
|
|
|
|
$this->assertFalse(allowUserTheme());
|
|
}
|
|
|
|
public function testAllowUserThemeIgnoresGlobalAppSetting(): void
|
|
{
|
|
// Legacy global setting must not override the tenant-null default.
|
|
$this->setAppSettings(['app_theme_user' => '0']);
|
|
|
|
$this->assertTrue(allowUserTheme());
|
|
}
|
|
|
|
public function testAppPrimaryColorIgnoresGlobalAppSetting(): void
|
|
{
|
|
$this->setAppSettings(['app_primary_color' => '#112233']);
|
|
|
|
$this->assertNull(appPrimaryColor());
|
|
}
|
|
|
|
public function testAppPrimaryColorReadsTenantValue(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['primary_color' => '#abcdef'];
|
|
|
|
$this->assertSame('#abcdef', appPrimaryColor());
|
|
}
|
|
|
|
public function testAppPrimaryColorRejectsInvalidTenantValue(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['primary_color' => 'not-a-color'];
|
|
|
|
$this->assertNull(appPrimaryColor());
|
|
}
|
|
|
|
// -- Tenant switch scenarios --
|
|
|
|
public function testThemeResolvesCorrectlyAfterTenantSwitch(): void
|
|
{
|
|
$_SESSION['user'] = ['theme' => 'dark'];
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '1', 'default_theme' => 'light'];
|
|
|
|
$this->assertSame('dark', currentTheme());
|
|
|
|
// Simulate tenant switch: new tenant disallows user theme
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'light'];
|
|
|
|
$this->assertSame('light', currentTheme());
|
|
}
|
|
|
|
public function testThemeResolvesNewDefaultAfterTenantSwitch(): void
|
|
{
|
|
$_SESSION['user'] = ['theme' => 'light'];
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'light'];
|
|
|
|
$this->assertSame('light', currentTheme());
|
|
|
|
// Switch to tenant with dark default
|
|
$_SESSION['current_tenant'] = ['allow_user_theme' => '0', 'default_theme' => 'dark'];
|
|
|
|
$this->assertSame('dark', currentTheme());
|
|
}
|
|
|
|
/**
|
|
* @param array<string, string|null> $settings
|
|
*/
|
|
private function setAppSettings(array $settings): void
|
|
{
|
|
$cache = $this->createMock(SettingCacheService::class);
|
|
$cache->method('get')->willReturnCallback(fn (string $key) => $settings[$key] ?? null);
|
|
$this->container->set(SettingCacheService::class, fn () => $cache);
|
|
}
|
|
}
|