fixup! fix: generate favourite icon without imagick svg support

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

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/x-icon'}>|FileDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/x-icon'}>|NotFoundResponse<Http::STATUS_NOT_FOUND, array{}>
+	 * @return DataDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/png'}>|FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|NotFoundResponse<Http::STATUS_NOT_FOUND, array{}>
 	 * @throws \Exception
 	 *
 	 * 200: Favicon returned
@@ -130,7 +130,7 @@ public function getFavicon(string $app = 'core'): Response {
 	 * Return a 512x512 icon for touch devices
 	 *
 	 * @param string $app ID of the app
-	 * @return DataDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/png'}>|FileDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/x-icon'|'image/png'}>|NotFoundResponse<Http::STATUS_NOT_FOUND, array{}>
+	 * @return DataDisplayResponse<Http::STATUS_OK, array{Content-Type: 'image/png'}>|FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|NotFoundResponse<Http::STATUS_NOT_FOUND, array{}>
 	 * @throws \Exception
 	 *
 	 * 200: Touch icon returned

apps/theming/lib/Util.php

@@ -234,7 +234,6 @@ public function getAppIcon($app, $useSvg = true) {
 		}
 		// fallback to custom instance logo
 		if ($this->config->getAppValue('theming', 'logoMime', '') !== '') {
-			$logoFile = null;
 			try {
 				$folder = $this->appData->getFolder('global/images');
 				return $folder->getFile('logo');
@@ -244,14 +243,10 @@ public function getAppIcon($app, $useSvg = true) {
 		// fallback to core logo
 		if ($useSvg) {
 			$icon = \OC::$SERVERROOT . '/core/img/logo/logo.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
+			return $icon;
 		} else {
 			$icon = \OC::$SERVERROOT . '/core/img/logo/logo.png';
-			if (file_exists($icon)) {
-				return $icon;
-			}
+			return $icon;
 		}
 	}
 

apps/theming/openapi.json

@@ -437,7 +437,13 @@
                     "200": {
                         "description": "Favicon returned",
                         "content": {
-                            "image/x-icon": {
+                            "image/png": {
+                                "schema": {
+                                    "type": "string",
+                                    "format": "binary"
+                                }
+                            },
+                            "*/*": {
                                 "schema": {
                                     "type": "string",
                                     "format": "binary"
@@ -506,7 +512,7 @@
                                     "format": "binary"
                                 }
                             },
-                            "image/x-icon": {
+                            "*/*": {
                                 "schema": {
                                     "type": "string",
                                     "format": "binary"

apps/theming/tests/Controller/ThemingControllerTest.php

@@ -645,6 +645,7 @@ public function testGetLogo(): void {
 		$file = $this->createMock(ISimpleFile::class);
 		$file->method('getName')->willReturn('logo.svg');
 		$file->method('getMTime')->willReturn(42);
+		$file->method('getMimeType')->willReturn('text/svg');
 		$this->imageManager->expects($this->once())
 			->method('getImage')
 			->willReturn($file);
@@ -661,7 +662,7 @@ public function testGetLogo(): void {
 		$csp = new ContentSecurityPolicy();
 		$csp->allowInlineStyle();
 		$expected->setContentSecurityPolicy($csp);
-		@$this->assertEquals($expected, $this->themingController->getImage('logo'));
+		@$this->assertEquals($expected, $this->themingController->getImage('logo', true));
 	}
 
 
@@ -677,6 +678,7 @@ public function testGetLoginBackground(): void {
 		$file = $this->createMock(ISimpleFile::class);
 		$file->method('getName')->willReturn('background.png');
 		$file->method('getMTime')->willReturn(42);
+		$file->method('getMimeType')->willReturn('image/png');
 		$this->imageManager->expects($this->once())
 			->method('getImage')
 			->willReturn($file);

openapi.json

@@ -33153,7 +33153,13 @@
                     "200": {
                         "description": "Favicon returned",
                         "content": {
-                            "image/x-icon": {
+                            "image/png": {
+                                "schema": {
+                                    "type": "string",
+                                    "format": "binary"
+                                }
+                            },
+                            "*/*": {
                                 "schema": {
                                     "type": "string",
                                     "format": "binary"
@@ -33222,7 +33228,7 @@
                                     "format": "binary"
                                 }
                             },
-                            "image/x-icon": {
+                            "*/*": {
                                 "schema": {
                                     "type": "string",
                                     "format": "binary"