Skip to content

Fix/fix/theming legacy app config #56626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 2 commits into from
Nov 25, 2025
Merged

Fix/fix/theming legacy app config #56626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad5f23f
test: add test for theming config casting
icewind1991 Nov 24, 2025
561d3de
fix: fix theming config value casting
icewind1991 Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/theming/lib/ThemingDefaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,12 @@ public function increaseCacheBuster(): void {
* @param string $value
*/
public function set($setting, $value): void {
switch ($value) {
switch ($setting) {
case ConfigLexicon::CACHE_BUSTER:
$this->appConfig->setAppValueInt(ConfigLexicon::CACHE_BUSTER, (int)$value);
break;
case ConfigLexicon::USER_THEMING_DISABLED:
$value = $value === 'true' || $value === 'yes' || $value === '1';
$value = in_array($value, ['1', 'true', 'yes', 'on']);
$this->appConfig->setAppValueBool(ConfigLexicon::USER_THEMING_DISABLED, $value);
break;
default:
Expand Down
36 changes: 34 additions & 2 deletions apps/theming/tests/ThemingDefaultsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
namespace OCA\Theming\Tests;

use OCA\Theming\ConfigLexicon;
use OCA\Theming\ImageManager;
use OCA\Theming\Service\BackgroundService;
use OCA\Theming\ThemingDefaults;
Expand Down Expand Up @@ -728,7 +729,7 @@ public function testGetScssVariables(): void {
'theming-favicon-mime' => '\'jpeg\'',
'image-logoheader' => "url('custom-logoheader?v=0')",
'image-favicon' => "url('custom-favicon?v=0')",
'has-legal-links' => 'false'
'has-legal-links' => 'false',
];
$this->assertEquals($expected, $this->template->getScssVariables());
}
Expand Down Expand Up @@ -798,7 +799,7 @@ public static function dataReplaceImagePath(): array {
['core', 'test.png', false],
['core', 'manifest.json'],
['core', 'favicon.ico'],
['core', 'favicon-touch.png']
['core', 'favicon-touch.png'],
];
}

Expand All @@ -825,4 +826,35 @@ public function testReplaceImagePath(string $app, string $image, string|bool $re
}
$this->assertEquals($result, $this->template->replaceImagePath($app, $image));
}

public static function setTypesProvider(): array {
return [
[ConfigLexicon::BASE_URL, 'example.com', 'example.com'],
[ConfigLexicon::USER_THEMING_DISABLED, 'no', false],
[ConfigLexicon::USER_THEMING_DISABLED, 'true', true],
];
}

#[\PHPUnit\Framework\Attributes\DataProvider('setTypesProvider')]
public function testSetTypes(string $setting, string $value, mixed $expected): void {
$setValue = null;
$cb = function ($setting, $value) use (&$setValue) {
if ($setting !== ConfigLexicon::CACHE_BUSTER) {
$setValue = $value;
}
return true;
};
$this->appConfig
->method('setAppValueBool')
->willReturnCallback($cb);
$this->appConfig
->method('setAppValueString')
->willReturnCallback($cb);
$this->appConfig
->method('setAppValueInt')
->willReturnCallback($cb);

$this->template->set($setting, $value);
$this->assertEquals($expected, $setValue);
}
}
Loading