Skip to content

[stable33] fix(theming): preserve uploaded favicon and touch icon #61301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Jun 15, 2026
+36 −0
Merged

[stable33] fix(theming): preserve uploaded favicon and touch icon #61301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions apps/theming/tests/Controller/IconControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,42 @@ public function testGetTouchIconDefault(): void {
$this->assertEquals($expected, $this->iconController->getTouchIcon());
}

public function testGetFaviconUploaded(): void {
// a custom favicon was uploaded, so it must be served as-is and the
// app-specific generation path must not overwrite it
$file = $this->iconFileMock('favicon.ico', 'filecontent');
$this->imageManager->expects($this->once())
->method('getImage')
->with('favicon', false)
->willReturn($file);
$this->imageManager->expects($this->never())
->method('getCachedImage');
$this->iconBuilder->expects($this->never())
->method('getFavicon');

$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
$expected->cacheFor(86400);
$this->assertEquals($expected, $this->iconController->getFavicon());
}

public function testGetTouchIconUploaded(): void {
// a custom favicon was uploaded, so it must be served as-is and the
// app-specific generation path must not overwrite it
$file = $this->iconFileMock('favicon.png', 'filecontent');
$this->imageManager->expects($this->once())
->method('getImage')
->with('favicon')
->willReturn($file);
$this->imageManager->expects($this->never())
->method('getCachedImage');
$this->iconBuilder->expects($this->never())
->method('getTouchIcon');

$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
$expected->cacheFor(86400);
$this->assertEquals($expected, $this->iconController->getTouchIcon());
}

public function testGetTouchIconFail(): void {
$this->imageManager->expects($this->once())
->method('getImage')
Expand Down
Loading