From a7b4c7d662aabd49559e05185aed63a359b54ef7 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 2 Jan 2025 15:50:50 +0000 Subject: [PATCH 1/2] Remove commented code Signed-off-by: Kamil Tekiela --- src/Theme/ThemeManager.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Theme/ThemeManager.php b/src/Theme/ThemeManager.php index 815ffb91be..dabedb9c91 100644 --- a/src/Theme/ThemeManager.php +++ b/src/Theme/ThemeManager.php @@ -116,9 +116,6 @@ class ThemeManager $this->activeTheme = $theme; $this->theme = $this->themes[$theme]; - // need to set later - //$this->setThemeCookie(); - return true; } From c8c0d43cc9d4b1ac1a78431ca891040fb949a1a9 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 2 Jan 2025 15:59:05 +0000 Subject: [PATCH 2/2] Simplify the test by adding type hint Signed-off-by: Kamil Tekiela --- src/Theme/ThemeManager.php | 9 ++++++++- tests/unit/Theme/ThemeManagerTest.php | 5 ----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Theme/ThemeManager.php b/src/Theme/ThemeManager.php index dabedb9c91..900212f020 100644 --- a/src/Theme/ThemeManager.php +++ b/src/Theme/ThemeManager.php @@ -227,7 +227,14 @@ class ThemeManager return array_key_exists($theme ?? '', $this->themes); } - /** @return mixed[] */ + /** @return array{ + * id: string, + * name: string, + * version: string, + * is_active: bool, + * color_mode: string, + * color_modes: array + * }[] $themes */ public function getThemesArray(): array { $themes = []; diff --git a/tests/unit/Theme/ThemeManagerTest.php b/tests/unit/Theme/ThemeManagerTest.php index fd175ca220..8f79d9c7f7 100644 --- a/tests/unit/Theme/ThemeManagerTest.php +++ b/tests/unit/Theme/ThemeManagerTest.php @@ -54,11 +54,6 @@ class ThemeManagerTest extends AbstractTestCase $tm->initializeTheme(); $themes = $tm->getThemesArray(); self::assertArrayHasKey(0, $themes); - self::assertIsArray($themes[0]); - self::assertArrayHasKey('id', $themes[0]); - self::assertArrayHasKey('name', $themes[0]); - self::assertArrayHasKey('version', $themes[0]); - self::assertArrayHasKey('is_active', $themes[0]); } /**