nextcloud / server

apps/theming/tests/UtilTest.php

Indentation +204 added lines, -204 removed lines

@@ -22,208 +22,208 @@
 
 class UtilTest extends TestCase {
 
-	protected Util $util;
-	protected IConfig&MockObject $config;
-	protected IAppData&MockObject $appData;
-	protected IAppManager $appManager;
-	protected ImageManager&MockObject $imageManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->config = $this->createMock(IConfig::class);
-		$this->appData = $this->createMock(IAppData::class);
-		$this->appManager = Server::get(IAppManager::class);
-		$this->imageManager = $this->createMock(ImageManager::class);
-		$this->util = new Util($this->createMock(ServerVersion::class), $this->config, $this->appManager, $this->appData, $this->imageManager);
-	}
-
-	public static function dataColorContrast(): array {
-		return [
-			['#ffffff', '#FFFFFF', 1],
-			['#000000', '#000000', 1],
-			['#ffffff', '#000000', 21],
-			['#000000', '#FFFFFF', 21],
-			['#9E9E9E', '#353535', 4.578],
-			['#353535', '#9E9E9E', 4.578],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataColorContrast')]
-	public function testColorContrast(string $color1, string $color2, int|float $contrast): void {
-		$this->assertEqualsWithDelta($contrast, $this->util->colorContrast($color1, $color2), .001);
-	}
-
-	public static function dataInvertTextColor(): array {
-		return [
-			['#ffffff', true],
-			['#000000', false],
-			['#00679e', false],
-			['#ffff00', true],
-		];
-	}
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataInvertTextColor')]
-	public function testInvertTextColor(string $color, bool $expected): void {
-		$invert = $this->util->invertTextColor($color);
-		$this->assertEquals($expected, $invert);
-	}
-
-	public function testCalculateLuminanceLight(): void {
-		$luminance = $this->util->calculateLuminance('#ffffff');
-		$this->assertEquals(1, $luminance);
-	}
-
-	public function testCalculateLuminanceDark(): void {
-		$luminance = $this->util->calculateLuminance('#000000');
-		$this->assertEquals(0, $luminance);
-	}
-
-	public function testCalculateLuminanceLightShorthand(): void {
-		$luminance = $this->util->calculateLuminance('#fff');
-		$this->assertEquals(1, $luminance);
-	}
-
-	public function testCalculateLuminanceDarkShorthand(): void {
-		$luminance = $this->util->calculateLuminance('#000');
-		$this->assertEquals(0, $luminance);
-	}
-
-	public function testInvertTextColorInvalid(): void {
-		$this->expectException(\Exception::class);
-		$this->util->invertTextColor('aaabbbcccddd123');
-	}
-
-	public function testInvertTextColorEmpty(): void {
-		$this->expectException(\Exception::class);
-		$this->util->invertTextColor('');
-	}
-
-	public function testElementColorDefaultBlack(): void {
-		$elementColor = $this->util->elementColor('#000000');
-		$this->assertEquals('#4d4d4d', $elementColor);
-	}
-
-	public function testElementColorDefaultWhite(): void {
-		$elementColor = $this->util->elementColor('#ffffff');
-		$this->assertEquals('#b3b3b3', $elementColor);
-	}
-
-	public function testElementColorBlackOnDarkBackground(): void {
-		$elementColor = $this->util->elementColor('#000000', false);
-		$this->assertEquals('#4d4d4d', $elementColor);
-	}
-
-	public function testElementColorBlackOnBrightBackground(): void {
-		$elementColor = $this->util->elementColor('#000000', true);
-		$this->assertEquals('#000000', $elementColor);
-	}
-
-	public function testElementColorWhiteOnBrightBackground(): void {
-		$elementColor = $this->util->elementColor('#ffffff', true);
-		$this->assertEquals('#b3b3b3', $elementColor);
-	}
-
-	public function testElementColorWhiteOnDarkBackground(): void {
-		$elementColor = $this->util->elementColor('#ffffff', false);
-		$this->assertEquals('#ffffff', $elementColor);
-	}
-
-	public function testGenerateRadioButtonWhite(): void {
-		$button = $this->util->generateRadioButton('#ffffff');
-		$expected = 'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiI+PHBhdGggZD0iTTggMWE3IDcgMCAwIDAtNyA3IDcgNyAwIDAgMCA3IDcgNyA3IDAgMCAwIDctNyA3IDcgMCAwIDAtNy03em0wIDFhNiA2IDAgMCAxIDYgNiA2IDYgMCAwIDEtNiA2IDYgNiAwIDAgMS02LTYgNiA2IDAgMCAxIDYtNnptMCAyYTQgNCAwIDEgMCAwIDggNCA0IDAgMCAwIDAtOHoiIGZpbGw9IiNmZmZmZmYiLz48L3N2Zz4=';
-		$this->assertEquals($expected, $button);
-	}
-
-	public function testGenerateRadioButtonBlack(): void {
-		$button = $this->util->generateRadioButton('#000000');
-		$expected = 'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiI+PHBhdGggZD0iTTggMWE3IDcgMCAwIDAtNyA3IDcgNyAwIDAgMCA3IDcgNyA3IDAgMCAwIDctNyA3IDcgMCAwIDAtNy03em0wIDFhNiA2IDAgMCAxIDYgNiA2IDYgMCAwIDEtNiA2IDYgNiAwIDAgMS02LTYgNiA2IDAgMCAxIDYtNnptMCAyYTQgNCAwIDEgMCAwIDggNCA0IDAgMCAwIDAtOHoiIGZpbGw9IiMwMDAwMDAiLz48L3N2Zz4=';
-		$this->assertEquals($expected, $button);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetAppIcon')]
-	public function testGetAppIcon(string $app, string $expected): void {
-		$this->appData->expects($this->any())
-			->method('getFolder')
-			->with('global/images')
-			->willThrowException(new NotFoundException());
-		$icon = $this->util->getAppIcon($app);
-		$this->assertEquals($expected, $icon);
-	}
-
-	public static function dataGetAppIcon(): array {
-		return [
-			['user_ldap', Server::get(IAppManager::class)->getAppPath('user_ldap') . '/img/app.svg'],
-			['noapplikethis', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
-			['comments', Server::get(IAppManager::class)->getAppPath('comments') . '/img/comments.svg'],
-		];
-	}
-
-	public function testGetAppIconThemed(): void {
-		$file = $this->createMock(ISimpleFile::class);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$folder->expects($this->once())
-			->method('getFile')
-			->with('logo')
-			->willReturn($file);
-		$this->appData->expects($this->once())
-			->method('getFolder')
-			->with('global/images')
-			->willReturn($folder);
-		$icon = $this->util->getAppIcon('noapplikethis');
-		$this->assertEquals($file, $icon);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetAppImage')]
-	public function testGetAppImage(string $app, string $image, string|bool $expected): void {
-		$this->assertEquals($expected, $this->util->getAppImage($app, $image));
-	}
-
-	public static function dataGetAppImage(): array {
-		return [
-			['core', 'logo/logo.svg', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
-			['files', 'folder', \OC::$SERVERROOT . '/apps/files/img/folder.svg'],
-			['files', 'folder.svg', \OC::$SERVERROOT . '/apps/files/img/folder.svg'],
-			['noapplikethis', 'foobar.svg', false],
-		];
-	}
-
-	public function testColorizeSvg(): void {
-		$input = '#0082c9 #0082C9 #000000 #FFFFFF';
-		$expected = '#AAAAAA #AAAAAA #000000 #FFFFFF';
-		$result = $this->util->colorizeSvg($input, '#AAAAAA');
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testIsAlreadyThemedFalse(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValue')
-			->with('theme', '')
-			->willReturn('');
-		$actual = $this->util->isAlreadyThemed();
-		$this->assertFalse($actual);
-	}
-
-	public function testIsAlreadyThemedTrue(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValue')
-			->with('theme', '')
-			->willReturn('example');
-		$actual = $this->util->isAlreadyThemed();
-		$this->assertTrue($actual);
-	}
-
-	public static function dataIsBackgroundThemed(): array {
-		return [
-			['', false],
-			['png', true],
-			['backgroundColor', false],
-		];
-	}
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataIsBackgroundThemed')]
-	public function testIsBackgroundThemed(string $backgroundMime, bool $expected): void {
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'backgroundMime', '')
-			->willReturn($backgroundMime);
-		$this->assertEquals($expected, $this->util->isBackgroundThemed());
-	}
+    protected Util $util;
+    protected IConfig&MockObject $config;
+    protected IAppData&MockObject $appData;
+    protected IAppManager $appManager;
+    protected ImageManager&MockObject $imageManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->config = $this->createMock(IConfig::class);
+        $this->appData = $this->createMock(IAppData::class);
+        $this->appManager = Server::get(IAppManager::class);
+        $this->imageManager = $this->createMock(ImageManager::class);
+        $this->util = new Util($this->createMock(ServerVersion::class), $this->config, $this->appManager, $this->appData, $this->imageManager);
+    }
+
+    public static function dataColorContrast(): array {
+        return [
+            ['#ffffff', '#FFFFFF', 1],
+            ['#000000', '#000000', 1],
+            ['#ffffff', '#000000', 21],
+            ['#000000', '#FFFFFF', 21],
+            ['#9E9E9E', '#353535', 4.578],
+            ['#353535', '#9E9E9E', 4.578],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataColorContrast')]
+    public function testColorContrast(string $color1, string $color2, int|float $contrast): void {
+        $this->assertEqualsWithDelta($contrast, $this->util->colorContrast($color1, $color2), .001);
+    }
+
+    public static function dataInvertTextColor(): array {
+        return [
+            ['#ffffff', true],
+            ['#000000', false],
+            ['#00679e', false],
+            ['#ffff00', true],
+        ];
+    }
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataInvertTextColor')]
+    public function testInvertTextColor(string $color, bool $expected): void {
+        $invert = $this->util->invertTextColor($color);
+        $this->assertEquals($expected, $invert);
+    }
+
+    public function testCalculateLuminanceLight(): void {
+        $luminance = $this->util->calculateLuminance('#ffffff');
+        $this->assertEquals(1, $luminance);
+    }
+
+    public function testCalculateLuminanceDark(): void {
+        $luminance = $this->util->calculateLuminance('#000000');
+        $this->assertEquals(0, $luminance);
+    }
+
+    public function testCalculateLuminanceLightShorthand(): void {
+        $luminance = $this->util->calculateLuminance('#fff');
+        $this->assertEquals(1, $luminance);
+    }
+
+    public function testCalculateLuminanceDarkShorthand(): void {
+        $luminance = $this->util->calculateLuminance('#000');
+        $this->assertEquals(0, $luminance);
+    }
+
+    public function testInvertTextColorInvalid(): void {
+        $this->expectException(\Exception::class);
+        $this->util->invertTextColor('aaabbbcccddd123');
+    }
+
+    public function testInvertTextColorEmpty(): void {
+        $this->expectException(\Exception::class);
+        $this->util->invertTextColor('');
+    }
+
+    public function testElementColorDefaultBlack(): void {
+        $elementColor = $this->util->elementColor('#000000');
+        $this->assertEquals('#4d4d4d', $elementColor);
+    }
+
+    public function testElementColorDefaultWhite(): void {
+        $elementColor = $this->util->elementColor('#ffffff');
+        $this->assertEquals('#b3b3b3', $elementColor);
+    }
+
+    public function testElementColorBlackOnDarkBackground(): void {
+        $elementColor = $this->util->elementColor('#000000', false);
+        $this->assertEquals('#4d4d4d', $elementColor);
+    }
+
+    public function testElementColorBlackOnBrightBackground(): void {
+        $elementColor = $this->util->elementColor('#000000', true);
+        $this->assertEquals('#000000', $elementColor);
+    }
+
+    public function testElementColorWhiteOnBrightBackground(): void {
+        $elementColor = $this->util->elementColor('#ffffff', true);
+        $this->assertEquals('#b3b3b3', $elementColor);
+    }
+
+    public function testElementColorWhiteOnDarkBackground(): void {
+        $elementColor = $this->util->elementColor('#ffffff', false);
+        $this->assertEquals('#ffffff', $elementColor);
+    }
+
+    public function testGenerateRadioButtonWhite(): void {
+        $button = $this->util->generateRadioButton('#ffffff');
+        $expected = 'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiI+PHBhdGggZD0iTTggMWE3IDcgMCAwIDAtNyA3IDcgNyAwIDAgMCA3IDcgNyA3IDAgMCAwIDctNyA3IDcgMCAwIDAtNy03em0wIDFhNiA2IDAgMCAxIDYgNiA2IDYgMCAwIDEtNiA2IDYgNiAwIDAgMS02LTYgNiA2IDAgMCAxIDYtNnptMCAyYTQgNCAwIDEgMCAwIDggNCA0IDAgMCAwIDAtOHoiIGZpbGw9IiNmZmZmZmYiLz48L3N2Zz4=';
+        $this->assertEquals($expected, $button);
+    }
+
+    public function testGenerateRadioButtonBlack(): void {
+        $button = $this->util->generateRadioButton('#000000');
+        $expected = 'PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTYiIHdpZHRoPSIxNiI+PHBhdGggZD0iTTggMWE3IDcgMCAwIDAtNyA3IDcgNyAwIDAgMCA3IDcgNyA3IDAgMCAwIDctNyA3IDcgMCAwIDAtNy03em0wIDFhNiA2IDAgMCAxIDYgNiA2IDYgMCAwIDEtNiA2IDYgNiAwIDAgMS02LTYgNiA2IDAgMCAxIDYtNnptMCAyYTQgNCAwIDEgMCAwIDggNCA0IDAgMCAwIDAtOHoiIGZpbGw9IiMwMDAwMDAiLz48L3N2Zz4=';
+        $this->assertEquals($expected, $button);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetAppIcon')]
+    public function testGetAppIcon(string $app, string $expected): void {
+        $this->appData->expects($this->any())
+            ->method('getFolder')
+            ->with('global/images')
+            ->willThrowException(new NotFoundException());
+        $icon = $this->util->getAppIcon($app);
+        $this->assertEquals($expected, $icon);
+    }
+
+    public static function dataGetAppIcon(): array {
+        return [
+            ['user_ldap', Server::get(IAppManager::class)->getAppPath('user_ldap') . '/img/app.svg'],
+            ['noapplikethis', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
+            ['comments', Server::get(IAppManager::class)->getAppPath('comments') . '/img/comments.svg'],
+        ];
+    }
+
+    public function testGetAppIconThemed(): void {
+        $file = $this->createMock(ISimpleFile::class);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $folder->expects($this->once())
+            ->method('getFile')
+            ->with('logo')
+            ->willReturn($file);
+        $this->appData->expects($this->once())
+            ->method('getFolder')
+            ->with('global/images')
+            ->willReturn($folder);
+        $icon = $this->util->getAppIcon('noapplikethis');
+        $this->assertEquals($file, $icon);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetAppImage')]
+    public function testGetAppImage(string $app, string $image, string|bool $expected): void {
+        $this->assertEquals($expected, $this->util->getAppImage($app, $image));
+    }
+
+    public static function dataGetAppImage(): array {
+        return [
+            ['core', 'logo/logo.svg', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
+            ['files', 'folder', \OC::$SERVERROOT . '/apps/files/img/folder.svg'],
+            ['files', 'folder.svg', \OC::$SERVERROOT . '/apps/files/img/folder.svg'],
+            ['noapplikethis', 'foobar.svg', false],
+        ];
+    }
+
+    public function testColorizeSvg(): void {
+        $input = '#0082c9 #0082C9 #000000 #FFFFFF';
+        $expected = '#AAAAAA #AAAAAA #000000 #FFFFFF';
+        $result = $this->util->colorizeSvg($input, '#AAAAAA');
+        $this->assertEquals($expected, $result);
+    }
+
+    public function testIsAlreadyThemedFalse(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValue')
+            ->with('theme', '')
+            ->willReturn('');
+        $actual = $this->util->isAlreadyThemed();
+        $this->assertFalse($actual);
+    }
+
+    public function testIsAlreadyThemedTrue(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValue')
+            ->with('theme', '')
+            ->willReturn('example');
+        $actual = $this->util->isAlreadyThemed();
+        $this->assertTrue($actual);
+    }
+
+    public static function dataIsBackgroundThemed(): array {
+        return [
+            ['', false],
+            ['png', true],
+            ['backgroundColor', false],
+        ];
+    }
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataIsBackgroundThemed')]
+    public function testIsBackgroundThemed(string $backgroundMime, bool $expected): void {
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'backgroundMime', '')
+            ->willReturn($backgroundMime);
+        $this->assertEquals($expected, $this->util->isBackgroundThemed());
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataColorContrast')]
-	public function testColorContrast(string $color1, string $color2, int|float $contrast): void {
+	public function testColorContrast(string $color1, string $color2, int | float $contrast): void {
 		$this->assertEqualsWithDelta($contrast, $this->util->colorContrast($color1, $color2), .001);
 	}
 
@@ -151,9 +151,9 @@ 
 
 	public static function dataGetAppIcon(): array {
 		return [
-			['user_ldap', Server::get(IAppManager::class)->getAppPath('user_ldap') . '/img/app.svg'],
-			['noapplikethis', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
-			['comments', Server::get(IAppManager::class)->getAppPath('comments') . '/img/comments.svg'],
+			['user_ldap', Server::get(IAppManager::class)->getAppPath('user_ldap').'/img/app.svg'],
+			['noapplikethis', \OC::$SERVERROOT.'/core/img/logo/logo.svg'],
+			['comments', Server::get(IAppManager::class)->getAppPath('comments').'/img/comments.svg'],
 		];
 	}
 
@@ -173,15 +173,15 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetAppImage')]
-	public function testGetAppImage(string $app, string $image, string|bool $expected): void {
+	public function testGetAppImage(string $app, string $image, string | bool $expected): void {
 		$this->assertEquals($expected, $this->util->getAppImage($app, $image));
 	}
 
 	public static function dataGetAppImage(): array {
 		return [
-			['core', 'logo/logo.svg', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
-			['files', 'folder', \OC::$SERVERROOT . '/apps/files/img/folder.svg'],
-			['files', 'folder.svg', \OC::$SERVERROOT . '/apps/files/img/folder.svg'],
+			['core', 'logo/logo.svg', \OC::$SERVERROOT.'/core/img/logo/logo.svg'],
+			['files', 'folder', \OC::$SERVERROOT.'/apps/files/img/folder.svg'],
+			['files', 'folder.svg', \OC::$SERVERROOT.'/apps/files/img/folder.svg'],
 			['noapplikethis', 'foobar.svg', false],
 		];
 	}

apps/theming/tests/Controller/UserThemeControllerTest.php

Indentation +92 added lines, -92 removed lines

@@ -29,96 +29,96 @@
 use Test\TestCase;
 
 class UserThemeControllerTest extends TestCase {
-	private IRequest&MockObject $request;
-	private IConfig&MockObject $config;
-	private IUserSession&MockObject $userSession;
-	private ThemesService&MockObject $themesService;
-	private ThemingDefaults&MockObject $themingDefaults;
-	private BackgroundService&MockObject $backgroundService;
-	private UserThemeController $userThemeController;
-
-
-	/** @var ITheme[] */
-	private array $themes;
-
-	protected function setUp(): void {
-		$this->request = $this->createMock(IRequest::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->themesService = $this->createMock(ThemesService::class);
-		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
-		$this->backgroundService = $this->createMock(BackgroundService::class);
-
-		$this->themes = [
-			'default' => $this->createMock(DefaultTheme::class),
-			'light' => $this->createMock(LightTheme::class),
-			'dark' => $this->createMock(DarkTheme::class),
-			'light-highcontrast' => $this->createMock(HighContrastTheme::class),
-			'dark-highcontrast' => $this->createMock(DarkHighContrastTheme::class),
-			'opendyslexic' => $this->createMock(DyslexiaFont::class),
-		];
-
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$this->userThemeController = new UserThemeController(
-			Application::APP_ID,
-			$this->request,
-			$this->config,
-			$this->userSession,
-			$this->themesService,
-			$this->themingDefaults,
-			$this->backgroundService,
-		);
-
-		parent::setUp();
-	}
-
-	public static function dataTestThemes(): array {
-		return [
-			['default'],
-			['light'],
-			['dark'],
-			['light-highcontrast'],
-			['dark-highcontrast'],
-			['opendyslexic'],
-			['', OCSBadRequestException::class],
-			['badTheme', OCSBadRequestException::class],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestThemes')]
-	public function testEnableTheme(string $themeId, ?string $exception = null): void {
-		$this->themesService
-			->expects($this->any())
-			->method('getThemes')
-			->willReturn($this->themes);
-
-		if ($exception) {
-			$this->expectException($exception);
-		}
-
-		$expected = new DataResponse();
-		$this->assertEquals($expected, $this->userThemeController->enableTheme($themeId));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestThemes')]
-	public function testDisableTheme(string $themeId, ?string $exception = null): void {
-		$this->themesService
-			->expects($this->any())
-			->method('getThemes')
-			->willReturn($this->themes);
-
-		if ($exception) {
-			$this->expectException($exception);
-		}
-
-		$expected = new DataResponse();
-		$this->assertEquals($expected, $this->userThemeController->disableTheme($themeId));
-	}
+    private IRequest&MockObject $request;
+    private IConfig&MockObject $config;
+    private IUserSession&MockObject $userSession;
+    private ThemesService&MockObject $themesService;
+    private ThemingDefaults&MockObject $themingDefaults;
+    private BackgroundService&MockObject $backgroundService;
+    private UserThemeController $userThemeController;
+
+
+    /** @var ITheme[] */
+    private array $themes;
+
+    protected function setUp(): void {
+        $this->request = $this->createMock(IRequest::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->themesService = $this->createMock(ThemesService::class);
+        $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+        $this->backgroundService = $this->createMock(BackgroundService::class);
+
+        $this->themes = [
+            'default' => $this->createMock(DefaultTheme::class),
+            'light' => $this->createMock(LightTheme::class),
+            'dark' => $this->createMock(DarkTheme::class),
+            'light-highcontrast' => $this->createMock(HighContrastTheme::class),
+            'dark-highcontrast' => $this->createMock(DarkHighContrastTheme::class),
+            'opendyslexic' => $this->createMock(DyslexiaFont::class),
+        ];
+
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $this->userThemeController = new UserThemeController(
+            Application::APP_ID,
+            $this->request,
+            $this->config,
+            $this->userSession,
+            $this->themesService,
+            $this->themingDefaults,
+            $this->backgroundService,
+        );
+
+        parent::setUp();
+    }
+
+    public static function dataTestThemes(): array {
+        return [
+            ['default'],
+            ['light'],
+            ['dark'],
+            ['light-highcontrast'],
+            ['dark-highcontrast'],
+            ['opendyslexic'],
+            ['', OCSBadRequestException::class],
+            ['badTheme', OCSBadRequestException::class],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestThemes')]
+    public function testEnableTheme(string $themeId, ?string $exception = null): void {
+        $this->themesService
+            ->expects($this->any())
+            ->method('getThemes')
+            ->willReturn($this->themes);
+
+        if ($exception) {
+            $this->expectException($exception);
+        }
+
+        $expected = new DataResponse();
+        $this->assertEquals($expected, $this->userThemeController->enableTheme($themeId));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestThemes')]
+    public function testDisableTheme(string $themeId, ?string $exception = null): void {
+        $this->themesService
+            ->expects($this->any())
+            ->method('getThemes')
+            ->willReturn($this->themes);
+
+        if ($exception) {
+            $this->expectException($exception);
+        }
+
+        $expected = new DataResponse();
+        $this->assertEquals($expected, $this->userThemeController->disableTheme($themeId));
+    }
 }

apps/theming/tests/Controller/ThemingControllerTest.php

Indentation +722 added lines, -722 removed lines

@@ -35,726 +35,726 @@
 
 class ThemingControllerTest extends TestCase {
 
-	private IRequest&MockObject $request;
-	private IConfig&MockObject $config;
-	private IAppConfig&MockObject $appConfig;
-	private ThemingDefaults&MockObject $themingDefaults;
-	private IL10N&MockObject $l10n;
-	private IAppManager&MockObject $appManager;
-	private ImageManager&MockObject $imageManager;
-	private IURLGenerator&MockObject $urlGenerator;
-	private ThemesService&MockObject $themesService;
-	private INavigationManager&MockObject $navigationManager;
-
-	private ThemingController $themingController;
-
-	protected function setUp(): void {
-		$this->request = $this->createMock(IRequest::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
-		$this->l10n = $this->createMock(L10N::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->imageManager = $this->createMock(ImageManager::class);
-		$this->themesService = $this->createMock(ThemesService::class);
-		$this->navigationManager = $this->createMock(INavigationManager::class);
-
-		$timeFactory = $this->createMock(ITimeFactory::class);
-		$timeFactory->expects($this->any())
-			->method('getTime')
-			->willReturn(123);
-
-		$this->overwriteService(ITimeFactory::class, $timeFactory);
-
-		$this->themingController = new ThemingController(
-			'theming',
-			$this->request,
-			$this->config,
-			$this->appConfig,
-			$this->themingDefaults,
-			$this->l10n,
-			$this->urlGenerator,
-			$this->appManager,
-			$this->imageManager,
-			$this->themesService,
-			$this->navigationManager,
-		);
-
-		parent::setUp();
-	}
-
-	public static function dataUpdateStylesheetSuccess(): array {
-		return [
-			['name', str_repeat('a', 250), 'Saved'],
-			['url', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
-			['slogan', str_repeat('a', 500), 'Saved'],
-			['color', '#0082c9', 'Saved'],
-			['color', '#0082C9', 'Saved'],
-			['color', '#0082C9', 'Saved'],
-			['imprintUrl', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
-			['privacyUrl', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateStylesheetSuccess')]
-	public function testUpdateStylesheetSuccess(string $setting, string $value, string $message): void {
-		$this->themingDefaults
-			->expects($this->once())
-			->method('set')
-			->with($setting, $value);
-		$this->l10n
-			->expects($this->once())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => $message,
-					],
-				'status' => 'success',
-			]
-		);
-		$this->assertEquals($expected, $this->themingController->updateStylesheet($setting, $value));
-	}
-
-	public static function dataUpdateStylesheetError(): array {
-		$urls = [
-			'url' => 'web address',
-			'imprintUrl' => 'legal notice address',
-			'privacyUrl' => 'privacy policy address',
-		];
-
-		$urlTests = [];
-		foreach ($urls as $urlKey => $urlName) {
-			// Check length limit
-			$urlTests[] = [$urlKey, 'http://example.com/' . str_repeat('a', 501), "The given {$urlName} is too long"];
-			// Check potential evil javascript
-			$urlTests[] = [$urlKey, 'javascript:alert(1)', "The given {$urlName} is not a valid URL"];
-			// Check XSS
-			$urlTests[] = [$urlKey, 'https://example.com/"><script/src="alert(\'1\')"><a/href/="', "The given {$urlName} is not a valid URL"];
-		}
-
-		return [
-			['name', str_repeat('a', 251), 'The given name is too long'],
-			['slogan', str_repeat('a', 501), 'The given slogan is too long'],
-			['primary_color', '0082C9', 'The given color is invalid'],
-			['primary_color', '#0082Z9', 'The given color is invalid'],
-			['primary_color', 'Nextcloud', 'The given color is invalid'],
-			['background_color', '0082C9', 'The given color is invalid'],
-			['background_color', '#0082Z9', 'The given color is invalid'],
-			['background_color', 'Nextcloud', 'The given color is invalid'],
-
-			...$urlTests,
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateStylesheetError')]
-	public function testUpdateStylesheetError(string $setting, string $value, string $message): void {
-		$this->themingDefaults
-			->expects($this->never())
-			->method('set')
-			->with($setting, $value);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => $message,
-					],
-				'status' => 'error',
-			],
-			Http::STATUS_BAD_REQUEST
-		);
-		$this->assertEquals($expected, $this->themingController->updateStylesheet($setting, $value));
-	}
-
-	public function testUpdateLogoNoData(): void {
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('logo');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn(null);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => 'No file uploaded',
-					],
-				'status' => 'failure',
-			],
-			Http::STATUS_UNPROCESSABLE_ENTITY
-		);
-
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public function testUploadInvalidUploadKey(): void {
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('invalid');
-		$this->request
-			->expects($this->never())
-			->method('getUploadedFile');
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => 'Invalid key',
-					],
-				'status' => 'failure',
-			],
-			Http::STATUS_BAD_REQUEST
-		);
-
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	/**
-	 * Checks that trying to upload an SVG favicon without imagemagick
-	 * results in an unsupported media type response.
-	 */
-	public function testUploadSVGFaviconWithoutImagemagick(): void {
-		$this->imageManager
-			->method('shouldReplaceIcons')
-			->willReturn(false);
-
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('favicon');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => __DIR__ . '/../../../../tests/data/testimagelarge.svg',
-				'type' => 'image/svg',
-				'name' => 'testimagelarge.svg',
-				'error' => 0,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$this->imageManager->expects($this->once())
-			->method('updateImage')
-			->willThrowException(new \Exception('Unsupported image type'));
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => 'Unsupported image type',
-					],
-				'status' => 'failure'
-			],
-			Http::STATUS_UNPROCESSABLE_ENTITY
-		);
-
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public function testUpdateLogoInvalidMimeType(): void {
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('logo');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => __DIR__ . '/../../../../tests/data/lorem.txt',
-				'type' => 'application/pdf',
-				'name' => 'logo.pdf',
-				'error' => 0,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$this->imageManager->expects($this->once())
-			->method('updateImage')
-			->willThrowException(new \Exception('Unsupported image type'));
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => 'Unsupported image type',
-					],
-				'status' => 'failure'
-			],
-			Http::STATUS_UNPROCESSABLE_ENTITY
-		);
-
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public static function dataUpdateImages(): array {
-		return [
-			['image/jpeg', false],
-			['image/jpeg', true],
-			['image/gif'],
-			['image/png'],
-			['image/svg+xml'],
-			['image/svg']
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateImages')]
-	public function testUpdateLogoNormalLogoUpload(string $mimeType, bool $folderExists = true): void {
-		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . '/logo.svg';
-		$destination = Server::get(ITempManager::class)->getTemporaryFolder();
-
-		touch($tmpLogo);
-		copy(__DIR__ . '/../../../../tests/data/testimage.png', $tmpLogo);
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('logo');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => $tmpLogo,
-				'type' => $mimeType,
-				'name' => 'logo.svg',
-				'error' => 0,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$this->imageManager->expects($this->once())
-			->method('getImageUrl')
-			->with('logo')
-			->willReturn('imageUrl');
-
-		$this->imageManager->expects($this->once())
-			->method('updateImage');
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'name' => 'logo.svg',
-						'message' => 'Saved',
-						'url' => 'imageUrl',
-					],
-				'status' => 'success'
-			]
-		);
-
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public function testUpdateLogoLoginScreenUpload(): void {
-		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . 'logo.png';
-
-		touch($tmpLogo);
-		copy(__DIR__ . '/../../../../tests/data/desktopapp.png', $tmpLogo);
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('background');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => $tmpLogo,
-				'type' => 'image/svg+xml',
-				'name' => 'logo.svg',
-				'error' => 0,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$this->imageManager->expects($this->once())
-			->method('updateImage');
-
-		$this->imageManager->expects($this->once())
-			->method('getImageUrl')
-			->with('background')
-			->willReturn('imageUrl');
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'name' => 'logo.svg',
-						'message' => 'Saved',
-						'url' => 'imageUrl',
-					],
-				'status' => 'success'
-			]
-		);
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public function testUpdateLogoLoginScreenUploadWithInvalidImage(): void {
-		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . '/logo.svg';
-
-		touch($tmpLogo);
-		file_put_contents($tmpLogo, file_get_contents(__DIR__ . '/../../../../tests/data/data.zip'));
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('logo');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => $tmpLogo,
-				'type' => 'foobar',
-				'name' => 'logo.svg',
-				'error' => 0,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$this->imageManager->expects($this->once())
-			->method('updateImage')
-			->willThrowException(new \Exception('Unsupported image type'));
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => 'Unsupported image type',
-					],
-				'status' => 'failure'
-			],
-			Http::STATUS_UNPROCESSABLE_ENTITY
-		);
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public static function dataPhpUploadErrors(): array {
-		return [
-			[UPLOAD_ERR_INI_SIZE, 'The uploaded file exceeds the upload_max_filesize directive in php.ini'],
-			[UPLOAD_ERR_FORM_SIZE, 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'],
-			[UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'],
-			[UPLOAD_ERR_NO_FILE, 'No file was uploaded'],
-			[UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'],
-			[UPLOAD_ERR_CANT_WRITE, 'Could not write file to disk'],
-			[UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataPhpUploadErrors')]
-	public function testUpdateLogoLoginScreenUploadWithInvalidImageUpload(int $error, string $expectedErrorMessage): void {
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('background');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => '',
-				'type' => 'image/svg+xml',
-				'name' => 'logo.svg',
-				'error' => $error,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => $expectedErrorMessage,
-					],
-				'status' => 'failure'
-			],
-			Http::STATUS_UNPROCESSABLE_ENTITY
-		);
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataPhpUploadErrors')]
-	public function testUpdateLogoUploadWithInvalidImageUpload($error, $expectedErrorMessage): void {
-		$this->request
-			->expects($this->once())
-			->method('getParam')
-			->with('key')
-			->willReturn('background');
-		$this->request
-			->expects($this->once())
-			->method('getUploadedFile')
-			->with('image')
-			->willReturn([
-				'tmp_name' => '',
-				'type' => 'text/svg',
-				'name' => 'logo.svg',
-				'error' => $error,
-			]);
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnCallback(function ($str) {
-				return $str;
-			});
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'message' => $expectedErrorMessage
-					],
-				'status' => 'failure'
-			],
-			Http::STATUS_UNPROCESSABLE_ENTITY
-		);
-		$this->assertEquals($expected, $this->themingController->uploadImage());
-	}
-
-	public function testUndo(): void {
-		$this->l10n
-			->expects($this->once())
-			->method('t')
-			->with('Saved')
-			->willReturn('Saved');
-		$this->themingDefaults
-			->expects($this->once())
-			->method('undo')
-			->with('MySetting')
-			->willReturn('MyValue');
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'value' => 'MyValue',
-						'message' => 'Saved'
-					],
-				'status' => 'success'
-			]
-		);
-		$this->assertEquals($expected, $this->themingController->undo('MySetting'));
-	}
-
-	public static function dataUndoDelete(): array {
-		return [
-			[ 'backgroundMime', 'background' ],
-			[ 'logoMime', 'logo' ]
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataUndoDelete')]
-	public function testUndoDelete(string $value, string $filename): void {
-		$this->l10n
-			->expects($this->once())
-			->method('t')
-			->with('Saved')
-			->willReturn('Saved');
-		$this->themingDefaults
-			->expects($this->once())
-			->method('undo')
-			->with($value)
-			->willReturn($value);
-
-		$expected = new DataResponse(
-			[
-				'data'
-					=> [
-						'value' => $value,
-						'message' => 'Saved',
-					],
-				'status' => 'success'
-			]
-		);
-		$this->assertEquals($expected, $this->themingController->undo($value));
-	}
-
-
-
-	public function testGetLogoNotExistent(): void {
-		$this->imageManager->method('getImage')
-			->with($this->equalTo('logo'))
-			->willThrowException(new NotFoundException());
-
-		$expected = new NotFoundResponse();
-		$this->assertEquals($expected, $this->themingController->getImage('logo'));
-	}
-
-	public function testGetLogo(): void {
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getName')->willReturn('logo.svg');
-		$file->method('getMTime')->willReturn(42);
-		$this->imageManager->expects($this->once())
-			->method('getImage')
-			->willReturn($file);
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->with('theming', 'logoMime', '')
-			->willReturn('text/svg');
-
-		@$expected = new FileDisplayResponse($file);
-		$expected->cacheFor(3600);
-		$expected->addHeader('Content-Type', 'text/svg');
-		$expected->addHeader('Content-Disposition', 'attachment; filename="logo"');
-		$csp = new ContentSecurityPolicy();
-		$csp->allowInlineStyle();
-		$expected->setContentSecurityPolicy($csp);
-		@$this->assertEquals($expected, $this->themingController->getImage('logo'));
-	}
-
-
-	public function testGetLoginBackgroundNotExistent(): void {
-		$this->imageManager->method('getImage')
-			->with($this->equalTo('background'))
-			->willThrowException(new NotFoundException());
-		$expected = new NotFoundResponse();
-		$this->assertEquals($expected, $this->themingController->getImage('background'));
-	}
-
-	public function testGetLoginBackground(): void {
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getName')->willReturn('background.png');
-		$file->method('getMTime')->willReturn(42);
-		$this->imageManager->expects($this->once())
-			->method('getImage')
-			->willReturn($file);
-
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->with('theming', 'backgroundMime', '')
-			->willReturn('image/png');
-
-		@$expected = new FileDisplayResponse($file);
-		$expected->cacheFor(3600);
-		$expected->addHeader('Content-Type', 'image/png');
-		$expected->addHeader('Content-Disposition', 'attachment; filename="background"');
-		$csp = new ContentSecurityPolicy();
-		$csp->allowInlineStyle();
-		$expected->setContentSecurityPolicy($csp);
-		@$this->assertEquals($expected, $this->themingController->getImage('background'));
-	}
-
-	public static function dataGetManifest(): array {
-		return [
-			[true],
-			[false],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetManifest')]
-	public function testGetManifest(bool $standalone): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('0');
-		$this->themingDefaults
-			->expects($this->any())
-			->method('getName')
-			->willReturn('Nextcloud');
-		$this->urlGenerator
-			->expects($this->once())
-			->method('getBaseUrl')
-			->willReturn('localhost');
-		$this->urlGenerator
-			->expects($this->exactly(2))
-			->method('linkToRoute')
-			->willReturnMap([
-				['theming.Icon.getTouchIcon', ['app' => 'core'], 'touchicon'],
-				['theming.Icon.getFavicon', ['app' => 'core'], 'favicon'],
-			]);
-		$this->config
-			->expects($this->exactly(2))
-			->method('getSystemValueBool')
-			->with('theming.standalone_window.enabled', true)
-			->willReturn($standalone);
-		$response = new JSONResponse([
-			'name' => 'Nextcloud',
-			'start_url' => 'localhost',
-			'icons'
-				=> [
-					[
-						'src' => 'touchicon?v=0',
-						'type' => 'image/png',
-						'sizes' => '512x512'
-					],
-					[
-						'src' => 'favicon?v=0',
-						'type' => 'image/svg+xml',
-						'sizes' => '16x16'
-					]
-				],
-			'display_override' => [$standalone ? 'minimal-ui' : ''],
-			'display' => $standalone ? 'standalone' : 'browser',
-			'short_name' => 'Nextcloud',
-			'theme_color' => null,
-			'background_color' => null,
-			'description' => null
-		]);
-		$response->cacheFor(3600);
-		$this->assertEquals($response, $this->themingController->getManifest('core'));
-	}
+    private IRequest&MockObject $request;
+    private IConfig&MockObject $config;
+    private IAppConfig&MockObject $appConfig;
+    private ThemingDefaults&MockObject $themingDefaults;
+    private IL10N&MockObject $l10n;
+    private IAppManager&MockObject $appManager;
+    private ImageManager&MockObject $imageManager;
+    private IURLGenerator&MockObject $urlGenerator;
+    private ThemesService&MockObject $themesService;
+    private INavigationManager&MockObject $navigationManager;
+
+    private ThemingController $themingController;
+
+    protected function setUp(): void {
+        $this->request = $this->createMock(IRequest::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+        $this->l10n = $this->createMock(L10N::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->imageManager = $this->createMock(ImageManager::class);
+        $this->themesService = $this->createMock(ThemesService::class);
+        $this->navigationManager = $this->createMock(INavigationManager::class);
+
+        $timeFactory = $this->createMock(ITimeFactory::class);
+        $timeFactory->expects($this->any())
+            ->method('getTime')
+            ->willReturn(123);
+
+        $this->overwriteService(ITimeFactory::class, $timeFactory);
+
+        $this->themingController = new ThemingController(
+            'theming',
+            $this->request,
+            $this->config,
+            $this->appConfig,
+            $this->themingDefaults,
+            $this->l10n,
+            $this->urlGenerator,
+            $this->appManager,
+            $this->imageManager,
+            $this->themesService,
+            $this->navigationManager,
+        );
+
+        parent::setUp();
+    }
+
+    public static function dataUpdateStylesheetSuccess(): array {
+        return [
+            ['name', str_repeat('a', 250), 'Saved'],
+            ['url', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
+            ['slogan', str_repeat('a', 500), 'Saved'],
+            ['color', '#0082c9', 'Saved'],
+            ['color', '#0082C9', 'Saved'],
+            ['color', '#0082C9', 'Saved'],
+            ['imprintUrl', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
+            ['privacyUrl', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateStylesheetSuccess')]
+    public function testUpdateStylesheetSuccess(string $setting, string $value, string $message): void {
+        $this->themingDefaults
+            ->expects($this->once())
+            ->method('set')
+            ->with($setting, $value);
+        $this->l10n
+            ->expects($this->once())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => $message,
+                    ],
+                'status' => 'success',
+            ]
+        );
+        $this->assertEquals($expected, $this->themingController->updateStylesheet($setting, $value));
+    }
+
+    public static function dataUpdateStylesheetError(): array {
+        $urls = [
+            'url' => 'web address',
+            'imprintUrl' => 'legal notice address',
+            'privacyUrl' => 'privacy policy address',
+        ];
+
+        $urlTests = [];
+        foreach ($urls as $urlKey => $urlName) {
+            // Check length limit
+            $urlTests[] = [$urlKey, 'http://example.com/' . str_repeat('a', 501), "The given {$urlName} is too long"];
+            // Check potential evil javascript
+            $urlTests[] = [$urlKey, 'javascript:alert(1)', "The given {$urlName} is not a valid URL"];
+            // Check XSS
+            $urlTests[] = [$urlKey, 'https://example.com/"><script/src="alert(\'1\')"><a/href/="', "The given {$urlName} is not a valid URL"];
+        }
+
+        return [
+            ['name', str_repeat('a', 251), 'The given name is too long'],
+            ['slogan', str_repeat('a', 501), 'The given slogan is too long'],
+            ['primary_color', '0082C9', 'The given color is invalid'],
+            ['primary_color', '#0082Z9', 'The given color is invalid'],
+            ['primary_color', 'Nextcloud', 'The given color is invalid'],
+            ['background_color', '0082C9', 'The given color is invalid'],
+            ['background_color', '#0082Z9', 'The given color is invalid'],
+            ['background_color', 'Nextcloud', 'The given color is invalid'],
+
+            ...$urlTests,
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateStylesheetError')]
+    public function testUpdateStylesheetError(string $setting, string $value, string $message): void {
+        $this->themingDefaults
+            ->expects($this->never())
+            ->method('set')
+            ->with($setting, $value);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => $message,
+                    ],
+                'status' => 'error',
+            ],
+            Http::STATUS_BAD_REQUEST
+        );
+        $this->assertEquals($expected, $this->themingController->updateStylesheet($setting, $value));
+    }
+
+    public function testUpdateLogoNoData(): void {
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('logo');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn(null);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => 'No file uploaded',
+                    ],
+                'status' => 'failure',
+            ],
+            Http::STATUS_UNPROCESSABLE_ENTITY
+        );
+
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public function testUploadInvalidUploadKey(): void {
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('invalid');
+        $this->request
+            ->expects($this->never())
+            ->method('getUploadedFile');
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => 'Invalid key',
+                    ],
+                'status' => 'failure',
+            ],
+            Http::STATUS_BAD_REQUEST
+        );
+
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    /**
+     * Checks that trying to upload an SVG favicon without imagemagick
+     * results in an unsupported media type response.
+     */
+    public function testUploadSVGFaviconWithoutImagemagick(): void {
+        $this->imageManager
+            ->method('shouldReplaceIcons')
+            ->willReturn(false);
+
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('favicon');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => __DIR__ . '/../../../../tests/data/testimagelarge.svg',
+                'type' => 'image/svg',
+                'name' => 'testimagelarge.svg',
+                'error' => 0,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $this->imageManager->expects($this->once())
+            ->method('updateImage')
+            ->willThrowException(new \Exception('Unsupported image type'));
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => 'Unsupported image type',
+                    ],
+                'status' => 'failure'
+            ],
+            Http::STATUS_UNPROCESSABLE_ENTITY
+        );
+
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public function testUpdateLogoInvalidMimeType(): void {
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('logo');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => __DIR__ . '/../../../../tests/data/lorem.txt',
+                'type' => 'application/pdf',
+                'name' => 'logo.pdf',
+                'error' => 0,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $this->imageManager->expects($this->once())
+            ->method('updateImage')
+            ->willThrowException(new \Exception('Unsupported image type'));
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => 'Unsupported image type',
+                    ],
+                'status' => 'failure'
+            ],
+            Http::STATUS_UNPROCESSABLE_ENTITY
+        );
+
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public static function dataUpdateImages(): array {
+        return [
+            ['image/jpeg', false],
+            ['image/jpeg', true],
+            ['image/gif'],
+            ['image/png'],
+            ['image/svg+xml'],
+            ['image/svg']
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateImages')]
+    public function testUpdateLogoNormalLogoUpload(string $mimeType, bool $folderExists = true): void {
+        $tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . '/logo.svg';
+        $destination = Server::get(ITempManager::class)->getTemporaryFolder();
+
+        touch($tmpLogo);
+        copy(__DIR__ . '/../../../../tests/data/testimage.png', $tmpLogo);
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('logo');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => $tmpLogo,
+                'type' => $mimeType,
+                'name' => 'logo.svg',
+                'error' => 0,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $this->imageManager->expects($this->once())
+            ->method('getImageUrl')
+            ->with('logo')
+            ->willReturn('imageUrl');
+
+        $this->imageManager->expects($this->once())
+            ->method('updateImage');
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'name' => 'logo.svg',
+                        'message' => 'Saved',
+                        'url' => 'imageUrl',
+                    ],
+                'status' => 'success'
+            ]
+        );
+
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public function testUpdateLogoLoginScreenUpload(): void {
+        $tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . 'logo.png';
+
+        touch($tmpLogo);
+        copy(__DIR__ . '/../../../../tests/data/desktopapp.png', $tmpLogo);
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('background');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => $tmpLogo,
+                'type' => 'image/svg+xml',
+                'name' => 'logo.svg',
+                'error' => 0,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $this->imageManager->expects($this->once())
+            ->method('updateImage');
+
+        $this->imageManager->expects($this->once())
+            ->method('getImageUrl')
+            ->with('background')
+            ->willReturn('imageUrl');
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'name' => 'logo.svg',
+                        'message' => 'Saved',
+                        'url' => 'imageUrl',
+                    ],
+                'status' => 'success'
+            ]
+        );
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public function testUpdateLogoLoginScreenUploadWithInvalidImage(): void {
+        $tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . '/logo.svg';
+
+        touch($tmpLogo);
+        file_put_contents($tmpLogo, file_get_contents(__DIR__ . '/../../../../tests/data/data.zip'));
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('logo');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => $tmpLogo,
+                'type' => 'foobar',
+                'name' => 'logo.svg',
+                'error' => 0,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $this->imageManager->expects($this->once())
+            ->method('updateImage')
+            ->willThrowException(new \Exception('Unsupported image type'));
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => 'Unsupported image type',
+                    ],
+                'status' => 'failure'
+            ],
+            Http::STATUS_UNPROCESSABLE_ENTITY
+        );
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public static function dataPhpUploadErrors(): array {
+        return [
+            [UPLOAD_ERR_INI_SIZE, 'The uploaded file exceeds the upload_max_filesize directive in php.ini'],
+            [UPLOAD_ERR_FORM_SIZE, 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'],
+            [UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'],
+            [UPLOAD_ERR_NO_FILE, 'No file was uploaded'],
+            [UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'],
+            [UPLOAD_ERR_CANT_WRITE, 'Could not write file to disk'],
+            [UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataPhpUploadErrors')]
+    public function testUpdateLogoLoginScreenUploadWithInvalidImageUpload(int $error, string $expectedErrorMessage): void {
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('background');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => '',
+                'type' => 'image/svg+xml',
+                'name' => 'logo.svg',
+                'error' => $error,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => $expectedErrorMessage,
+                    ],
+                'status' => 'failure'
+            ],
+            Http::STATUS_UNPROCESSABLE_ENTITY
+        );
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataPhpUploadErrors')]
+    public function testUpdateLogoUploadWithInvalidImageUpload($error, $expectedErrorMessage): void {
+        $this->request
+            ->expects($this->once())
+            ->method('getParam')
+            ->with('key')
+            ->willReturn('background');
+        $this->request
+            ->expects($this->once())
+            ->method('getUploadedFile')
+            ->with('image')
+            ->willReturn([
+                'tmp_name' => '',
+                'type' => 'text/svg',
+                'name' => 'logo.svg',
+                'error' => $error,
+            ]);
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnCallback(function ($str) {
+                return $str;
+            });
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'message' => $expectedErrorMessage
+                    ],
+                'status' => 'failure'
+            ],
+            Http::STATUS_UNPROCESSABLE_ENTITY
+        );
+        $this->assertEquals($expected, $this->themingController->uploadImage());
+    }
+
+    public function testUndo(): void {
+        $this->l10n
+            ->expects($this->once())
+            ->method('t')
+            ->with('Saved')
+            ->willReturn('Saved');
+        $this->themingDefaults
+            ->expects($this->once())
+            ->method('undo')
+            ->with('MySetting')
+            ->willReturn('MyValue');
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'value' => 'MyValue',
+                        'message' => 'Saved'
+                    ],
+                'status' => 'success'
+            ]
+        );
+        $this->assertEquals($expected, $this->themingController->undo('MySetting'));
+    }
+
+    public static function dataUndoDelete(): array {
+        return [
+            [ 'backgroundMime', 'background' ],
+            [ 'logoMime', 'logo' ]
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataUndoDelete')]
+    public function testUndoDelete(string $value, string $filename): void {
+        $this->l10n
+            ->expects($this->once())
+            ->method('t')
+            ->with('Saved')
+            ->willReturn('Saved');
+        $this->themingDefaults
+            ->expects($this->once())
+            ->method('undo')
+            ->with($value)
+            ->willReturn($value);
+
+        $expected = new DataResponse(
+            [
+                'data'
+                    => [
+                        'value' => $value,
+                        'message' => 'Saved',
+                    ],
+                'status' => 'success'
+            ]
+        );
+        $this->assertEquals($expected, $this->themingController->undo($value));
+    }
+
+
+
+    public function testGetLogoNotExistent(): void {
+        $this->imageManager->method('getImage')
+            ->with($this->equalTo('logo'))
+            ->willThrowException(new NotFoundException());
+
+        $expected = new NotFoundResponse();
+        $this->assertEquals($expected, $this->themingController->getImage('logo'));
+    }
+
+    public function testGetLogo(): void {
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getName')->willReturn('logo.svg');
+        $file->method('getMTime')->willReturn(42);
+        $this->imageManager->expects($this->once())
+            ->method('getImage')
+            ->willReturn($file);
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->with('theming', 'logoMime', '')
+            ->willReturn('text/svg');
+
+        @$expected = new FileDisplayResponse($file);
+        $expected->cacheFor(3600);
+        $expected->addHeader('Content-Type', 'text/svg');
+        $expected->addHeader('Content-Disposition', 'attachment; filename="logo"');
+        $csp = new ContentSecurityPolicy();
+        $csp->allowInlineStyle();
+        $expected->setContentSecurityPolicy($csp);
+        @$this->assertEquals($expected, $this->themingController->getImage('logo'));
+    }
+
+
+    public function testGetLoginBackgroundNotExistent(): void {
+        $this->imageManager->method('getImage')
+            ->with($this->equalTo('background'))
+            ->willThrowException(new NotFoundException());
+        $expected = new NotFoundResponse();
+        $this->assertEquals($expected, $this->themingController->getImage('background'));
+    }
+
+    public function testGetLoginBackground(): void {
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getName')->willReturn('background.png');
+        $file->method('getMTime')->willReturn(42);
+        $this->imageManager->expects($this->once())
+            ->method('getImage')
+            ->willReturn($file);
+
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->with('theming', 'backgroundMime', '')
+            ->willReturn('image/png');
+
+        @$expected = new FileDisplayResponse($file);
+        $expected->cacheFor(3600);
+        $expected->addHeader('Content-Type', 'image/png');
+        $expected->addHeader('Content-Disposition', 'attachment; filename="background"');
+        $csp = new ContentSecurityPolicy();
+        $csp->allowInlineStyle();
+        $expected->setContentSecurityPolicy($csp);
+        @$this->assertEquals($expected, $this->themingController->getImage('background'));
+    }
+
+    public static function dataGetManifest(): array {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetManifest')]
+    public function testGetManifest(bool $standalone): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('0');
+        $this->themingDefaults
+            ->expects($this->any())
+            ->method('getName')
+            ->willReturn('Nextcloud');
+        $this->urlGenerator
+            ->expects($this->once())
+            ->method('getBaseUrl')
+            ->willReturn('localhost');
+        $this->urlGenerator
+            ->expects($this->exactly(2))
+            ->method('linkToRoute')
+            ->willReturnMap([
+                ['theming.Icon.getTouchIcon', ['app' => 'core'], 'touchicon'],
+                ['theming.Icon.getFavicon', ['app' => 'core'], 'favicon'],
+            ]);
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getSystemValueBool')
+            ->with('theming.standalone_window.enabled', true)
+            ->willReturn($standalone);
+        $response = new JSONResponse([
+            'name' => 'Nextcloud',
+            'start_url' => 'localhost',
+            'icons'
+                => [
+                    [
+                        'src' => 'touchicon?v=0',
+                        'type' => 'image/png',
+                        'sizes' => '512x512'
+                    ],
+                    [
+                        'src' => 'favicon?v=0',
+                        'type' => 'image/svg+xml',
+                        'sizes' => '16x16'
+                    ]
+                ],
+            'display_override' => [$standalone ? 'minimal-ui' : ''],
+            'display' => $standalone ? 'standalone' : 'browser',
+            'short_name' => 'Nextcloud',
+            'theme_color' => null,
+            'background_color' => null,
+            'description' => null
+        ]);
+        $response->cacheFor(3600);
+        $this->assertEquals($response, $this->themingController->getManifest('core'));
+    }
 }

Spacing +25 added lines, -25 removed lines

@@ -87,13 +87,13 @@ 
 	public static function dataUpdateStylesheetSuccess(): array {
 		return [
 			['name', str_repeat('a', 250), 'Saved'],
-			['url', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
+			['url', 'https://nextcloud.com/'.str_repeat('a', 478), 'Saved'],
 			['slogan', str_repeat('a', 500), 'Saved'],
 			['color', '#0082c9', 'Saved'],
 			['color', '#0082C9', 'Saved'],
 			['color', '#0082C9', 'Saved'],
-			['imprintUrl', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
-			['privacyUrl', 'https://nextcloud.com/' . str_repeat('a', 478), 'Saved'],
+			['imprintUrl', 'https://nextcloud.com/'.str_repeat('a', 478), 'Saved'],
+			['privacyUrl', 'https://nextcloud.com/'.str_repeat('a', 478), 'Saved'],
 		];
 	}
 
@@ -106,7 +106,7 @@ 
 		$this->l10n
 			->expects($this->once())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -132,7 +132,7 @@ 
 		$urlTests = [];
 		foreach ($urls as $urlKey => $urlName) {
 			// Check length limit
-			$urlTests[] = [$urlKey, 'http://example.com/' . str_repeat('a', 501), "The given {$urlName} is too long"];
+			$urlTests[] = [$urlKey, 'http://example.com/'.str_repeat('a', 501), "The given {$urlName} is too long"];
 			// Check potential evil javascript
 			$urlTests[] = [$urlKey, 'javascript:alert(1)', "The given {$urlName} is not a valid URL"];
 			// Check XSS
@@ -162,7 +162,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -193,7 +193,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -223,7 +223,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -260,7 +260,7 @@ 
 			->method('getUploadedFile')
 			->with('image')
 			->willReturn([
-				'tmp_name' => __DIR__ . '/../../../../tests/data/testimagelarge.svg',
+				'tmp_name' => __DIR__.'/../../../../tests/data/testimagelarge.svg',
 				'type' => 'image/svg',
 				'name' => 'testimagelarge.svg',
 				'error' => 0,
@@ -268,7 +268,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -301,7 +301,7 @@ 
 			->method('getUploadedFile')
 			->with('image')
 			->willReturn([
-				'tmp_name' => __DIR__ . '/../../../../tests/data/lorem.txt',
+				'tmp_name' => __DIR__.'/../../../../tests/data/lorem.txt',
 				'type' => 'application/pdf',
 				'name' => 'logo.pdf',
 				'error' => 0,
@@ -309,7 +309,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -344,11 +344,11 @@ 
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateImages')]
 	public function testUpdateLogoNormalLogoUpload(string $mimeType, bool $folderExists = true): void {
-		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . '/logo.svg';
+		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder().'/logo.svg';
 		$destination = Server::get(ITempManager::class)->getTemporaryFolder();
 
 		touch($tmpLogo);
-		copy(__DIR__ . '/../../../../tests/data/testimage.png', $tmpLogo);
+		copy(__DIR__.'/../../../../tests/data/testimage.png', $tmpLogo);
 		$this->request
 			->expects($this->once())
 			->method('getParam')
@@ -367,7 +367,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -395,10 +395,10 @@ 
 	}
 
 	public function testUpdateLogoLoginScreenUpload(): void {
-		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . 'logo.png';
+		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder().'logo.png';
 
 		touch($tmpLogo);
-		copy(__DIR__ . '/../../../../tests/data/desktopapp.png', $tmpLogo);
+		copy(__DIR__.'/../../../../tests/data/desktopapp.png', $tmpLogo);
 		$this->request
 			->expects($this->once())
 			->method('getParam')
@@ -417,7 +417,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -443,10 +443,10 @@ 
 	}
 
 	public function testUpdateLogoLoginScreenUploadWithInvalidImage(): void {
-		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder() . '/logo.svg';
+		$tmpLogo = Server::get(ITempManager::class)->getTemporaryFolder().'/logo.svg';
 
 		touch($tmpLogo);
-		file_put_contents($tmpLogo, file_get_contents(__DIR__ . '/../../../../tests/data/data.zip'));
+		file_put_contents($tmpLogo, file_get_contents(__DIR__.'/../../../../tests/data/data.zip'));
 		$this->request
 			->expects($this->once())
 			->method('getParam')
@@ -465,7 +465,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -518,7 +518,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -555,7 +555,7 @@ 
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($str) {
+			->willReturnCallback(function($str) {
 				return $str;
 			});
 
@@ -599,8 +599,8 @@ 
 
 	public static function dataUndoDelete(): array {
 		return [
-			[ 'backgroundMime', 'background' ],
-			[ 'logoMime', 'logo' ]
+			['backgroundMime', 'background'],
+			['logoMime', 'logo']
 		];
 	}
 

apps/theming/tests/Controller/IconControllerTest.php

Indentation +158 added lines, -158 removed lines

@@ -24,162 +24,162 @@
 use Test\TestCase;
 
 class IconControllerTest extends TestCase {
-	private IRequest&MockObject $request;
-	private ThemingDefaults&MockObject $themingDefaults;
-	private ITimeFactory&MockObject $timeFactory;
-	private IconBuilder&MockObject $iconBuilder;
-	private FileAccessHelper&MockObject $fileAccessHelper;
-	private IAppManager&MockObject $appManager;
-	private ImageManager&MockObject $imageManager;
-	private IconController $iconController;
-
-	protected function setUp(): void {
-		$this->request = $this->createMock(IRequest::class);
-		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
-		$this->iconBuilder = $this->createMock(IconBuilder::class);
-		$this->imageManager = $this->createMock(ImageManager::class);
-		$this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->timeFactory->expects($this->any())
-			->method('getTime')
-			->willReturn(123);
-
-		$this->overwriteService(ITimeFactory::class, $this->timeFactory);
-
-		$this->iconController = new IconController(
-			'theming',
-			$this->request,
-			$this->themingDefaults,
-			$this->iconBuilder,
-			$this->imageManager,
-			$this->fileAccessHelper,
-			$this->appManager,
-		);
-
-		parent::setUp();
-	}
-
-	private function iconFileMock($filename, $data) {
-		$icon = $this->getMockBuilder('OCP\Files\File')->getMock();
-		$icon->expects($this->any())->method('getContent')->willReturn($data);
-		$icon->expects($this->any())->method('getMimeType')->willReturn('image type');
-		$icon->expects($this->any())->method('getEtag')->willReturn('my etag');
-		$icon->expects($this->any())->method('getName')->willReturn('my name');
-		$icon->expects($this->any())->method('getMTime')->willReturn(42);
-		$icon->method('getName')->willReturn($filename);
-		return new SimpleFile($icon);
-	}
-
-	public function testGetThemedIcon(): void {
-		$file = $this->iconFileMock('icon-core-filetypes_folder.svg', 'filecontent');
-		$this->imageManager->expects($this->once())
-			->method('getCachedImage')
-			->with('icon-core-filetypes_folder.svg')
-			->willReturn($file);
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
-		$expected->cacheFor(86400, false, true);
-		$this->assertEquals($expected, $this->iconController->getThemedIcon('core', 'filetypes/folder.svg'));
-	}
-
-	public function testGetFaviconDefault(): void {
-		if (!extension_loaded('imagick')) {
-			$this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
-		}
-		$checkImagick = new \Imagick();
-		if (count($checkImagick->queryFormats('SVG')) < 1) {
-			$this->markTestSkipped('No SVG provider present.');
-		}
-		$file = $this->iconFileMock('filename', 'filecontent');
-		$this->imageManager->expects($this->once())
-			->method('getImage', false)
-			->with('favicon')
-			->willThrowException(new NotFoundException());
-		$this->imageManager->expects($this->any())
-			->method('shouldReplaceIcons')
-			->willReturn(true);
-		$this->imageManager->expects($this->once())
-			->method('getCachedImage')
-			->willThrowException(new NotFoundException());
-		$this->iconBuilder->expects($this->once())
-			->method('getFavicon')
-			->with('core')
-			->willReturn('filecontent');
-		$this->imageManager->expects($this->once())
-			->method('setCachedImage')
-			->willReturn($file);
-
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-		$expected->cacheFor(86400);
-		$this->assertEquals($expected, $this->iconController->getFavicon());
-	}
-
-	public function testGetFaviconFail(): void {
-		$this->imageManager->expects($this->once())
-			->method('getImage')
-			->with('favicon', false)
-			->willThrowException(new NotFoundException());
-		$this->imageManager->expects($this->any())
-			->method('shouldReplaceIcons')
-			->willReturn(false);
-		$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
-		$this->fileAccessHelper->expects($this->once())
-			->method('file_get_contents')
-			->with($fallbackLogo)
-			->willReturn(file_get_contents($fallbackLogo));
-		$expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-		$expected->cacheFor(86400);
-		$this->assertEquals($expected, $this->iconController->getFavicon());
-	}
-
-	public function testGetTouchIconDefault(): void {
-		if (!extension_loaded('imagick')) {
-			$this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
-		}
-		$checkImagick = new \Imagick();
-		if (count($checkImagick->queryFormats('SVG')) < 1) {
-			$this->markTestSkipped('No SVG provider present.');
-		}
-
-		$this->imageManager->expects($this->once())
-			->method('getImage')
-			->willThrowException(new NotFoundException());
-		$this->imageManager->expects($this->any())
-			->method('shouldReplaceIcons')
-			->willReturn(true);
-		$this->iconBuilder->expects($this->once())
-			->method('getTouchIcon')
-			->with('core')
-			->willReturn('filecontent');
-		$file = $this->iconFileMock('filename', 'filecontent');
-		$this->imageManager->expects($this->once())
-			->method('getCachedImage')
-			->willThrowException(new NotFoundException());
-		$this->imageManager->expects($this->once())
-			->method('setCachedImage')
-			->willReturn($file);
-
-		$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-		$expected->cacheFor(86400);
-		$this->assertEquals($expected, $this->iconController->getTouchIcon());
-	}
-
-	public function testGetTouchIconFail(): void {
-		$this->imageManager->expects($this->once())
-			->method('getImage')
-			->with('favicon')
-			->willThrowException(new NotFoundException());
-		$this->imageManager->expects($this->any())
-			->method('shouldReplaceIcons')
-			->willReturn(false);
-		$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
-		$this->fileAccessHelper->expects($this->once())
-			->method('file_get_contents')
-			->with($fallbackLogo)
-			->willReturn(file_get_contents($fallbackLogo));
-		$expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
-		$expected->cacheFor(86400);
-		$this->assertEquals($expected, $this->iconController->getTouchIcon());
-	}
+    private IRequest&MockObject $request;
+    private ThemingDefaults&MockObject $themingDefaults;
+    private ITimeFactory&MockObject $timeFactory;
+    private IconBuilder&MockObject $iconBuilder;
+    private FileAccessHelper&MockObject $fileAccessHelper;
+    private IAppManager&MockObject $appManager;
+    private ImageManager&MockObject $imageManager;
+    private IconController $iconController;
+
+    protected function setUp(): void {
+        $this->request = $this->createMock(IRequest::class);
+        $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+        $this->iconBuilder = $this->createMock(IconBuilder::class);
+        $this->imageManager = $this->createMock(ImageManager::class);
+        $this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->timeFactory->expects($this->any())
+            ->method('getTime')
+            ->willReturn(123);
+
+        $this->overwriteService(ITimeFactory::class, $this->timeFactory);
+
+        $this->iconController = new IconController(
+            'theming',
+            $this->request,
+            $this->themingDefaults,
+            $this->iconBuilder,
+            $this->imageManager,
+            $this->fileAccessHelper,
+            $this->appManager,
+        );
+
+        parent::setUp();
+    }
+
+    private function iconFileMock($filename, $data) {
+        $icon = $this->getMockBuilder('OCP\Files\File')->getMock();
+        $icon->expects($this->any())->method('getContent')->willReturn($data);
+        $icon->expects($this->any())->method('getMimeType')->willReturn('image type');
+        $icon->expects($this->any())->method('getEtag')->willReturn('my etag');
+        $icon->expects($this->any())->method('getName')->willReturn('my name');
+        $icon->expects($this->any())->method('getMTime')->willReturn(42);
+        $icon->method('getName')->willReturn($filename);
+        return new SimpleFile($icon);
+    }
+
+    public function testGetThemedIcon(): void {
+        $file = $this->iconFileMock('icon-core-filetypes_folder.svg', 'filecontent');
+        $this->imageManager->expects($this->once())
+            ->method('getCachedImage')
+            ->with('icon-core-filetypes_folder.svg')
+            ->willReturn($file);
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
+        $expected->cacheFor(86400, false, true);
+        $this->assertEquals($expected, $this->iconController->getThemedIcon('core', 'filetypes/folder.svg'));
+    }
+
+    public function testGetFaviconDefault(): void {
+        if (!extension_loaded('imagick')) {
+            $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+        }
+        $checkImagick = new \Imagick();
+        if (count($checkImagick->queryFormats('SVG')) < 1) {
+            $this->markTestSkipped('No SVG provider present.');
+        }
+        $file = $this->iconFileMock('filename', 'filecontent');
+        $this->imageManager->expects($this->once())
+            ->method('getImage', false)
+            ->with('favicon')
+            ->willThrowException(new NotFoundException());
+        $this->imageManager->expects($this->any())
+            ->method('shouldReplaceIcons')
+            ->willReturn(true);
+        $this->imageManager->expects($this->once())
+            ->method('getCachedImage')
+            ->willThrowException(new NotFoundException());
+        $this->iconBuilder->expects($this->once())
+            ->method('getFavicon')
+            ->with('core')
+            ->willReturn('filecontent');
+        $this->imageManager->expects($this->once())
+            ->method('setCachedImage')
+            ->willReturn($file);
+
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+        $expected->cacheFor(86400);
+        $this->assertEquals($expected, $this->iconController->getFavicon());
+    }
+
+    public function testGetFaviconFail(): void {
+        $this->imageManager->expects($this->once())
+            ->method('getImage')
+            ->with('favicon', false)
+            ->willThrowException(new NotFoundException());
+        $this->imageManager->expects($this->any())
+            ->method('shouldReplaceIcons')
+            ->willReturn(false);
+        $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
+        $this->fileAccessHelper->expects($this->once())
+            ->method('file_get_contents')
+            ->with($fallbackLogo)
+            ->willReturn(file_get_contents($fallbackLogo));
+        $expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+        $expected->cacheFor(86400);
+        $this->assertEquals($expected, $this->iconController->getFavicon());
+    }
+
+    public function testGetTouchIconDefault(): void {
+        if (!extension_loaded('imagick')) {
+            $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+        }
+        $checkImagick = new \Imagick();
+        if (count($checkImagick->queryFormats('SVG')) < 1) {
+            $this->markTestSkipped('No SVG provider present.');
+        }
+
+        $this->imageManager->expects($this->once())
+            ->method('getImage')
+            ->willThrowException(new NotFoundException());
+        $this->imageManager->expects($this->any())
+            ->method('shouldReplaceIcons')
+            ->willReturn(true);
+        $this->iconBuilder->expects($this->once())
+            ->method('getTouchIcon')
+            ->with('core')
+            ->willReturn('filecontent');
+        $file = $this->iconFileMock('filename', 'filecontent');
+        $this->imageManager->expects($this->once())
+            ->method('getCachedImage')
+            ->willThrowException(new NotFoundException());
+        $this->imageManager->expects($this->once())
+            ->method('setCachedImage')
+            ->willReturn($file);
+
+        $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+        $expected->cacheFor(86400);
+        $this->assertEquals($expected, $this->iconController->getTouchIcon());
+    }
+
+    public function testGetTouchIconFail(): void {
+        $this->imageManager->expects($this->once())
+            ->method('getImage')
+            ->with('favicon')
+            ->willThrowException(new NotFoundException());
+        $this->imageManager->expects($this->any())
+            ->method('shouldReplaceIcons')
+            ->willReturn(false);
+        $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
+        $this->fileAccessHelper->expects($this->once())
+            ->method('file_get_contents')
+            ->with($fallbackLogo)
+            ->willReturn(file_get_contents($fallbackLogo));
+        $expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
+        $expected->cacheFor(86400);
+        $this->assertEquals($expected, $this->iconController->getTouchIcon());
+    }
 }

apps/theming/tests/Settings/PersonalTest.php

Indentation +200 added lines, -200 removed lines

@@ -33,204 +33,204 @@
 use Test\TestCase;
 
 class PersonalTest extends TestCase {
-	private IConfig&MockObject $config;
-	private ThemesService&MockObject $themesService;
-	private IInitialState&MockObject $initialStateService;
-	private ThemingDefaults&MockObject $themingDefaults;
-	private INavigationManager&MockObject $navigationManager;
-	private Personal $admin;
-
-	/** @var ITheme[] */
-	private array $themes;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->config = $this->createMock(IConfig::class);
-		$this->themesService = $this->createMock(ThemesService::class);
-		$this->initialStateService = $this->createMock(IInitialState::class);
-		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
-		$this->navigationManager = $this->createMock(INavigationManager::class);
-
-		$this->initThemes();
-
-		$this->themesService
-			->expects($this->any())
-			->method('getThemes')
-			->willReturn($this->themes);
-
-		$this->admin = new Personal(
-			Application::APP_ID,
-			'admin',
-			$this->config,
-			$this->themesService,
-			$this->initialStateService,
-			$this->themingDefaults,
-			$this->navigationManager,
-		);
-	}
-
-	public function dataTestGetForm(): array {
-		return [
-			['', [
-				$this->formatThemeForm('default'),
-				$this->formatThemeForm('light'),
-				$this->formatThemeForm('dark'),
-				$this->formatThemeForm('light-highcontrast'),
-				$this->formatThemeForm('dark-highcontrast'),
-				$this->formatThemeForm('opendyslexic'),
-			]],
-			['dark', [
-				$this->formatThemeForm('dark'),
-				$this->formatThemeForm('opendyslexic'),
-			]],
-		];
-	}
-
-	/**
-	 * @param string[] $enabledThemes
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetForm')]
-	public function testGetForm(string $enforcedTheme, array $themesState): void {
-		$this->config->expects($this->once())
-			->method('getSystemValueString')
-			->with('enforce_theme', '')
-			->willReturn($enforcedTheme);
-
-		$this->config->expects($this->any())
-			->method('getUserValue')
-			->willReturnMap([
-				['admin', 'core', 'apporder', '[]', '[]'],
-				['admin', 'theming', 'background_image', BackgroundService::BACKGROUND_DEFAULT],
-			]);
-
-		$this->navigationManager->expects($this->once())
-			->method('getDefaultEntryIdForUser')
-			->willReturn('forced_id');
-
-		$this->initialStateService->expects($this->exactly(8))
-			->method('provideInitialState')
-			->willReturnMap([
-				['shippedBackgrounds', BackgroundService::SHIPPED_BACKGROUNDS],
-				['themingDefaults'],
-				['enableBlurFilter', ''],
-				['userBackgroundImage'],
-				['themes', $themesState],
-				['enforceTheme', $enforcedTheme],
-				['isUserThemingDisabled', false],
-				['navigationBar', ['userAppOrder' => [], 'enforcedDefaultApp' => 'forced_id']],
-			]);
-
-		$expected = new TemplateResponse('theming', 'settings-personal');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetSection(): void {
-		$this->assertSame('theming', $this->admin->getSection());
-	}
-
-	public function testGetPriority(): void {
-		$this->assertSame(40, $this->admin->getPriority());
-	}
-
-	private function initThemes() {
-		$util = $this->createMock(Util::class);
-		$themingDefaults = $this->createMock(ThemingDefaults::class);
-		$userSession = $this->createMock(IUserSession::class);
-		$urlGenerator = $this->createMock(IURLGenerator::class);
-		$imageManager = $this->createMock(ImageManager::class);
-		$config = $this->createMock(IConfig::class);
-		$l10n = $this->createMock(IL10N::class);
-		$appManager = $this->createMock(IAppManager::class);
-
-		$themingDefaults->expects($this->any())
-			->method('getColorPrimary')
-			->willReturn('#0082c9');
-
-		$themingDefaults->expects($this->any())
-			->method('getDefaultColorPrimary')
-			->willReturn('#0082c9');
-
-		$this->themes = [
-			'default' => new DefaultTheme(
-				$util,
-				$themingDefaults,
-				$userSession,
-				$urlGenerator,
-				$imageManager,
-				$config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'light' => new LightTheme(
-				$util,
-				$themingDefaults,
-				$userSession,
-				$urlGenerator,
-				$imageManager,
-				$config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'dark' => new DarkTheme(
-				$util,
-				$themingDefaults,
-				$userSession,
-				$urlGenerator,
-				$imageManager,
-				$config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'light-highcontrast' => new HighContrastTheme(
-				$util,
-				$themingDefaults,
-				$userSession,
-				$urlGenerator,
-				$imageManager,
-				$config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'dark-highcontrast' => new DarkHighContrastTheme(
-				$util,
-				$themingDefaults,
-				$userSession,
-				$urlGenerator,
-				$imageManager,
-				$config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'opendyslexic' => new DyslexiaFont(
-				$util,
-				$themingDefaults,
-				$userSession,
-				$urlGenerator,
-				$imageManager,
-				$config,
-				$l10n,
-				$appManager,
-				null,
-			),
-		];
-	}
-
-	private function formatThemeForm(string $themeId): array {
-		$this->initThemes();
-
-		$theme = $this->themes[$themeId];
-		return [
-			'id' => $theme->getId(),
-			'type' => $theme->getType(),
-			'title' => $theme->getTitle(),
-			'enableLabel' => $theme->getEnableLabel(),
-			'description' => $theme->getDescription(),
-			'enabled' => false,
-		];
-	}
+    private IConfig&MockObject $config;
+    private ThemesService&MockObject $themesService;
+    private IInitialState&MockObject $initialStateService;
+    private ThemingDefaults&MockObject $themingDefaults;
+    private INavigationManager&MockObject $navigationManager;
+    private Personal $admin;
+
+    /** @var ITheme[] */
+    private array $themes;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->config = $this->createMock(IConfig::class);
+        $this->themesService = $this->createMock(ThemesService::class);
+        $this->initialStateService = $this->createMock(IInitialState::class);
+        $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+        $this->navigationManager = $this->createMock(INavigationManager::class);
+
+        $this->initThemes();
+
+        $this->themesService
+            ->expects($this->any())
+            ->method('getThemes')
+            ->willReturn($this->themes);
+
+        $this->admin = new Personal(
+            Application::APP_ID,
+            'admin',
+            $this->config,
+            $this->themesService,
+            $this->initialStateService,
+            $this->themingDefaults,
+            $this->navigationManager,
+        );
+    }
+
+    public function dataTestGetForm(): array {
+        return [
+            ['', [
+                $this->formatThemeForm('default'),
+                $this->formatThemeForm('light'),
+                $this->formatThemeForm('dark'),
+                $this->formatThemeForm('light-highcontrast'),
+                $this->formatThemeForm('dark-highcontrast'),
+                $this->formatThemeForm('opendyslexic'),
+            ]],
+            ['dark', [
+                $this->formatThemeForm('dark'),
+                $this->formatThemeForm('opendyslexic'),
+            ]],
+        ];
+    }
+
+    /**
+     * @param string[] $enabledThemes
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetForm')]
+    public function testGetForm(string $enforcedTheme, array $themesState): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValueString')
+            ->with('enforce_theme', '')
+            ->willReturn($enforcedTheme);
+
+        $this->config->expects($this->any())
+            ->method('getUserValue')
+            ->willReturnMap([
+                ['admin', 'core', 'apporder', '[]', '[]'],
+                ['admin', 'theming', 'background_image', BackgroundService::BACKGROUND_DEFAULT],
+            ]);
+
+        $this->navigationManager->expects($this->once())
+            ->method('getDefaultEntryIdForUser')
+            ->willReturn('forced_id');
+
+        $this->initialStateService->expects($this->exactly(8))
+            ->method('provideInitialState')
+            ->willReturnMap([
+                ['shippedBackgrounds', BackgroundService::SHIPPED_BACKGROUNDS],
+                ['themingDefaults'],
+                ['enableBlurFilter', ''],
+                ['userBackgroundImage'],
+                ['themes', $themesState],
+                ['enforceTheme', $enforcedTheme],
+                ['isUserThemingDisabled', false],
+                ['navigationBar', ['userAppOrder' => [], 'enforcedDefaultApp' => 'forced_id']],
+            ]);
+
+        $expected = new TemplateResponse('theming', 'settings-personal');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetSection(): void {
+        $this->assertSame('theming', $this->admin->getSection());
+    }
+
+    public function testGetPriority(): void {
+        $this->assertSame(40, $this->admin->getPriority());
+    }
+
+    private function initThemes() {
+        $util = $this->createMock(Util::class);
+        $themingDefaults = $this->createMock(ThemingDefaults::class);
+        $userSession = $this->createMock(IUserSession::class);
+        $urlGenerator = $this->createMock(IURLGenerator::class);
+        $imageManager = $this->createMock(ImageManager::class);
+        $config = $this->createMock(IConfig::class);
+        $l10n = $this->createMock(IL10N::class);
+        $appManager = $this->createMock(IAppManager::class);
+
+        $themingDefaults->expects($this->any())
+            ->method('getColorPrimary')
+            ->willReturn('#0082c9');
+
+        $themingDefaults->expects($this->any())
+            ->method('getDefaultColorPrimary')
+            ->willReturn('#0082c9');
+
+        $this->themes = [
+            'default' => new DefaultTheme(
+                $util,
+                $themingDefaults,
+                $userSession,
+                $urlGenerator,
+                $imageManager,
+                $config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'light' => new LightTheme(
+                $util,
+                $themingDefaults,
+                $userSession,
+                $urlGenerator,
+                $imageManager,
+                $config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'dark' => new DarkTheme(
+                $util,
+                $themingDefaults,
+                $userSession,
+                $urlGenerator,
+                $imageManager,
+                $config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'light-highcontrast' => new HighContrastTheme(
+                $util,
+                $themingDefaults,
+                $userSession,
+                $urlGenerator,
+                $imageManager,
+                $config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'dark-highcontrast' => new DarkHighContrastTheme(
+                $util,
+                $themingDefaults,
+                $userSession,
+                $urlGenerator,
+                $imageManager,
+                $config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'opendyslexic' => new DyslexiaFont(
+                $util,
+                $themingDefaults,
+                $userSession,
+                $urlGenerator,
+                $imageManager,
+                $config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+        ];
+    }
+
+    private function formatThemeForm(string $themeId): array {
+        $this->initThemes();
+
+        $theme = $this->themes[$themeId];
+        return [
+            'id' => $theme->getId(),
+            'type' => $theme->getType(),
+            'title' => $theme->getTitle(),
+            'enableLabel' => $theme->getEnableLabel(),
+            'description' => $theme->getDescription(),
+            'enabled' => false,
+        ];
+    }
 }

apps/theming/tests/ImageManagerTest.php

Indentation +358 added lines, -358 removed lines

@@ -22,362 +22,362 @@
 use Test\TestCase;
 
 class ImageManagerTest extends TestCase {
-	protected IConfig&MockObject $config;
-	protected IAppData&MockObject $appData;
-	private IURLGenerator&MockObject $urlGenerator;
-	private ICacheFactory&MockObject $cacheFactory;
-	private LoggerInterface&MockObject $logger;
-	private ITempManager&MockObject $tempManager;
-	private ISimpleFolder&MockObject $rootFolder;
-	protected ImageManager $imageManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->config = $this->createMock(IConfig::class);
-		$this->appData = $this->createMock(IAppData::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->tempManager = $this->createMock(ITempManager::class);
-		$this->rootFolder = $this->createMock(ISimpleFolder::class);
-		$backgroundService = $this->createMock(BackgroundService::class);
-		$this->imageManager = new ImageManager(
-			$this->config,
-			$this->appData,
-			$this->urlGenerator,
-			$this->cacheFactory,
-			$this->logger,
-			$this->tempManager,
-			$backgroundService,
-		);
-		$this->appData
-			->expects($this->any())
-			->method('getFolder')
-			->with('global')
-			->willReturn($this->rootFolder);
-	}
-
-	private function checkImagick() {
-		if (!extension_loaded('imagick')) {
-			$this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
-		}
-		$checkImagick = new \Imagick();
-		if (empty($checkImagick->queryFormats('SVG'))) {
-			$this->markTestSkipped('No SVG provider present.');
-		}
-		if (empty($checkImagick->queryFormats('PNG'))) {
-			$this->markTestSkipped('No PNG provider present.');
-		}
-	}
-
-	public function mockGetImage($key, $file) {
-		/** @var MockObject $folder */
-		$folder = $this->createMock(ISimpleFolder::class);
-		if ($file === null) {
-			$folder->expects($this->once())
-				->method('getFile')
-				->with('logo')
-				->willThrowException(new NotFoundException());
-		} else {
-			$file->expects($this->once())
-				->method('getContent')
-				->willReturn(file_get_contents(__DIR__ . '/../../../tests/data/testimage.png'));
-			$folder->expects($this->exactly(2))
-				->method('fileExists')
-				->willReturnMap([
-					['logo', true],
-					['logo.png', false],
-				]);
-			$folder->expects($this->once())
-				->method('getFile')
-				->with('logo')
-				->willReturn($file);
-			$newFile = $this->createMock(ISimpleFile::class);
-			$folder->expects($this->once())
-				->method('newFile')
-				->with('logo.png')
-				->willReturn($newFile);
-			$newFile->expects($this->once())
-				->method('putContent');
-			$this->rootFolder->expects($this->once())
-				->method('getFolder')
-				->with('images')
-				->willReturn($folder);
-		}
-	}
-
-	public function testGetImageUrl(): void {
-		$this->checkImagick();
-		$this->config->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '0'],
-				['theming', 'logoMime', '', '0'],
-			]);
-		$this->urlGenerator->expects($this->once())
-			->method('linkToRoute')
-			->willReturn('url-to-image');
-		$this->assertEquals('url-to-image?v=0', $this->imageManager->getImageUrl('logo', false));
-	}
-
-	public function testGetImageUrlDefault(): void {
-		$this->config->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '0'],
-				['theming', 'logoMime', '', ''],
-			]);
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->with('core', 'logo/logo.png')
-			->willReturn('logo/logo.png');
-		$this->assertEquals('logo/logo.png?v=0', $this->imageManager->getImageUrl('logo'));
-	}
-
-	public function testGetImageUrlAbsolute(): void {
-		$this->checkImagick();
-		$this->config->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '0'],
-				['theming', 'logoMime', '', ''],
-			]);
-		$this->urlGenerator->expects($this->any())
-			->method('getAbsoluteUrl')
-			->willReturn('url-to-image-absolute?v=0');
-		$this->assertEquals('url-to-image-absolute?v=0', $this->imageManager->getImageUrlAbsolute('logo', false));
-	}
-
-	public function testGetImage(): void {
-		$this->checkImagick();
-		$this->config->expects($this->once())
-			->method('getAppValue')->with('theming', 'logoMime', false)
-			->willReturn('png');
-		$file = $this->createMock(ISimpleFile::class);
-		$this->mockGetImage('logo', $file);
-		$this->assertEquals($file, $this->imageManager->getImage('logo', false));
-	}
-
-
-	public function testGetImageUnset(): void {
-		$this->expectException(NotFoundException::class);
-
-		$this->config->expects($this->once())
-			->method('getAppValue')->with('theming', 'logoMime', false)
-			->willReturn(false);
-		$this->imageManager->getImage('logo');
-	}
-
-	public function testGetCacheFolder(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('0');
-		$this->rootFolder->expects($this->once())
-			->method('getFolder')
-			->with('0')
-			->willReturn($folder);
-		$this->assertEquals($folder, $this->imageManager->getCacheFolder());
-	}
-	public function testGetCacheFolderCreate(): void {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->config->expects($this->exactly(2))
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('0');
-		$this->rootFolder->expects($this->exactly(2))
-			->method('getFolder')
-			->with('0')
-			->willReturnOnConsecutiveCalls(
-				$this->throwException(new NotFoundException()),
-				$folder,
-			);
-		$this->rootFolder->expects($this->once())
-			->method('newFolder')
-			->with('0')
-			->willReturn($folder);
-		$this->rootFolder->expects($this->once())
-			->method('getDirectoryListing')
-			->willReturn([]);
-		$this->assertEquals($folder, $this->imageManager->getCacheFolder());
-	}
-
-	public function testGetCachedImage(): void {
-		$expected = $this->createMock(ISimpleFile::class);
-		$folder = $this->setupCacheFolder();
-		$folder->expects($this->once())
-			->method('getFile')
-			->with('filename')
-			->willReturn($expected);
-		$this->assertEquals($expected, $this->imageManager->getCachedImage('filename'));
-	}
-
-
-	public function testGetCachedImageNotFound(): void {
-		$this->expectException(NotFoundException::class);
-
-		$folder = $this->setupCacheFolder();
-		$folder->expects($this->once())
-			->method('getFile')
-			->with('filename')
-			->willThrowException(new NotFoundException());
-		$image = $this->imageManager->getCachedImage('filename');
-	}
-
-	public function testSetCachedImage(): void {
-		$folder = $this->setupCacheFolder();
-		$file = $this->createMock(ISimpleFile::class);
-		$folder->expects($this->once())
-			->method('fileExists')
-			->with('filename')
-			->willReturn(true);
-		$folder->expects($this->once())
-			->method('getFile')
-			->with('filename')
-			->willReturn($file);
-		$file->expects($this->once())
-			->method('putContent')
-			->with('filecontent');
-		$this->assertEquals($file, $this->imageManager->setCachedImage('filename', 'filecontent'));
-	}
-
-	public function testSetCachedImageCreate(): void {
-		$folder = $this->setupCacheFolder();
-		$file = $this->createMock(ISimpleFile::class);
-		$folder->expects($this->once())
-			->method('fileExists')
-			->with('filename')
-			->willReturn(false);
-		$folder->expects($this->once())
-			->method('newFile')
-			->with('filename')
-			->willReturn($file);
-		$file->expects($this->once())
-			->method('putContent')
-			->with('filecontent');
-		$this->assertEquals($file, $this->imageManager->setCachedImage('filename', 'filecontent'));
-	}
-
-	private function setupCacheFolder() {
-		$folder = $this->createMock(ISimpleFolder::class);
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('0');
-		$this->rootFolder->expects($this->once())
-			->method('getFolder')
-			->with('0')
-			->willReturn($folder);
-		return $folder;
-	}
-
-	public function testCleanup(): void {
-		$folders = [
-			$this->createMock(ISimpleFolder::class),
-			$this->createMock(ISimpleFolder::class),
-			$this->createMock(ISimpleFolder::class)
-		];
-		foreach ($folders as $index => $folder) {
-			$folder->expects($this->any())
-				->method('getName')
-				->willReturn("$index");
-		}
-		$folders[0]->expects($this->once())->method('delete');
-		$folders[1]->expects($this->once())->method('delete');
-		$folders[2]->expects($this->never())->method('delete');
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('2');
-		$this->rootFolder->expects($this->once())
-			->method('getDirectoryListing')
-			->willReturn($folders);
-		$this->rootFolder->expects($this->once())
-			->method('getFolder')
-			->with('2')
-			->willReturn($folders[2]);
-		$this->imageManager->cleanup();
-	}
-
-
-	public static function dataUpdateImage(): array {
-		return [
-			['background', __DIR__ . '/../../../tests/data/testimage.png', true, false],
-			['background', __DIR__ . '/../../../tests/data/testimage.png', false, false],
-			['background', __DIR__ . '/../../../tests/data/testimage.jpg', true, false],
-			['background', __DIR__ . '/../../../tests/data/testimage.webp', true, false],
-			['background', __DIR__ . '/../../../tests/data/testimage-large.jpg', true, true],
-			['background', __DIR__ . '/../../../tests/data/testimage-wide.png', true, true],
-			['logo', __DIR__ . '/../../../tests/data/testimagelarge.svg', true, false],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateImage')]
-	public function testUpdateImage(string $key, string $tmpFile, bool $folderExists, bool $shouldConvert): void {
-		$file = $this->createMock(ISimpleFile::class);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$oldFile = $this->createMock(ISimpleFile::class);
-		$folder->expects($this->any())
-			->method('getFile')
-			->willReturn($oldFile);
-
-		if ($folderExists) {
-			$this->rootFolder
-				->expects($this->any())
-				->method('getFolder')
-				->with('images')
-				->willReturn($folder);
-		} else {
-			$this->rootFolder
-				->expects($this->any())
-				->method('getFolder')
-				->with('images')
-				->willThrowException(new NotFoundException());
-			$this->rootFolder
-				->expects($this->any())
-				->method('newFolder')
-				->with('images')
-				->willReturn($folder);
-		}
-
-		$folder->expects($this->once())
-			->method('newFile')
-			->with($key)
-			->willReturn($file);
-
-		if ($shouldConvert) {
-			$this->tempManager->expects($this->once())
-				->method('getTemporaryFile')
-				->willReturn('/tmp/randomtempfile-theming');
-		}
-
-		$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');
-	}
+    protected IConfig&MockObject $config;
+    protected IAppData&MockObject $appData;
+    private IURLGenerator&MockObject $urlGenerator;
+    private ICacheFactory&MockObject $cacheFactory;
+    private LoggerInterface&MockObject $logger;
+    private ITempManager&MockObject $tempManager;
+    private ISimpleFolder&MockObject $rootFolder;
+    protected ImageManager $imageManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->config = $this->createMock(IConfig::class);
+        $this->appData = $this->createMock(IAppData::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->tempManager = $this->createMock(ITempManager::class);
+        $this->rootFolder = $this->createMock(ISimpleFolder::class);
+        $backgroundService = $this->createMock(BackgroundService::class);
+        $this->imageManager = new ImageManager(
+            $this->config,
+            $this->appData,
+            $this->urlGenerator,
+            $this->cacheFactory,
+            $this->logger,
+            $this->tempManager,
+            $backgroundService,
+        );
+        $this->appData
+            ->expects($this->any())
+            ->method('getFolder')
+            ->with('global')
+            ->willReturn($this->rootFolder);
+    }
+
+    private function checkImagick() {
+        if (!extension_loaded('imagick')) {
+            $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+        }
+        $checkImagick = new \Imagick();
+        if (empty($checkImagick->queryFormats('SVG'))) {
+            $this->markTestSkipped('No SVG provider present.');
+        }
+        if (empty($checkImagick->queryFormats('PNG'))) {
+            $this->markTestSkipped('No PNG provider present.');
+        }
+    }
+
+    public function mockGetImage($key, $file) {
+        /** @var MockObject $folder */
+        $folder = $this->createMock(ISimpleFolder::class);
+        if ($file === null) {
+            $folder->expects($this->once())
+                ->method('getFile')
+                ->with('logo')
+                ->willThrowException(new NotFoundException());
+        } else {
+            $file->expects($this->once())
+                ->method('getContent')
+                ->willReturn(file_get_contents(__DIR__ . '/../../../tests/data/testimage.png'));
+            $folder->expects($this->exactly(2))
+                ->method('fileExists')
+                ->willReturnMap([
+                    ['logo', true],
+                    ['logo.png', false],
+                ]);
+            $folder->expects($this->once())
+                ->method('getFile')
+                ->with('logo')
+                ->willReturn($file);
+            $newFile = $this->createMock(ISimpleFile::class);
+            $folder->expects($this->once())
+                ->method('newFile')
+                ->with('logo.png')
+                ->willReturn($newFile);
+            $newFile->expects($this->once())
+                ->method('putContent');
+            $this->rootFolder->expects($this->once())
+                ->method('getFolder')
+                ->with('images')
+                ->willReturn($folder);
+        }
+    }
+
+    public function testGetImageUrl(): void {
+        $this->checkImagick();
+        $this->config->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '0'],
+                ['theming', 'logoMime', '', '0'],
+            ]);
+        $this->urlGenerator->expects($this->once())
+            ->method('linkToRoute')
+            ->willReturn('url-to-image');
+        $this->assertEquals('url-to-image?v=0', $this->imageManager->getImageUrl('logo', false));
+    }
+
+    public function testGetImageUrlDefault(): void {
+        $this->config->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '0'],
+                ['theming', 'logoMime', '', ''],
+            ]);
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->with('core', 'logo/logo.png')
+            ->willReturn('logo/logo.png');
+        $this->assertEquals('logo/logo.png?v=0', $this->imageManager->getImageUrl('logo'));
+    }
+
+    public function testGetImageUrlAbsolute(): void {
+        $this->checkImagick();
+        $this->config->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '0'],
+                ['theming', 'logoMime', '', ''],
+            ]);
+        $this->urlGenerator->expects($this->any())
+            ->method('getAbsoluteUrl')
+            ->willReturn('url-to-image-absolute?v=0');
+        $this->assertEquals('url-to-image-absolute?v=0', $this->imageManager->getImageUrlAbsolute('logo', false));
+    }
+
+    public function testGetImage(): void {
+        $this->checkImagick();
+        $this->config->expects($this->once())
+            ->method('getAppValue')->with('theming', 'logoMime', false)
+            ->willReturn('png');
+        $file = $this->createMock(ISimpleFile::class);
+        $this->mockGetImage('logo', $file);
+        $this->assertEquals($file, $this->imageManager->getImage('logo', false));
+    }
+
+
+    public function testGetImageUnset(): void {
+        $this->expectException(NotFoundException::class);
+
+        $this->config->expects($this->once())
+            ->method('getAppValue')->with('theming', 'logoMime', false)
+            ->willReturn(false);
+        $this->imageManager->getImage('logo');
+    }
+
+    public function testGetCacheFolder(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('0');
+        $this->rootFolder->expects($this->once())
+            ->method('getFolder')
+            ->with('0')
+            ->willReturn($folder);
+        $this->assertEquals($folder, $this->imageManager->getCacheFolder());
+    }
+    public function testGetCacheFolderCreate(): void {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->config->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('0');
+        $this->rootFolder->expects($this->exactly(2))
+            ->method('getFolder')
+            ->with('0')
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new NotFoundException()),
+                $folder,
+            );
+        $this->rootFolder->expects($this->once())
+            ->method('newFolder')
+            ->with('0')
+            ->willReturn($folder);
+        $this->rootFolder->expects($this->once())
+            ->method('getDirectoryListing')
+            ->willReturn([]);
+        $this->assertEquals($folder, $this->imageManager->getCacheFolder());
+    }
+
+    public function testGetCachedImage(): void {
+        $expected = $this->createMock(ISimpleFile::class);
+        $folder = $this->setupCacheFolder();
+        $folder->expects($this->once())
+            ->method('getFile')
+            ->with('filename')
+            ->willReturn($expected);
+        $this->assertEquals($expected, $this->imageManager->getCachedImage('filename'));
+    }
+
+
+    public function testGetCachedImageNotFound(): void {
+        $this->expectException(NotFoundException::class);
+
+        $folder = $this->setupCacheFolder();
+        $folder->expects($this->once())
+            ->method('getFile')
+            ->with('filename')
+            ->willThrowException(new NotFoundException());
+        $image = $this->imageManager->getCachedImage('filename');
+    }
+
+    public function testSetCachedImage(): void {
+        $folder = $this->setupCacheFolder();
+        $file = $this->createMock(ISimpleFile::class);
+        $folder->expects($this->once())
+            ->method('fileExists')
+            ->with('filename')
+            ->willReturn(true);
+        $folder->expects($this->once())
+            ->method('getFile')
+            ->with('filename')
+            ->willReturn($file);
+        $file->expects($this->once())
+            ->method('putContent')
+            ->with('filecontent');
+        $this->assertEquals($file, $this->imageManager->setCachedImage('filename', 'filecontent'));
+    }
+
+    public function testSetCachedImageCreate(): void {
+        $folder = $this->setupCacheFolder();
+        $file = $this->createMock(ISimpleFile::class);
+        $folder->expects($this->once())
+            ->method('fileExists')
+            ->with('filename')
+            ->willReturn(false);
+        $folder->expects($this->once())
+            ->method('newFile')
+            ->with('filename')
+            ->willReturn($file);
+        $file->expects($this->once())
+            ->method('putContent')
+            ->with('filecontent');
+        $this->assertEquals($file, $this->imageManager->setCachedImage('filename', 'filecontent'));
+    }
+
+    private function setupCacheFolder() {
+        $folder = $this->createMock(ISimpleFolder::class);
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('0');
+        $this->rootFolder->expects($this->once())
+            ->method('getFolder')
+            ->with('0')
+            ->willReturn($folder);
+        return $folder;
+    }
+
+    public function testCleanup(): void {
+        $folders = [
+            $this->createMock(ISimpleFolder::class),
+            $this->createMock(ISimpleFolder::class),
+            $this->createMock(ISimpleFolder::class)
+        ];
+        foreach ($folders as $index => $folder) {
+            $folder->expects($this->any())
+                ->method('getName')
+                ->willReturn("$index");
+        }
+        $folders[0]->expects($this->once())->method('delete');
+        $folders[1]->expects($this->once())->method('delete');
+        $folders[2]->expects($this->never())->method('delete');
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('2');
+        $this->rootFolder->expects($this->once())
+            ->method('getDirectoryListing')
+            ->willReturn($folders);
+        $this->rootFolder->expects($this->once())
+            ->method('getFolder')
+            ->with('2')
+            ->willReturn($folders[2]);
+        $this->imageManager->cleanup();
+    }
+
+
+    public static function dataUpdateImage(): array {
+        return [
+            ['background', __DIR__ . '/../../../tests/data/testimage.png', true, false],
+            ['background', __DIR__ . '/../../../tests/data/testimage.png', false, false],
+            ['background', __DIR__ . '/../../../tests/data/testimage.jpg', true, false],
+            ['background', __DIR__ . '/../../../tests/data/testimage.webp', true, false],
+            ['background', __DIR__ . '/../../../tests/data/testimage-large.jpg', true, true],
+            ['background', __DIR__ . '/../../../tests/data/testimage-wide.png', true, true],
+            ['logo', __DIR__ . '/../../../tests/data/testimagelarge.svg', true, false],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataUpdateImage')]
+    public function testUpdateImage(string $key, string $tmpFile, bool $folderExists, bool $shouldConvert): void {
+        $file = $this->createMock(ISimpleFile::class);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $oldFile = $this->createMock(ISimpleFile::class);
+        $folder->expects($this->any())
+            ->method('getFile')
+            ->willReturn($oldFile);
+
+        if ($folderExists) {
+            $this->rootFolder
+                ->expects($this->any())
+                ->method('getFolder')
+                ->with('images')
+                ->willReturn($folder);
+        } else {
+            $this->rootFolder
+                ->expects($this->any())
+                ->method('getFolder')
+                ->with('images')
+                ->willThrowException(new NotFoundException());
+            $this->rootFolder
+                ->expects($this->any())
+                ->method('newFolder')
+                ->with('images')
+                ->willReturn($folder);
+        }
+
+        $folder->expects($this->once())
+            ->method('newFile')
+            ->with($key)
+            ->willReturn($file);
+
+        if ($shouldConvert) {
+            $this->tempManager->expects($this->once())
+                ->method('getTemporaryFile')
+                ->willReturn('/tmp/randomtempfile-theming');
+        }
+
+        $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');
+    }
 }

apps/theming/tests/Service/ThemesServiceTest.php

Indentation +336 added lines, -336 removed lines

@@ -30,340 +30,340 @@
 use Test\TestCase;
 
 class ThemesServiceTest extends TestCase {
-	private IUserSession&MockObject $userSession;
-	private IConfig&MockObject $config;
-	private LoggerInterface&MockObject $logger;
-
-	private ThemingDefaults&MockObject $themingDefaults;
-	private ThemesService $themesService;
-
-	/** @var ITheme[] */
-	private array $themes;
-
-	protected function setUp(): void {
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
-
-		$this->themingDefaults->expects($this->any())
-			->method('getColorPrimary')
-			->willReturn('#0082c9');
-
-		$this->themingDefaults->expects($this->any())
-			->method('getDefaultColorPrimary')
-			->willReturn('#0082c9');
-
-		$this->initThemes();
-
-		$this->themesService = new ThemesService(
-			$this->userSession,
-			$this->config,
-			$this->logger,
-			...array_values($this->themes)
-		);
-
-		parent::setUp();
-	}
-
-	public function testGetThemes(): void {
-		$expected = [
-			'default',
-			'light',
-			'dark',
-			'light-highcontrast',
-			'dark-highcontrast',
-			'opendyslexic',
-		];
-		$this->assertEquals($expected, array_keys($this->themesService->getThemes()));
-	}
-
-	public function testGetThemesEnforced(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValueString')
-			->with('enforce_theme', '')
-			->willReturn('dark');
-		$this->logger->expects($this->never())
-			->method('error');
-
-		$expected = [
-			'default',
-			'dark',
-		];
-
-		$this->assertEquals($expected, array_keys($this->themesService->getThemes()));
-	}
-
-	public function testGetThemesEnforcedInvalid(): void {
-		$this->config->expects($this->once())
-			->method('getSystemValueString')
-			->with('enforce_theme', '')
-			->willReturn('invalid');
-		$this->logger->expects($this->once())
-			->method('error')
-			->with('Enforced theme not found', ['theme' => 'invalid']);
-
-		$expected = [
-			'default',
-			'light',
-			'dark',
-			'light-highcontrast',
-			'dark-highcontrast',
-			'opendyslexic',
-		];
-
-		$this->assertEquals($expected, array_keys($this->themesService->getThemes()));
-	}
-
-	public static function dataTestEnableTheme(): array {
-		return [
-			['default', ['default'], ['default']],
-			['dark', ['default'], ['dark']],
-			['dark', ['dark'], ['dark']],
-			['opendyslexic', ['dark'], ['dark', 'opendyslexic']],
-			['dark', ['light-highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
-		];
-	}
-
-	/**
-	 *
-	 * @param string[] $enabledThemes
-	 * @param string[] $expectedEnabled
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestEnableTheme')]
-	public function testEnableTheme(string $toEnable, array $enabledThemes, array $expectedEnabled): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
-			->willReturn(json_encode($enabledThemes));
-
-		$this->assertEquals($expectedEnabled, $this->themesService->enableTheme($this->themes[$toEnable]));
-	}
-
-
-	public static function dataTestDisableTheme(): array {
-		return [
-			['dark', ['default'], ['default']],
-			['dark', ['dark'], []],
-			['opendyslexic', ['dark', 'opendyslexic'], ['dark'], ],
-			['light-highcontrast', ['opendyslexic'], ['opendyslexic']],
-		];
-	}
-
-	/**
-	 *
-	 * @param string[] $enabledThemes
-	 * @param string[] $expectedEnabled
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestDisableTheme')]
-	public function testDisableTheme(string $toDisable, array $enabledThemes, array $expectedEnabled): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
-			->willReturn(json_encode($enabledThemes));
-
-
-		$this->assertEquals($expectedEnabled, $this->themesService->disableTheme($this->themes[$toDisable]));
-	}
-
-
-	public static function dataTestIsEnabled(): array {
-		return [
-			['dark', [], false],
-			['dark', ['dark'], true],
-			['opendyslexic', ['dark', 'opendyslexic'], true],
-			['light-highcontrast', ['opendyslexic'], false],
-		];
-	}
-
-	/**
-	 * @param string[] $enabledThemes
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsEnabled')]
-	public function testIsEnabled(string $themeId, array $enabledThemes, bool $expected): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
-			->willReturn(json_encode($enabledThemes));
-
-
-		$this->assertEquals($expected, $this->themesService->isEnabled($this->themes[$themeId]));
-	}
-
-	public function testGetEnabledThemes(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
-			->willReturn(json_encode(['default']));
-		$this->config->expects($this->once())
-			->method('getSystemValueString')
-			->with('enforce_theme', '')
-			->willReturn('');
-
-		$this->assertEquals(['default'], $this->themesService->getEnabledThemes());
-	}
-
-	public function testGetEnabledThemesEnforced(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
-			->willReturn(json_encode([]));
-		$this->config->expects($this->once())
-			->method('getSystemValueString')
-			->with('enforce_theme', '')
-			->willReturn('light');
-
-		$this->assertEquals(['light'], $this->themesService->getEnabledThemes());
-	}
-
-
-	public static function dataTestSetEnabledThemes(): array {
-		return [
-			[[], []],
-			[['light'], ['light']],
-			[['dark'], ['dark']],
-			[['dark', 'dark', 'opendyslexic'], ['dark', 'opendyslexic']],
-		];
-	}
-
-	/**
-	 *
-	 * @param string[] $enabledThemes
-	 * @param string[] $expected
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetEnabledThemes')]
-	public function testSetEnabledThemes(array $enabledThemes, array $expected): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with('user', Application::APP_ID, 'enabled-themes', json_encode($expected));
-
-		$this->invokePrivate($this->themesService, 'setEnabledThemes', [$enabledThemes]);
-	}
-
-	private function initThemes() {
-		$util = $this->createMock(Util::class);
-		$urlGenerator = $this->createMock(IURLGenerator::class);
-		$imageManager = $this->createMock(ImageManager::class);
-		$l10n = $this->createMock(IL10N::class);
-		$appManager = $this->createMock(IAppManager::class);
-
-		$this->themes = [
-			'default' => new DefaultTheme(
-				$util,
-				$this->themingDefaults,
-				$this->userSession,
-				$urlGenerator,
-				$imageManager,
-				$this->config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'light' => new LightTheme(
-				$util,
-				$this->themingDefaults,
-				$this->userSession,
-				$urlGenerator,
-				$imageManager,
-				$this->config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'dark' => new DarkTheme(
-				$util,
-				$this->themingDefaults,
-				$this->userSession,
-				$urlGenerator,
-				$imageManager,
-				$this->config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'light-highcontrast' => new HighContrastTheme(
-				$util,
-				$this->themingDefaults,
-				$this->userSession,
-				$urlGenerator,
-				$imageManager,
-				$this->config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'dark-highcontrast' => new DarkHighContrastTheme(
-				$util,
-				$this->themingDefaults,
-				$this->userSession,
-				$urlGenerator,
-				$imageManager,
-				$this->config,
-				$l10n,
-				$appManager,
-				null,
-			),
-			'opendyslexic' => new DyslexiaFont(
-				$util,
-				$this->themingDefaults,
-				$this->userSession,
-				$urlGenerator,
-				$imageManager,
-				$this->config,
-				$l10n,
-				$appManager,
-				null,
-			),
-		];
-	}
+    private IUserSession&MockObject $userSession;
+    private IConfig&MockObject $config;
+    private LoggerInterface&MockObject $logger;
+
+    private ThemingDefaults&MockObject $themingDefaults;
+    private ThemesService $themesService;
+
+    /** @var ITheme[] */
+    private array $themes;
+
+    protected function setUp(): void {
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+
+        $this->themingDefaults->expects($this->any())
+            ->method('getColorPrimary')
+            ->willReturn('#0082c9');
+
+        $this->themingDefaults->expects($this->any())
+            ->method('getDefaultColorPrimary')
+            ->willReturn('#0082c9');
+
+        $this->initThemes();
+
+        $this->themesService = new ThemesService(
+            $this->userSession,
+            $this->config,
+            $this->logger,
+            ...array_values($this->themes)
+        );
+
+        parent::setUp();
+    }
+
+    public function testGetThemes(): void {
+        $expected = [
+            'default',
+            'light',
+            'dark',
+            'light-highcontrast',
+            'dark-highcontrast',
+            'opendyslexic',
+        ];
+        $this->assertEquals($expected, array_keys($this->themesService->getThemes()));
+    }
+
+    public function testGetThemesEnforced(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValueString')
+            ->with('enforce_theme', '')
+            ->willReturn('dark');
+        $this->logger->expects($this->never())
+            ->method('error');
+
+        $expected = [
+            'default',
+            'dark',
+        ];
+
+        $this->assertEquals($expected, array_keys($this->themesService->getThemes()));
+    }
+
+    public function testGetThemesEnforcedInvalid(): void {
+        $this->config->expects($this->once())
+            ->method('getSystemValueString')
+            ->with('enforce_theme', '')
+            ->willReturn('invalid');
+        $this->logger->expects($this->once())
+            ->method('error')
+            ->with('Enforced theme not found', ['theme' => 'invalid']);
+
+        $expected = [
+            'default',
+            'light',
+            'dark',
+            'light-highcontrast',
+            'dark-highcontrast',
+            'opendyslexic',
+        ];
+
+        $this->assertEquals($expected, array_keys($this->themesService->getThemes()));
+    }
+
+    public static function dataTestEnableTheme(): array {
+        return [
+            ['default', ['default'], ['default']],
+            ['dark', ['default'], ['dark']],
+            ['dark', ['dark'], ['dark']],
+            ['opendyslexic', ['dark'], ['dark', 'opendyslexic']],
+            ['dark', ['light-highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
+        ];
+    }
+
+    /**
+     *
+     * @param string[] $enabledThemes
+     * @param string[] $expectedEnabled
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestEnableTheme')]
+    public function testEnableTheme(string $toEnable, array $enabledThemes, array $expectedEnabled): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
+            ->willReturn(json_encode($enabledThemes));
+
+        $this->assertEquals($expectedEnabled, $this->themesService->enableTheme($this->themes[$toEnable]));
+    }
+
+
+    public static function dataTestDisableTheme(): array {
+        return [
+            ['dark', ['default'], ['default']],
+            ['dark', ['dark'], []],
+            ['opendyslexic', ['dark', 'opendyslexic'], ['dark'], ],
+            ['light-highcontrast', ['opendyslexic'], ['opendyslexic']],
+        ];
+    }
+
+    /**
+     *
+     * @param string[] $enabledThemes
+     * @param string[] $expectedEnabled
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestDisableTheme')]
+    public function testDisableTheme(string $toDisable, array $enabledThemes, array $expectedEnabled): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
+            ->willReturn(json_encode($enabledThemes));
+
+
+        $this->assertEquals($expectedEnabled, $this->themesService->disableTheme($this->themes[$toDisable]));
+    }
+
+
+    public static function dataTestIsEnabled(): array {
+        return [
+            ['dark', [], false],
+            ['dark', ['dark'], true],
+            ['opendyslexic', ['dark', 'opendyslexic'], true],
+            ['light-highcontrast', ['opendyslexic'], false],
+        ];
+    }
+
+    /**
+     * @param string[] $enabledThemes
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsEnabled')]
+    public function testIsEnabled(string $themeId, array $enabledThemes, bool $expected): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
+            ->willReturn(json_encode($enabledThemes));
+
+
+        $this->assertEquals($expected, $this->themesService->isEnabled($this->themes[$themeId]));
+    }
+
+    public function testGetEnabledThemes(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
+            ->willReturn(json_encode(['default']));
+        $this->config->expects($this->once())
+            ->method('getSystemValueString')
+            ->with('enforce_theme', '')
+            ->willReturn('');
+
+        $this->assertEquals(['default'], $this->themesService->getEnabledThemes());
+    }
+
+    public function testGetEnabledThemesEnforced(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with('user', Application::APP_ID, 'enabled-themes', '["default"]')
+            ->willReturn(json_encode([]));
+        $this->config->expects($this->once())
+            ->method('getSystemValueString')
+            ->with('enforce_theme', '')
+            ->willReturn('light');
+
+        $this->assertEquals(['light'], $this->themesService->getEnabledThemes());
+    }
+
+
+    public static function dataTestSetEnabledThemes(): array {
+        return [
+            [[], []],
+            [['light'], ['light']],
+            [['dark'], ['dark']],
+            [['dark', 'dark', 'opendyslexic'], ['dark', 'opendyslexic']],
+        ];
+    }
+
+    /**
+     *
+     * @param string[] $enabledThemes
+     * @param string[] $expected
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetEnabledThemes')]
+    public function testSetEnabledThemes(array $enabledThemes, array $expected): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with('user', Application::APP_ID, 'enabled-themes', json_encode($expected));
+
+        $this->invokePrivate($this->themesService, 'setEnabledThemes', [$enabledThemes]);
+    }
+
+    private function initThemes() {
+        $util = $this->createMock(Util::class);
+        $urlGenerator = $this->createMock(IURLGenerator::class);
+        $imageManager = $this->createMock(ImageManager::class);
+        $l10n = $this->createMock(IL10N::class);
+        $appManager = $this->createMock(IAppManager::class);
+
+        $this->themes = [
+            'default' => new DefaultTheme(
+                $util,
+                $this->themingDefaults,
+                $this->userSession,
+                $urlGenerator,
+                $imageManager,
+                $this->config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'light' => new LightTheme(
+                $util,
+                $this->themingDefaults,
+                $this->userSession,
+                $urlGenerator,
+                $imageManager,
+                $this->config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'dark' => new DarkTheme(
+                $util,
+                $this->themingDefaults,
+                $this->userSession,
+                $urlGenerator,
+                $imageManager,
+                $this->config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'light-highcontrast' => new HighContrastTheme(
+                $util,
+                $this->themingDefaults,
+                $this->userSession,
+                $urlGenerator,
+                $imageManager,
+                $this->config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'dark-highcontrast' => new DarkHighContrastTheme(
+                $util,
+                $this->themingDefaults,
+                $this->userSession,
+                $urlGenerator,
+                $imageManager,
+                $this->config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+            'opendyslexic' => new DyslexiaFont(
+                $util,
+                $this->themingDefaults,
+                $this->userSession,
+                $urlGenerator,
+                $imageManager,
+                $this->config,
+                $l10n,
+                $appManager,
+                null,
+            ),
+        ];
+    }
 }

apps/theming/tests/ThemingDefaultsTest.php

Indentation +785 added lines, -785 removed lines

@@ -26,789 +26,789 @@
 use Test\TestCase;
 
 class ThemingDefaultsTest extends TestCase {
-	private IAppConfig&MockObject $appConfig;
-	private IConfig&MockObject $config;
-	private \OC_Defaults $defaults;
-	private IL10N|MockObject $l10n;
-	private IUserSession&MockObject $userSession;
-	private IURLGenerator&MockObject $urlGenerator;
-	private ICacheFactory&MockObject $cacheFactory;
-	private Util&MockObject $util;
-	private ICache&MockObject $cache;
-	private IAppManager&MockObject $appManager;
-	private ImageManager&MockObject $imageManager;
-	private INavigationManager&MockObject $navigationManager;
-	private BackgroundService&MockObject $backgroundService;
-	private ThemingDefaults $template;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->cache = $this->createMock(ICache::class);
-		$this->util = $this->createMock(Util::class);
-		$this->imageManager = $this->createMock(ImageManager::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->navigationManager = $this->createMock(INavigationManager::class);
-		$this->backgroundService = $this->createMock(BackgroundService::class);
-		$this->defaults = new \OC_Defaults();
-		$this->urlGenerator
-			->expects($this->any())
-			->method('getBaseUrl')
-			->willReturn('');
-		$this->template = new ThemingDefaults(
-			$this->config,
-			$this->appConfig,
-			$this->l10n,
-			$this->userSession,
-			$this->urlGenerator,
-			$this->cacheFactory,
-			$this->util,
-			$this->imageManager,
-			$this->appManager,
-			$this->navigationManager,
-			$this->backgroundService,
-		);
-	}
-
-	public function testGetNameWithDefault(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getName());
-	}
-
-	public function testGetNameWithCustom(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getName());
-	}
-
-	public function testGetHTMLNameWithDefault(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getHTMLName());
-	}
-
-	public function testGetHTMLNameWithCustom(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getHTMLName());
-	}
-
-	public function testGetTitleWithDefault(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getTitle());
-	}
-
-	public function testGetTitleWithCustom(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getTitle());
-	}
-
-
-	public function testGetEntityWithDefault(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('Nextcloud');
-
-		$this->assertEquals('Nextcloud', $this->template->getEntity());
-	}
-
-	public function testGetEntityWithCustom(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'name', 'Nextcloud')
-			->willReturn('MyCustomCloud');
-
-		$this->assertEquals('MyCustomCloud', $this->template->getEntity());
-	}
-
-	public function testGetBaseUrlWithDefault(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'url', $this->defaults->getBaseUrl())
-			->willReturn($this->defaults->getBaseUrl());
-
-		$this->assertEquals($this->defaults->getBaseUrl(), $this->template->getBaseUrl());
-	}
-
-	public function testGetBaseUrlWithCustom(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'url', $this->defaults->getBaseUrl())
-			->willReturn('https://example.com/');
-
-		$this->assertEquals('https://example.com/', $this->template->getBaseUrl());
-	}
-
-	public static function legalUrlProvider(): array {
-		return [
-			[''],
-			['https://example.com/legal.html'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
-	public function testGetImprintURL(string $imprintUrl): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'imprintUrl', '')
-			->willReturn($imprintUrl);
-
-		$this->assertEquals($imprintUrl, $this->template->getImprintUrl());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
-	public function testGetPrivacyURL(string $privacyUrl): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'privacyUrl', '')
-			->willReturn($privacyUrl);
-
-		$this->assertEquals($privacyUrl, $this->template->getPrivacyUrl());
-	}
-
-	public function testGetSloganWithDefault(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'slogan', $this->defaults->getSlogan())
-			->willReturn($this->defaults->getSlogan());
-
-		$this->assertEquals($this->defaults->getSlogan(), $this->template->getSlogan());
-	}
-
-	public function testGetSloganWithCustom(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'slogan', $this->defaults->getSlogan())
-			->willReturn('My custom Slogan');
-
-		$this->assertEquals('My custom Slogan', $this->template->getSlogan());
-	}
-
-	public function testGetShortFooter(): void {
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', ''],
-				['theming', 'privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterEmptyUrl(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), ''],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', ''],
-				['theming', 'privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<span class="entity-name">Name</span> – Slogan', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterEmptySlogan(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), ''],
-				['theming', 'imprintUrl', '', ''],
-				['theming', 'privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a>', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterImprint(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', 'https://example.com/imprint'],
-				['theming', 'privacyUrl', '', ''],
-			]);
-
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a></span>', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterPrivacy(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', ''],
-				['theming', 'privacyUrl', '', 'https://example.com/privacy'],
-			]);
-
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
-	}
-
-	public function testGetShortFooterAllLegalLinks(): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', 'https://example.com/imprint'],
-				['theming', 'privacyUrl', '', 'https://example.com/privacy'],
-			]);
-
-		$this->l10n
-			->expects($this->any())
-			->method('t')
-			->willReturnArgument(0);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
-	}
-
-	public static function invalidLegalUrlProvider(): array {
-		return [
-			['example.com/legal'],  # missing scheme
-			['https:///legal'],     # missing host
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
-	public function testGetShortFooterInvalidImprint(string $invalidImprintUrl): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', $invalidImprintUrl],
-				['theming', 'privacyUrl', '', ''],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
-	public function testGetShortFooterInvalidPrivacy(string $invalidPrivacyUrl): void {
-		$this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
-		$this->config
-			->expects($this->exactly(5))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
-				['theming', 'name', 'Nextcloud', 'Name'],
-				['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
-				['theming', 'imprintUrl', '', ''],
-				['theming', 'privacyUrl', '', $invalidPrivacyUrl],
-			]);
-
-		$this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
-	}
-
-	public function testGetColorPrimaryWithDefault(): void {
-		$this->appConfig
-			->expects(self::once())
-			->method('getValueBool')
-			->with('theming', 'disable-user-theming')
-			->willReturn(false);
-		$this->appConfig
-			->expects(self::once())
-			->method('getValueString')
-			->with('theming', 'primary_color', '')
-			->willReturn($this->defaults->getColorPrimary());
-
-		$this->assertEquals($this->defaults->getColorPrimary(), $this->template->getColorPrimary());
-	}
-
-	public function testGetColorPrimaryWithCustom(): void {
-		$this->appConfig
-			->expects(self::once())
-			->method('getValueBool')
-			->with('theming', 'disable-user-theming')
-			->willReturn(false);
-		$this->appConfig
-			->expects(self::once())
-			->method('getValueString')
-			->with('theming', 'primary_color', '')
-			->willReturn('#fff');
-
-		$this->assertEquals('#fff', $this->template->getColorPrimary());
-	}
-
-	public static function dataGetColorPrimary(): array {
-		return [
-			'with fallback default' => [
-				'disableTheming' => false,
-				'primaryColor' => '',
-				'userPrimaryColor' => '',
-				'expected' => BackgroundService::DEFAULT_COLOR,
-			],
-			'with custom admin primary' => [
-				'disableTheming' => false,
-				'primaryColor' => '#aaa',
-				'userPrimaryColor' => '',
-				'expected' => '#aaa',
-			],
-			'with custom invalid admin primary' => [
-				'disableTheming' => false,
-				'primaryColor' => 'invalid',
-				'userPrimaryColor' => '',
-				'expected' => BackgroundService::DEFAULT_COLOR,
-			],
-			'with custom invalid user primary' => [
-				'disableTheming' => false,
-				'primaryColor' => '',
-				'userPrimaryColor' => 'invalid-name',
-				'expected' => BackgroundService::DEFAULT_COLOR,
-			],
-			'with custom user primary' => [
-				'disableTheming' => false,
-				'primaryColor' => '',
-				'userPrimaryColor' => '#bbb',
-				'expected' => '#bbb',
-			],
-			'with disabled user theming primary' => [
-				'disableTheming' => true,
-				'primaryColor' => '#aaa',
-				'userPrimaryColor' => '#bbb',
-				'expected' => '#aaa',
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataGetColorPrimary')]
-	public function testGetColorPrimary(bool $disableTheming, string $primaryColor, string $userPrimaryColor, string $expected): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$user->expects($this->any())
-			->method('getUID')
-			->willReturn('user');
-		$this->appConfig
-			->expects(self::any())
-			->method('getValueBool')
-			->with('theming', 'disable-user-theming')
-			->willReturn($disableTheming);
-		$this->appConfig
-			->expects(self::any())
-			->method('getValueString')
-			->with('theming', 'primary_color', '')
-			->willReturn($primaryColor);
-		$this->config
-			->expects($this->any())
-			->method('getUserValue')
-			->with('user', 'theming', 'primary_color', '')
-			->willReturn($userPrimaryColor);
-
-		$this->assertEquals($expected, $this->template->getColorPrimary());
-	}
-
-	public function testSet(): void {
-		$expectedCalls = [
-			['theming', 'MySetting', 'MyValue'],
-			['theming', 'cachebuster', 16],
-		];
-		$i = 0;
-		$this->config
-			->expects($this->exactly(2))
-			->method('setAppValue')
-			->willReturnCallback(function () use ($expectedCalls, &$i): void {
-				$this->assertEquals($expectedCalls[$i], func_get_args());
-				$i++;
-			});
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('15');
-		$this->cacheFactory
-			->expects($this->exactly(2))
-			->method('createDistributed')
-			->willReturnMap([
-				['theming-', $this->cache],
-				['imagePath', $this->cache],
-			]);
-		$this->cache
-			->expects($this->any())
-			->method('clear')
-			->with('');
-		$this->template->set('MySetting', 'MyValue');
-	}
-
-	public function testUndoName(): void {
-		$this->config
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('theming', 'name');
-		$this->config
-			->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '15'],
-				['theming', 'name', 'Nextcloud', 'Nextcloud'],
-			]);
-		$this->config
-			->expects($this->once())
-			->method('setAppValue')
-			->with('theming', 'cachebuster', 16);
-
-		$this->assertSame('Nextcloud', $this->template->undo('name'));
-	}
-
-	public function testUndoBaseUrl(): void {
-		$this->config
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('theming', 'url');
-		$this->config
-			->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '15'],
-				['theming', 'url', $this->defaults->getBaseUrl(), $this->defaults->getBaseUrl()],
-			]);
-		$this->config
-			->expects($this->once())
-			->method('setAppValue')
-			->with('theming', 'cachebuster', 16);
-
-		$this->assertSame($this->defaults->getBaseUrl(), $this->template->undo('url'));
-	}
-
-	public function testUndoSlogan(): void {
-		$this->config
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('theming', 'slogan');
-		$this->config
-			->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '15'],
-				['theming', 'slogan', $this->defaults->getSlogan(), $this->defaults->getSlogan()],
-			]);
-		$this->config
-			->expects($this->once())
-			->method('setAppValue')
-			->with('theming', 'cachebuster', 16);
-
-		$this->assertSame($this->defaults->getSlogan(), $this->template->undo('slogan'));
-	}
-
-	public function testUndoPrimaryColor(): void {
-		$this->config
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('theming', 'primary_color');
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('15');
-		$this->config
-			->expects($this->once())
-			->method('setAppValue')
-			->with('theming', 'cachebuster', 16);
-
-		$this->assertSame($this->defaults->getColorPrimary(), $this->template->undo('primary_color'));
-	}
-
-	public function testUndoDefaultAction(): void {
-		$this->config
-			->expects($this->once())
-			->method('deleteAppValue')
-			->with('theming', 'defaultitem');
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('15');
-		$this->config
-			->expects($this->once())
-			->method('setAppValue')
-			->with('theming', 'cachebuster', 16);
-
-		$this->assertSame('', $this->template->undo('defaultitem'));
-	}
-
-	public function testGetBackground(): void {
-		$this->imageManager
-			->expects($this->once())
-			->method('getImageUrl')
-			->with('background')
-			->willReturn('custom-background?v=0');
-		$this->assertEquals('custom-background?v=0', $this->template->getBackground());
-	}
-
-	private function getLogoHelper($withName, $useSvg) {
-		$this->imageManager->expects($this->any())
-			->method('getImage')
-			->with('logo')
-			->willThrowException(new NotFoundException());
-		$this->config
-			->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'logoMime', '', ''],
-				['theming', 'cachebuster', '0', '0'],
-			]);
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->with('core', $withName)
-			->willReturn('core-logo');
-		$this->assertEquals('core-logo?v=0', $this->template->getLogo($useSvg));
-	}
-
-	public function testGetLogoDefaultWithSvg(): void {
-		$this->getLogoHelper('logo/logo.svg', true);
-	}
-
-	public function testGetLogoDefaultWithoutSvg(): void {
-		$this->getLogoHelper('logo/logo.png', false);
-	}
-
-	public function testGetLogoCustom(): void {
-		$this->config
-			->expects($this->exactly(2))
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'logoMime', '', 'image/svg+xml'],
-				['theming', 'cachebuster', '0', '0'],
-			]);
-		$this->urlGenerator->expects($this->once())
-			->method('linkToRoute')
-			->with('theming.Theming.getImage')
-			->willReturn('custom-logo?v=0');
-		$this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
-	}
-
-	public function testGetScssVariablesCached(): void {
-		$this->config->expects($this->any())->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('1');
-		$this->cacheFactory->expects($this->once())
-			->method('createDistributed')
-			->with('theming-1-')
-			->willReturn($this->cache);
-		$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(['foo' => 'bar']);
-		$this->assertEquals(['foo' => 'bar'], $this->template->getScssVariables());
-	}
-
-	public function testGetScssVariables(): void {
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->willReturnMap([
-				['theming', 'cachebuster', '0', '0'],
-				['theming', 'logoMime', '', 'jpeg'],
-				['theming', 'backgroundMime', '', 'jpeg'],
-				['theming', 'logoheaderMime', '', 'jpeg'],
-				['theming', 'faviconMime', '', 'jpeg'],
-			]);
-
-		$this->appConfig
-			->expects(self::atLeastOnce())
-			->method('getValueString')
-			->willReturnMap([
-				['theming', 'primary_color', '', false, $this->defaults->getColorPrimary()],
-				['theming', 'primary_color', $this->defaults->getColorPrimary(), false, $this->defaults->getColorPrimary()],
-			]);
-
-		$this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
-		$this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
-		$this->cacheFactory->expects($this->once())
-			->method('createDistributed')
-			->with('theming-0-')
-			->willReturn($this->cache);
-		$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);
-		$this->imageManager->expects($this->exactly(4))
-			->method('getImageUrl')
-			->willReturnMap([
-				['logo', 'custom-logo?v=0'],
-				['logoheader', 'custom-logoheader?v=0'],
-				['favicon', 'custom-favicon?v=0'],
-				['background', 'custom-background?v=0'],
-			]);
-
-		$expected = [
-			'theming-cachebuster' => '\'0\'',
-			'theming-logo-mime' => '\'jpeg\'',
-			'theming-background-mime' => '\'jpeg\'',
-			'image-logo' => "url('custom-logo?v=0')",
-			'image-login-background' => "url('custom-background?v=0')",
-			'color-primary' => $this->defaults->getColorPrimary(),
-			'color-primary-text' => '#ffffff',
-			'image-login-plain' => 'false',
-			'color-primary-element' => '#aaaaaa',
-			'theming-logoheader-mime' => '\'jpeg\'',
-			'theming-favicon-mime' => '\'jpeg\'',
-			'image-logoheader' => "url('custom-logoheader?v=0')",
-			'image-favicon' => "url('custom-favicon?v=0')",
-			'has-legal-links' => 'false'
-		];
-		$this->assertEquals($expected, $this->template->getScssVariables());
-	}
-
-	public function testGetDefaultAndroidURL(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
-			->willReturn('https://play.google.com/store/apps/details?id=com.nextcloud.client');
-
-		$this->assertEquals('https://play.google.com/store/apps/details?id=com.nextcloud.client', $this->template->getAndroidClientUrl());
-	}
-
-	public function testGetCustomAndroidURL(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
-			->willReturn('https://play.google.com/store/apps/details?id=com.mycloud.client');
-
-		$this->assertEquals('https://play.google.com/store/apps/details?id=com.mycloud.client', $this->template->getAndroidClientUrl());
-	}
-
-	public function testGetDefaultiOSURL(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
-			->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8');
-
-		$this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', $this->template->getiOSClientUrl());
-	}
-
-	public function testGetCustomiOSURL(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
-			->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8');
-
-		$this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8', $this->template->getiOSClientUrl());
-	}
-
-	public function testGetDefaultiTunesAppId(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'iTunesAppId', '1125420102')
-			->willReturn('1125420102');
-
-		$this->assertEquals('1125420102', $this->template->getiTunesAppId());
-	}
-
-	public function testGetCustomiTunesAppId(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('theming', 'iTunesAppId', '1125420102')
-			->willReturn('1234567890');
-
-		$this->assertEquals('1234567890', $this->template->getiTunesAppId());
-	}
-
-	public static function dataReplaceImagePath(): array {
-		return [
-			['core', 'test.png', false],
-			['core', 'manifest.json'],
-			['core', 'favicon.ico'],
-			['core', 'favicon-touch.png']
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataReplaceImagePath')]
-	public function testReplaceImagePath(string $app, string $image, string|bool $result = 'themingRoute?v=1234abcd'): void {
-		$this->cache->expects($this->any())
-			->method('get')
-			->with('shouldReplaceIcons')
-			->willReturn(true);
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->with('theming', 'cachebuster', '0')
-			->willReturn('0');
-		$this->urlGenerator
-			->expects($this->any())
-			->method('linkToRoute')
-			->willReturn('themingRoute');
-		if ($result) {
-			$this->util
-				->expects($this->once())
-				->method('getCacheBuster')
-				->willReturn('1234abcd');
-		}
-		$this->assertEquals($result, $this->template->replaceImagePath($app, $image));
-	}
+    private IAppConfig&MockObject $appConfig;
+    private IConfig&MockObject $config;
+    private \OC_Defaults $defaults;
+    private IL10N|MockObject $l10n;
+    private IUserSession&MockObject $userSession;
+    private IURLGenerator&MockObject $urlGenerator;
+    private ICacheFactory&MockObject $cacheFactory;
+    private Util&MockObject $util;
+    private ICache&MockObject $cache;
+    private IAppManager&MockObject $appManager;
+    private ImageManager&MockObject $imageManager;
+    private INavigationManager&MockObject $navigationManager;
+    private BackgroundService&MockObject $backgroundService;
+    private ThemingDefaults $template;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->cache = $this->createMock(ICache::class);
+        $this->util = $this->createMock(Util::class);
+        $this->imageManager = $this->createMock(ImageManager::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->navigationManager = $this->createMock(INavigationManager::class);
+        $this->backgroundService = $this->createMock(BackgroundService::class);
+        $this->defaults = new \OC_Defaults();
+        $this->urlGenerator
+            ->expects($this->any())
+            ->method('getBaseUrl')
+            ->willReturn('');
+        $this->template = new ThemingDefaults(
+            $this->config,
+            $this->appConfig,
+            $this->l10n,
+            $this->userSession,
+            $this->urlGenerator,
+            $this->cacheFactory,
+            $this->util,
+            $this->imageManager,
+            $this->appManager,
+            $this->navigationManager,
+            $this->backgroundService,
+        );
+    }
+
+    public function testGetNameWithDefault(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getName());
+    }
+
+    public function testGetNameWithCustom(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getName());
+    }
+
+    public function testGetHTMLNameWithDefault(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getHTMLName());
+    }
+
+    public function testGetHTMLNameWithCustom(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getHTMLName());
+    }
+
+    public function testGetTitleWithDefault(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getTitle());
+    }
+
+    public function testGetTitleWithCustom(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getTitle());
+    }
+
+
+    public function testGetEntityWithDefault(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('Nextcloud');
+
+        $this->assertEquals('Nextcloud', $this->template->getEntity());
+    }
+
+    public function testGetEntityWithCustom(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'name', 'Nextcloud')
+            ->willReturn('MyCustomCloud');
+
+        $this->assertEquals('MyCustomCloud', $this->template->getEntity());
+    }
+
+    public function testGetBaseUrlWithDefault(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'url', $this->defaults->getBaseUrl())
+            ->willReturn($this->defaults->getBaseUrl());
+
+        $this->assertEquals($this->defaults->getBaseUrl(), $this->template->getBaseUrl());
+    }
+
+    public function testGetBaseUrlWithCustom(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'url', $this->defaults->getBaseUrl())
+            ->willReturn('https://example.com/');
+
+        $this->assertEquals('https://example.com/', $this->template->getBaseUrl());
+    }
+
+    public static function legalUrlProvider(): array {
+        return [
+            [''],
+            ['https://example.com/legal.html'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
+    public function testGetImprintURL(string $imprintUrl): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'imprintUrl', '')
+            ->willReturn($imprintUrl);
+
+        $this->assertEquals($imprintUrl, $this->template->getImprintUrl());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('legalUrlProvider')]
+    public function testGetPrivacyURL(string $privacyUrl): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'privacyUrl', '')
+            ->willReturn($privacyUrl);
+
+        $this->assertEquals($privacyUrl, $this->template->getPrivacyUrl());
+    }
+
+    public function testGetSloganWithDefault(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'slogan', $this->defaults->getSlogan())
+            ->willReturn($this->defaults->getSlogan());
+
+        $this->assertEquals($this->defaults->getSlogan(), $this->template->getSlogan());
+    }
+
+    public function testGetSloganWithCustom(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'slogan', $this->defaults->getSlogan())
+            ->willReturn('My custom Slogan');
+
+        $this->assertEquals('My custom Slogan', $this->template->getSlogan());
+    }
+
+    public function testGetShortFooter(): void {
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', ''],
+                ['theming', 'privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterEmptyUrl(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), ''],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', ''],
+                ['theming', 'privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<span class="entity-name">Name</span> – Slogan', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterEmptySlogan(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), ''],
+                ['theming', 'imprintUrl', '', ''],
+                ['theming', 'privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a>', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterImprint(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', 'https://example.com/imprint'],
+                ['theming', 'privacyUrl', '', ''],
+            ]);
+
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a></span>', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterPrivacy(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', ''],
+                ['theming', 'privacyUrl', '', 'https://example.com/privacy'],
+            ]);
+
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
+    }
+
+    public function testGetShortFooterAllLegalLinks(): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', 'https://example.com/imprint'],
+                ['theming', 'privacyUrl', '', 'https://example.com/privacy'],
+            ]);
+
+        $this->l10n
+            ->expects($this->any())
+            ->method('t')
+            ->willReturnArgument(0);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><span class="footer__legal-links"><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a></span>', $this->template->getShortFooter());
+    }
+
+    public static function invalidLegalUrlProvider(): array {
+        return [
+            ['example.com/legal'],  # missing scheme
+            ['https:///legal'],     # missing host
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
+    public function testGetShortFooterInvalidImprint(string $invalidImprintUrl): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', $invalidImprintUrl],
+                ['theming', 'privacyUrl', '', ''],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('invalidLegalUrlProvider')]
+    public function testGetShortFooterInvalidPrivacy(string $invalidPrivacyUrl): void {
+        $this->navigationManager->expects($this->once())->method('getAll')->with(INavigationManager::TYPE_GUEST)->willReturn([]);
+        $this->config
+            ->expects($this->exactly(5))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'url', $this->defaults->getBaseUrl(), 'url'],
+                ['theming', 'name', 'Nextcloud', 'Name'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'],
+                ['theming', 'imprintUrl', '', ''],
+                ['theming', 'privacyUrl', '', $invalidPrivacyUrl],
+            ]);
+
+        $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter());
+    }
+
+    public function testGetColorPrimaryWithDefault(): void {
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getValueBool')
+            ->with('theming', 'disable-user-theming')
+            ->willReturn(false);
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getValueString')
+            ->with('theming', 'primary_color', '')
+            ->willReturn($this->defaults->getColorPrimary());
+
+        $this->assertEquals($this->defaults->getColorPrimary(), $this->template->getColorPrimary());
+    }
+
+    public function testGetColorPrimaryWithCustom(): void {
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getValueBool')
+            ->with('theming', 'disable-user-theming')
+            ->willReturn(false);
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getValueString')
+            ->with('theming', 'primary_color', '')
+            ->willReturn('#fff');
+
+        $this->assertEquals('#fff', $this->template->getColorPrimary());
+    }
+
+    public static function dataGetColorPrimary(): array {
+        return [
+            'with fallback default' => [
+                'disableTheming' => false,
+                'primaryColor' => '',
+                'userPrimaryColor' => '',
+                'expected' => BackgroundService::DEFAULT_COLOR,
+            ],
+            'with custom admin primary' => [
+                'disableTheming' => false,
+                'primaryColor' => '#aaa',
+                'userPrimaryColor' => '',
+                'expected' => '#aaa',
+            ],
+            'with custom invalid admin primary' => [
+                'disableTheming' => false,
+                'primaryColor' => 'invalid',
+                'userPrimaryColor' => '',
+                'expected' => BackgroundService::DEFAULT_COLOR,
+            ],
+            'with custom invalid user primary' => [
+                'disableTheming' => false,
+                'primaryColor' => '',
+                'userPrimaryColor' => 'invalid-name',
+                'expected' => BackgroundService::DEFAULT_COLOR,
+            ],
+            'with custom user primary' => [
+                'disableTheming' => false,
+                'primaryColor' => '',
+                'userPrimaryColor' => '#bbb',
+                'expected' => '#bbb',
+            ],
+            'with disabled user theming primary' => [
+                'disableTheming' => true,
+                'primaryColor' => '#aaa',
+                'userPrimaryColor' => '#bbb',
+                'expected' => '#aaa',
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataGetColorPrimary')]
+    public function testGetColorPrimary(bool $disableTheming, string $primaryColor, string $userPrimaryColor, string $expected): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('user');
+        $this->appConfig
+            ->expects(self::any())
+            ->method('getValueBool')
+            ->with('theming', 'disable-user-theming')
+            ->willReturn($disableTheming);
+        $this->appConfig
+            ->expects(self::any())
+            ->method('getValueString')
+            ->with('theming', 'primary_color', '')
+            ->willReturn($primaryColor);
+        $this->config
+            ->expects($this->any())
+            ->method('getUserValue')
+            ->with('user', 'theming', 'primary_color', '')
+            ->willReturn($userPrimaryColor);
+
+        $this->assertEquals($expected, $this->template->getColorPrimary());
+    }
+
+    public function testSet(): void {
+        $expectedCalls = [
+            ['theming', 'MySetting', 'MyValue'],
+            ['theming', 'cachebuster', 16],
+        ];
+        $i = 0;
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('setAppValue')
+            ->willReturnCallback(function () use ($expectedCalls, &$i): void {
+                $this->assertEquals($expectedCalls[$i], func_get_args());
+                $i++;
+            });
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('15');
+        $this->cacheFactory
+            ->expects($this->exactly(2))
+            ->method('createDistributed')
+            ->willReturnMap([
+                ['theming-', $this->cache],
+                ['imagePath', $this->cache],
+            ]);
+        $this->cache
+            ->expects($this->any())
+            ->method('clear')
+            ->with('');
+        $this->template->set('MySetting', 'MyValue');
+    }
+
+    public function testUndoName(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('theming', 'name');
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '15'],
+                ['theming', 'name', 'Nextcloud', 'Nextcloud'],
+            ]);
+        $this->config
+            ->expects($this->once())
+            ->method('setAppValue')
+            ->with('theming', 'cachebuster', 16);
+
+        $this->assertSame('Nextcloud', $this->template->undo('name'));
+    }
+
+    public function testUndoBaseUrl(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('theming', 'url');
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '15'],
+                ['theming', 'url', $this->defaults->getBaseUrl(), $this->defaults->getBaseUrl()],
+            ]);
+        $this->config
+            ->expects($this->once())
+            ->method('setAppValue')
+            ->with('theming', 'cachebuster', 16);
+
+        $this->assertSame($this->defaults->getBaseUrl(), $this->template->undo('url'));
+    }
+
+    public function testUndoSlogan(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('theming', 'slogan');
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '15'],
+                ['theming', 'slogan', $this->defaults->getSlogan(), $this->defaults->getSlogan()],
+            ]);
+        $this->config
+            ->expects($this->once())
+            ->method('setAppValue')
+            ->with('theming', 'cachebuster', 16);
+
+        $this->assertSame($this->defaults->getSlogan(), $this->template->undo('slogan'));
+    }
+
+    public function testUndoPrimaryColor(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('theming', 'primary_color');
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('15');
+        $this->config
+            ->expects($this->once())
+            ->method('setAppValue')
+            ->with('theming', 'cachebuster', 16);
+
+        $this->assertSame($this->defaults->getColorPrimary(), $this->template->undo('primary_color'));
+    }
+
+    public function testUndoDefaultAction(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('deleteAppValue')
+            ->with('theming', 'defaultitem');
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('15');
+        $this->config
+            ->expects($this->once())
+            ->method('setAppValue')
+            ->with('theming', 'cachebuster', 16);
+
+        $this->assertSame('', $this->template->undo('defaultitem'));
+    }
+
+    public function testGetBackground(): void {
+        $this->imageManager
+            ->expects($this->once())
+            ->method('getImageUrl')
+            ->with('background')
+            ->willReturn('custom-background?v=0');
+        $this->assertEquals('custom-background?v=0', $this->template->getBackground());
+    }
+
+    private function getLogoHelper($withName, $useSvg) {
+        $this->imageManager->expects($this->any())
+            ->method('getImage')
+            ->with('logo')
+            ->willThrowException(new NotFoundException());
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'logoMime', '', ''],
+                ['theming', 'cachebuster', '0', '0'],
+            ]);
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->with('core', $withName)
+            ->willReturn('core-logo');
+        $this->assertEquals('core-logo?v=0', $this->template->getLogo($useSvg));
+    }
+
+    public function testGetLogoDefaultWithSvg(): void {
+        $this->getLogoHelper('logo/logo.svg', true);
+    }
+
+    public function testGetLogoDefaultWithoutSvg(): void {
+        $this->getLogoHelper('logo/logo.png', false);
+    }
+
+    public function testGetLogoCustom(): void {
+        $this->config
+            ->expects($this->exactly(2))
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'logoMime', '', 'image/svg+xml'],
+                ['theming', 'cachebuster', '0', '0'],
+            ]);
+        $this->urlGenerator->expects($this->once())
+            ->method('linkToRoute')
+            ->with('theming.Theming.getImage')
+            ->willReturn('custom-logo?v=0');
+        $this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
+    }
+
+    public function testGetScssVariablesCached(): void {
+        $this->config->expects($this->any())->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('1');
+        $this->cacheFactory->expects($this->once())
+            ->method('createDistributed')
+            ->with('theming-1-')
+            ->willReturn($this->cache);
+        $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(['foo' => 'bar']);
+        $this->assertEquals(['foo' => 'bar'], $this->template->getScssVariables());
+    }
+
+    public function testGetScssVariables(): void {
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['theming', 'cachebuster', '0', '0'],
+                ['theming', 'logoMime', '', 'jpeg'],
+                ['theming', 'backgroundMime', '', 'jpeg'],
+                ['theming', 'logoheaderMime', '', 'jpeg'],
+                ['theming', 'faviconMime', '', 'jpeg'],
+            ]);
+
+        $this->appConfig
+            ->expects(self::atLeastOnce())
+            ->method('getValueString')
+            ->willReturnMap([
+                ['theming', 'primary_color', '', false, $this->defaults->getColorPrimary()],
+                ['theming', 'primary_color', $this->defaults->getColorPrimary(), false, $this->defaults->getColorPrimary()],
+            ]);
+
+        $this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
+        $this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
+        $this->cacheFactory->expects($this->once())
+            ->method('createDistributed')
+            ->with('theming-0-')
+            ->willReturn($this->cache);
+        $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);
+        $this->imageManager->expects($this->exactly(4))
+            ->method('getImageUrl')
+            ->willReturnMap([
+                ['logo', 'custom-logo?v=0'],
+                ['logoheader', 'custom-logoheader?v=0'],
+                ['favicon', 'custom-favicon?v=0'],
+                ['background', 'custom-background?v=0'],
+            ]);
+
+        $expected = [
+            'theming-cachebuster' => '\'0\'',
+            'theming-logo-mime' => '\'jpeg\'',
+            'theming-background-mime' => '\'jpeg\'',
+            'image-logo' => "url('custom-logo?v=0')",
+            'image-login-background' => "url('custom-background?v=0')",
+            'color-primary' => $this->defaults->getColorPrimary(),
+            'color-primary-text' => '#ffffff',
+            'image-login-plain' => 'false',
+            'color-primary-element' => '#aaaaaa',
+            'theming-logoheader-mime' => '\'jpeg\'',
+            'theming-favicon-mime' => '\'jpeg\'',
+            'image-logoheader' => "url('custom-logoheader?v=0')",
+            'image-favicon' => "url('custom-favicon?v=0')",
+            'has-legal-links' => 'false'
+        ];
+        $this->assertEquals($expected, $this->template->getScssVariables());
+    }
+
+    public function testGetDefaultAndroidURL(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
+            ->willReturn('https://play.google.com/store/apps/details?id=com.nextcloud.client');
+
+        $this->assertEquals('https://play.google.com/store/apps/details?id=com.nextcloud.client', $this->template->getAndroidClientUrl());
+    }
+
+    public function testGetCustomAndroidURL(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'AndroidClientUrl', 'https://play.google.com/store/apps/details?id=com.nextcloud.client')
+            ->willReturn('https://play.google.com/store/apps/details?id=com.mycloud.client');
+
+        $this->assertEquals('https://play.google.com/store/apps/details?id=com.mycloud.client', $this->template->getAndroidClientUrl());
+    }
+
+    public function testGetDefaultiOSURL(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
+            ->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8');
+
+        $this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8', $this->template->getiOSClientUrl());
+    }
+
+    public function testGetCustomiOSURL(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'iOSClientUrl', 'https://geo.itunes.apple.com/us/app/nextcloud/id1125420102?mt=8')
+            ->willReturn('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8');
+
+        $this->assertEquals('https://geo.itunes.apple.com/us/app/nextcloud/id1234567890?mt=8', $this->template->getiOSClientUrl());
+    }
+
+    public function testGetDefaultiTunesAppId(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'iTunesAppId', '1125420102')
+            ->willReturn('1125420102');
+
+        $this->assertEquals('1125420102', $this->template->getiTunesAppId());
+    }
+
+    public function testGetCustomiTunesAppId(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('theming', 'iTunesAppId', '1125420102')
+            ->willReturn('1234567890');
+
+        $this->assertEquals('1234567890', $this->template->getiTunesAppId());
+    }
+
+    public static function dataReplaceImagePath(): array {
+        return [
+            ['core', 'test.png', false],
+            ['core', 'manifest.json'],
+            ['core', 'favicon.ico'],
+            ['core', 'favicon-touch.png']
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataReplaceImagePath')]
+    public function testReplaceImagePath(string $app, string $image, string|bool $result = 'themingRoute?v=1234abcd'): void {
+        $this->cache->expects($this->any())
+            ->method('get')
+            ->with('shouldReplaceIcons')
+            ->willReturn(true);
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->with('theming', 'cachebuster', '0')
+            ->willReturn('0');
+        $this->urlGenerator
+            ->expects($this->any())
+            ->method('linkToRoute')
+            ->willReturn('themingRoute');
+        if ($result) {
+            $this->util
+                ->expects($this->once())
+                ->method('getCacheBuster')
+                ->willReturn('1234abcd');
+        }
+        $this->assertEquals($result, $this->template->replaceImagePath($app, $image));
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	private IAppConfig&MockObject $appConfig;
 	private IConfig&MockObject $config;
 	private \OC_Defaults $defaults;
-	private IL10N|MockObject $l10n;
+	private IL10N | MockObject $l10n;
 	private IUserSession&MockObject $userSession;
 	private IURLGenerator&MockObject $urlGenerator;
 	private ICacheFactory&MockObject $cacheFactory;
@@ -337,8 +337,8 @@ 
 
 	public static function invalidLegalUrlProvider(): array {
 		return [
-			['example.com/legal'],  # missing scheme
-			['https:///legal'],     # missing host
+			['example.com/legal'], # missing scheme
+			['https:///legal'], # missing host
 		];
 	}
 
@@ -484,7 +484,7 @@ 
 		$this->config
 			->expects($this->exactly(2))
 			->method('setAppValue')
-			->willReturnCallback(function () use ($expectedCalls, &$i): void {
+			->willReturnCallback(function() use ($expectedCalls, &$i): void {
 				$this->assertEquals($expectedCalls[$i], func_get_args());
 				$i++;
 			});
@@ -651,7 +651,7 @@ 
 			->method('linkToRoute')
 			->with('theming.Theming.getImage')
 			->willReturn('custom-logo?v=0');
-		$this->assertEquals('custom-logo' . '?v=0', $this->template->getLogo());
+		$this->assertEquals('custom-logo'.'?v=0', $this->template->getLogo());
 	}
 
 	public function testGetScssVariablesCached(): void {
@@ -789,7 +789,7 @@ 
 	}
 
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataReplaceImagePath')]
-	public function testReplaceImagePath(string $app, string $image, string|bool $result = 'themingRoute?v=1234abcd'): void {
+	public function testReplaceImagePath(string $app, string $image, string | bool $result = 'themingRoute?v=1234abcd'): void {
 		$this->cache->expects($this->any())
 			->method('get')
 			->with('shouldReplaceIcons')

apps/theming/tests/ServicesTest.php

Indentation +32 added lines, -32 removed lines

@@ -28,43 +28,43 @@
  * @package OCA\Theming\Tests
  */
 class ServicesTest extends TestCase {
-	protected App $app;
+    protected App $app;
 
-	protected IAppContainer $container;
+    protected IAppContainer $container;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->app = new App('theming');
-		$this->container = $this->app->getContainer();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->app = new App('theming');
+        $this->container = $this->app->getContainer();
+    }
 
-	public static function queryData(): array {
-		return [
-			[IL10N::class],
+    public static function queryData(): array {
+        return [
+            [IL10N::class],
 
-			// lib/
-			[Capabilities::class],
-			[Capabilities::class, ICapability::class],
-			[ThemingDefaults::class],
-			[ThemingDefaults::class, \OC_Defaults::class],
-			[Util::class],
+            // lib/
+            [Capabilities::class],
+            [Capabilities::class, ICapability::class],
+            [ThemingDefaults::class],
+            [ThemingDefaults::class, \OC_Defaults::class],
+            [Util::class],
 
-			// Controller
-			[ThemingController::class, ThemingController::class],
+            // Controller
+            [ThemingController::class, ThemingController::class],
 
-			// Settings
-			[Admin::class],
-			[Admin::class, ISettings::class],
-			[PersonalSection::class],
-			[PersonalSection::class, IIconSection::class],
-		];
-	}
+            // Settings
+            [Admin::class],
+            [Admin::class, ISettings::class],
+            [PersonalSection::class],
+            [PersonalSection::class, IIconSection::class],
+        ];
+    }
 
-	#[\PHPUnit\Framework\Attributes\DataProvider('queryData')]
-	public function testContainerQuery(string $service, ?string $expected = null): void {
-		if ($expected === null) {
-			$expected = $service;
-		}
-		$this->assertInstanceOf($expected, $this->container->query($service));
-	}
+    #[\PHPUnit\Framework\Attributes\DataProvider('queryData')]
+    public function testContainerQuery(string $service, ?string $expected = null): void {
+        if ($expected === null) {
+            $expected = $service;
+        }
+        $this->assertInstanceOf($expected, $this->container->query($service));
+    }
 }