4 files changed, 324 insertions, 161 deletions

diff --git a/apps/theming/tests/Settings/AdminSectionTest.php b/apps/theming/tests/Settings/AdminSectionTest.php
new file mode 100644
index 00000000000..ecb889f264b
--- /dev/null
+++ b/apps/theming/tests/Settings/AdminSectionTest.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Theming\Tests\Settings;
+
+use OCA\Theming\AppInfo\Application;
+use OCA\Theming\Settings\AdminSection;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class AdminSectionTest extends TestCase {
+	private IURLGenerator&MockObject $url;
+	private IL10N&MockObject $l;
+	private AdminSection $section;
+
+	protected function setUp(): void {
+		parent::setUp();
+		$this->url = $this->createMock(IURLGenerator::class);
+		$this->l = $this->createMock(IL10N::class);
+
+		$this->section = new AdminSection(
+			Application::APP_ID,
+			$this->url,
+			$this->l
+		);
+	}
+
+	public function testGetID(): void {
+		$this->assertSame('theming', $this->section->getID());
+	}
+
+	public function testGetName(): void {
+		$this->l
+			->expects($this->once())
+			->method('t')
+			->with('Theming')
+			->willReturn('Theming');
+
+		$this->assertSame('Theming', $this->section->getName());
+	}
+
+	public function testGetPriority(): void {
+		$this->assertSame(30, $this->section->getPriority());
+	}
+
+	public function testGetIcon(): void {
+		$this->url->expects($this->once())
+			->method('imagePath')
+			->with('theming', 'app-dark.svg')
+			->willReturn('icon');
+
+		$this->assertSame('icon', $this->section->getIcon());
+	}
+}
diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php
index b10196a1ac5..277b94900a8 100644
--- a/apps/theming/tests/Settings/AdminTest.php
+++ b/apps/theming/tests/Settings/AdminTest.php
@@ -1,29 +1,9 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OCA\Theming\Tests\Settings;
 
@@ -32,44 +12,47 @@ use OCA\Theming\ImageManager;
 use OCA\Theming\Settings\Admin;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\INavigationManager;
 use OCP\IURLGenerator;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class AdminTest extends TestCase {
-	/** @var Admin */
-	private $admin;
-	/** @var IConfig */
-	private $config;
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ImageManager */
-	private $imageManager;
-	/** @var IL10N */
-	private $l10n;
+	private Admin $admin;
+	private IConfig&MockObject $config;
+	private ThemingDefaults&MockObject $themingDefaults;
+	private IInitialState&MockObject $initialState;
+	private IURLGenerator&MockObject $urlGenerator;
+	private ImageManager&MockObject $imageManager;
+	private IL10N&MockObject $l10n;
+	private INavigationManager&MockObject $navigationManager;
 
 	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->themingDefaults = $this->createMock(ThemingDefaults::class);
+		$this->initialState = $this->createMock(IInitialState::class);
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->imageManager = $this->createMock(ImageManager::class);
+		$this->navigationManager = $this->createMock(INavigationManager::class);
 
 		$this->admin = new Admin(
 			Application::APP_ID,
 			$this->config,
 			$this->l10n,
 			$this->themingDefaults,
+			$this->initialState,
 			$this->urlGenerator,
-			$this->imageManager
+			$this->imageManager,
+			$this->navigationManager,
 		);
 	}
 
-	public function testGetFormNoErrors() {
+	public function testGetFormNoErrors(): void {
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
@@ -97,33 +80,14 @@ class AdminTest extends TestCase {
 			->willReturn('MySlogan');
 		$this->themingDefaults
 			->expects($this->once())
-			->method('getColorPrimary')
+			->method('getDefaultColorPrimary')
 			->willReturn('#fff');
-		$this->urlGenerator
-			->expects($this->once())
-			->method('linkToRoute')
-			->with('theming.Theming.uploadImage')
-			->willReturn('/my/route');
-		$params = [
-			'themable' => true,
-			'errorMessage' => '',
-			'name' => 'MyEntity',
-			'url' => 'https://example.com',
-			'slogan' => 'MySlogan',
-			'color' => '#fff',
-			'uploadLogoRoute' => '/my/route',
-			'canThemeIcons' => null,
-			'iconDocs' => null,
-			'images' => [],
-			'imprintUrl' => '',
-			'privacyUrl' => '',
-		];
 
-		$expected = new TemplateResponse('theming', 'settings-admin', $params, '');
+		$expected = new TemplateResponse('theming', 'settings-admin');
 		$this->assertEquals($expected, $this->admin->getForm());
 	}
 
-	public function testGetFormWithErrors() {
+	public function testGetFormWithErrors(): void {
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
@@ -156,37 +120,18 @@ class AdminTest extends TestCase {
 			->willReturn('MySlogan');
 		$this->themingDefaults
 			->expects($this->once())
-			->method('getColorPrimary')
+			->method('getDefaultColorPrimary')
 			->willReturn('#fff');
-		$this->urlGenerator
-			->expects($this->once())
-			->method('linkToRoute')
-			->with('theming.Theming.uploadImage')
-			->willReturn('/my/route');
-		$params = [
-			'themable' => false,
-			'errorMessage' => 'You are already using a custom theme. Theming app settings might be overwritten by that.',
-			'name' => 'MyEntity',
-			'url' => 'https://example.com',
-			'slogan' => 'MySlogan',
-			'color' => '#fff',
-			'uploadLogoRoute' => '/my/route',
-			'canThemeIcons' => null,
-			'iconDocs' => '',
-			'images' => [],
-			'imprintUrl' => '',
-			'privacyUrl' => '',
-		];
 
-		$expected = new TemplateResponse('theming', 'settings-admin', $params, '');
+		$expected = new TemplateResponse('theming', 'settings-admin');
 		$this->assertEquals($expected, $this->admin->getForm());
 	}
 
-	public function testGetSection() {
+	public function testGetSection(): void {
 		$this->assertSame('theming', $this->admin->getSection());
 	}
 
-	public function testGetPriority() {
+	public function testGetPriority(): void {
 		$this->assertSame(5, $this->admin->getPriority());
 	}
 }
diff --git a/apps/theming/tests/Settings/PersonalTest.php b/apps/theming/tests/Settings/PersonalTest.php
new file mode 100644
index 00000000000..9216450ec9c
--- /dev/null
+++ b/apps/theming/tests/Settings/PersonalTest.php
@@ -0,0 +1,236 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Theming\Tests\Settings;
+
+use OCA\Theming\AppInfo\Application;
+use OCA\Theming\ImageManager;
+use OCA\Theming\ITheme;
+use OCA\Theming\Service\BackgroundService;
+use OCA\Theming\Service\ThemesService;
+use OCA\Theming\Settings\Personal;
+use OCA\Theming\Themes\DarkHighContrastTheme;
+use OCA\Theming\Themes\DarkTheme;
+use OCA\Theming\Themes\DefaultTheme;
+use OCA\Theming\Themes\DyslexiaFont;
+use OCA\Theming\Themes\HighContrastTheme;
+use OCA\Theming\Themes\LightTheme;
+use OCA\Theming\ThemingDefaults;
+use OCA\Theming\Util;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\INavigationManager;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
+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,
+		];
+	}
+}
diff --git a/apps/theming/tests/Settings/SectionTest.php b/apps/theming/tests/Settings/SectionTest.php
deleted file mode 100644
index c168f13728d..00000000000
--- a/apps/theming/tests/Settings/SectionTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-namespace OCA\Theming\Tests\Settings;
-
-use OCA\Theming\AppInfo\Application;
-use OCA\Theming\Settings\AdminSection;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-use Test\TestCase;
-
-class SectionTest extends TestCase {
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $url;
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l;
-	/** @var AdminSection */
-	private $section;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->url = $this->createMock(IURLGenerator::class);
-		$this->l = $this->createMock(IL10N::class);
-
-		$this->section = new AdminSection(
-			Application::APP_ID,
-			$this->url,
-			$this->l
-		);
-	}
-
-	public function testGetID() {
-		$this->assertSame('theming', $this->section->getID());
-	}
-
-	public function testGetName() {
-		$this->l
-			->expects($this->once())
-			->method('t')
-			->with('Theming')
-			->willReturn('Theming');
-
-		$this->assertSame('Theming', $this->section->getName());
-	}
-
-	public function testGetPriority() {
-		$this->assertSame(30, $this->section->getPriority());
-	}
-
-	public function testGetIcon() {
-		$this->url->expects($this->once())
-			->method('imagePath')
-			->with('theming', 'app-dark.svg')
-			->willReturn('icon');
-
-		$this->assertSame('icon', $this->section->getIcon());
-	}
-}