feat: add detected mime type to exception

The mimetype may not match the file extension.
Helps the user to find out why a provided image is not accepted.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
index 87123a6f7c9c08db47e10e8fa44626881efa3c3f..f609e5ef9d4f22837fd891bde3b8ed48dacd15fc 100644 (file)
--- a/apps/theming/lib/ImageManager.php
+++ b/apps/theming/lib/ImageManager.php
@@ -240,7 +240,7 @@ class ImageManager {
                $supportedFormats = $this->getSupportedUploadImageFormats($key);
                $detectedMimeType = mime_content_type($tmpFile);
                if (!in_array($detectedMimeType, $supportedFormats, true)) {
-                       throw new \Exception('Unsupported image type');
+                       throw new \Exception('Unsupported image type: ' . $detectedMimeType);
                }
 
                if ($key === 'background' && $this->shouldOptimizeBackgroundImage($detectedMimeType, filesize($tmpFile))) {

diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php
index 22432a00103f3bb28ad7a09d8252a3fb755962dc..e0e00615edbe4adb34cb9f207af6ef1f5c2a4a70 100644 (file)
--- a/apps/theming/tests/ImageManagerTest.php
+++ b/apps/theming/tests/ImageManagerTest.php
@@ -390,4 +390,30 @@ class ImageManagerTest extends TestCase {
 
                $this->imageManager->updateImage($key, $tmpFile);
        }
+
+       public function testUnsupportedImageType(): void {
+               $this->expectException(\Exception::class);
+               $this->expectExceptionMessage('Unsupported image type: text/plain');
+
+               $file = $this->createMock(ISimpleFile::class);
+               $folder = $this->createMock(ISimpleFolder::class);
+               $oldFile = $this->createMock(ISimpleFile::class);
+
+               $folder->expects($this->any())
+                       ->method('getFile')
+                       ->willReturn($oldFile);
+
+               $this->rootFolder
+                       ->expects($this->any())
+                       ->method('getFolder')
+                       ->with('images')
+                       ->willReturn($folder);
+
+               $folder->expects($this->once())
+                       ->method('newFile')
+                       ->with('favicon')
+                       ->willReturn($file);
+
+               $this->imageManager->updateImage('favicon', __DIR__ . '/../../../tests/data/lorem.txt');
+       }
 }