Replace the single tenant avatar with a pair of theme-scoped brand logos.
Render only the theme-matching <img> server-side and swap src on theme
toggle via a JS hook — no reload, no double request, no CSS tricks.
Tenant logos
- TenantLogoService (ImageUploadTrait) with theme whitelist and per-theme
storage storage/tenants/{uuid}/logo/{light|dark}/, SIZES 128/256/512
- Public serving endpoint auth/tenant-logo-file so login can show the
logo pre-auth; matching authenticated admin preview endpoint
- appTenantLogoUrl(?size, ?theme) with 4-step fallback cascade; PDF +
mail always request 'light'
- Admin tenant edit: avatar block replaced by "Tenant logos" details
block inside the Master-data tab, two side-by-side slots via Pico
.grid with the core app-file-upload partial
- Policy rename ABILITY_ADMIN_TENANTS_AVATAR_VIEW -> LOGO_VIEW, action
routes logo / logo-delete / logo-file with theme body/query param
- API endpoint path kept (backward compat), internals on new service
- CLI tenant:logo-migrate-avatars moves legacy avatar/ -> logo/light/
idempotently (--dry-run, --yes, --cleanup)
- i18n "Tenant image" removed, 12 new keys synced across de/en
File upload component
- Full-width preview + filename/actions below (3D stack layout)
- Fixed 16:9 aspect ratio with 1rem inner padding for consistent
preview size across any logo aspect
- Transparency checker pattern as background so black logos stay
visible on dark mode and white logos on light mode
- form="" + deleteFormId support so the partial works with barrier
forms inside another form
Buttons
- width:100% dropped from button[type="submit"]; scoped back via
.login-main for the auth-flow primary CTA
- .outline base rule now tints background via color-mix of --app-color
so secondary/primary/danger outlines all gain a subtle surface
- .outline.secondary restyled Stripe-style in both themes: solid white
chip with soft shadow in light, solid elevated dark chip with white
text in dark; neutral border replaces role-colored border
- .app-action-success/.app-action-danger outlines get color-mix bg +
theme-aware outline-text tokens for stronger contrast
- Filled .primary/.app-action-success/.app-action-danger get raised
box-shadow (inset highlight + drop) — opt-in via class so chrome
buttons stay flat
- Dropped the legacy .secondary utility that was clobbering the
custom-property cascade with a hardcoded muted color
Theme swap
- Logo img carries data-src-light + data-src-dark; theme-toggle JS
swaps src when data-theme changes, keeping the topbar/login logo in
sync without a page reload
Quality gates: PHPUnit (2045), PHPStan L5, CS-Fixer, docs link/drift,
codex skills sync — all green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
96 lines
2.9 KiB
PHP
96 lines
2.9 KiB
PHP
<?php
|
|
|
|
namespace MintyPHP\Tests\Support;
|
|
|
|
use MintyPHP\App\AppContainer;
|
|
use MintyPHP\Service\Branding\BrandingLogoService;
|
|
use MintyPHP\Service\Tenant\TenantLogoService;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
/**
|
|
* Covers the appTenantLogoUrl() fallback cascade:
|
|
* 1. tenant logo for the requested theme
|
|
* 2. tenant logo for the other theme
|
|
* 3. global app logo
|
|
* 4. hardcoded brand asset
|
|
*/
|
|
class TenantLogoHelperTest extends TestCase
|
|
{
|
|
use AppContainerIsolationTrait;
|
|
|
|
private AppContainer $container;
|
|
private string $tenantUuid = '11111111-2222-3333-4444-555555555555';
|
|
|
|
protected function setUp(): void
|
|
{
|
|
$_SESSION = [];
|
|
$this->container = new AppContainer();
|
|
$this->pushAppContainer($this->container);
|
|
}
|
|
|
|
protected function tearDown(): void
|
|
{
|
|
$this->restoreAppContainer();
|
|
$_SESSION = [];
|
|
}
|
|
|
|
public function testFallsBackToAppLogoWithoutTenantContext(): void
|
|
{
|
|
$this->mockLogoService(false, false);
|
|
$this->mockBrandingLogo(false);
|
|
|
|
$url = appTenantLogoUrl(128, 'light');
|
|
|
|
$this->assertStringContainsString('brand/logo.svg', $url);
|
|
}
|
|
|
|
public function testUsesRequestedThemeWhenAvailable(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['uuid' => $this->tenantUuid];
|
|
$this->mockLogoService(true, true);
|
|
|
|
$url = appTenantLogoUrl(256, 'dark');
|
|
|
|
$this->assertStringContainsString('auth/tenant-logo-file', $url);
|
|
$this->assertStringContainsString('theme=dark', $url);
|
|
}
|
|
|
|
public function testFallsBackToOtherThemeWhenRequestedMissing(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['uuid' => $this->tenantUuid];
|
|
$this->mockLogoService(true, false);
|
|
|
|
$url = appTenantLogoUrl(256, 'dark');
|
|
|
|
$this->assertStringContainsString('auth/tenant-logo-file', $url);
|
|
$this->assertStringContainsString('theme=light', $url);
|
|
}
|
|
|
|
public function testFallsBackToAppLogoWhenTenantHasNoLogos(): void
|
|
{
|
|
$_SESSION['current_tenant'] = ['uuid' => $this->tenantUuid];
|
|
$this->mockLogoService(false, false);
|
|
$this->mockBrandingLogo(true);
|
|
|
|
$url = appTenantLogoUrl(128, 'light');
|
|
|
|
$this->assertStringContainsString('branding/logo', $url);
|
|
}
|
|
|
|
private function mockLogoService(bool $hasLight, bool $hasDark): void
|
|
{
|
|
$mock = $this->createMock(TenantLogoService::class);
|
|
$mock->method('hasLogo')->willReturnCallback(function (string $uuid, string $theme) use ($hasLight, $hasDark): bool {
|
|
return $theme === 'light' ? $hasLight : $hasDark;
|
|
});
|
|
$this->container->set(TenantLogoService::class, fn () => $mock);
|
|
}
|
|
|
|
private function mockBrandingLogo(bool $hasLogo): void
|
|
{
|
|
$mock = $this->createMock(BrandingLogoService::class);
|
|
$mock->method('hasLogo')->willReturn($hasLogo);
|
|
$this->container->set(BrandingLogoService::class, fn () => $mock);
|
|
}
|
|
}
|