fixup! fix: generate favourite icon without imagick svg support

Signed-off-by: SebastianKrupinski <[email protected]>

Author: SebastianKrupinski

apps/theming/lib/Controller/IconController.php

@@ -81,7 +81,7 @@ public function getThemedIcon(string $app, string $image): Response {
 	 * Return a 32x32 favicon as png
 	 *
 	 * @param string $app ID of the app
-	 * @return DataDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/png'}>|FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|NotFoundResponse<Http::STATUS_NOT_FOUND, array{}>
+	 * @return DataDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/png'}>|FileDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/x-icon'}>|NotFoundResponse<Http::STATUS_NOT_FOUND, array{}>
 	 * @throws \Exception
 	 *
 	 * 200: Favicon returned
@@ -100,11 +100,11 @@ public function getFavicon(string $app = 'core'): Response {
 		// retrieve instance favorite icon
 		try {
 			$iconFile = $this->imageManager->getImage('favicon', false);
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);
+			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
 		} catch (NotFoundException $e) {
 		}
 		// retrieve or generate app specific favorite icon
-		if ($this->imageManager->canConvert('PNG')) {
+		if (($this->imageManager->canConvert('PNG') || $this->imageManager->canConvert('SVG')) && $this->imageManager->canConvert('ICO')) {
 			$color = $this->themingDefaults->getColorPrimary();
 			try {
 				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app . $color);
@@ -115,7 +115,7 @@ public function getFavicon(string $app = 'core'): Response {
 				}
 				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app . $color, $icon);
 			}
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
 		}
 		// fallback to core favorite icon
 		if ($response === null) {

apps/theming/lib/IconBuilder.php

@@ -42,7 +42,7 @@ public function getFavicon($app) {
 			$icon->setImageFormat('PNG32');
 
 			$favicon = new Imagick();
-			$favicon->setFormat('PNG32');
+			$favicon->setFormat('ICO');
 
 			$clone = clone $icon;
 			$clone->scaleImage(16, 0);

apps/theming/openapi.json

@@ -443,7 +443,7 @@
                                     "format": "binary"
                                 }
                             },
-                            "*/*": {
+                            "image/x-icon": {
                                 "schema": {
                                     "type": "string",
                                     "format": "binary"

apps/theming/tests/Controller/IconControllerTest.php

@@ -127,8 +127,11 @@ public function testGetFaviconFail(): void {
 			->willThrowException(new NotFoundException());
 		$this->imageManager->expects($this->any())
 			->method('canConvert')
-			->with('PNG')
-			->willReturn(false);
+			->willReturnMap([
+				['SVG', false],
+				['PNG', false],
+				['ICO', false],
+			]);
 		$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
 		$this->fileAccessHelper->expects($this->once())
 			->method('file_get_contents')

apps/theming/tests/IconBuilderTest.php

@@ -336,7 +336,7 @@ private function generateTestFavIcon(string $file, string $format, string $color
 		$baseIcon->setImageFormat('PNG32');
 
 		$testIcon = new \Imagick();
-		$testIcon->setFormat('PNG32');
+		$testIcon->setFormat('ICO');
 		foreach ([16, 32, 64, 128] as $size) {
 			$clone = clone $baseIcon;
 			$clone->scaleImage($size, 0);

openapi.json

@@ -33163,7 +33163,7 @@
                                     "format": "binary"
                                 }
                             },
-                            "*/*": {
+                            "image/x-icon": {
                                 "schema": {
                                     "type": "string",
                                     "format": "binary"