From ba34c7778fe3a0971ddd86095b8dbba1ffbefdfc Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 5 Aug 2026 11:25:15 +0200 Subject: [PATCH] fix(SettingsManager): Adapt to change in master Signed-off-by: Carl Schwan --- lib/FilteredSettingsManager.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/FilteredSettingsManager.php b/lib/FilteredSettingsManager.php index ef85197a..3583b288 100644 --- a/lib/FilteredSettingsManager.php +++ b/lib/FilteredSettingsManager.php @@ -22,23 +22,26 @@ public function __construct( ) { } - private function isSettingAllowed(string $setting): bool { - $appId = App::getAppIdForClass($setting); + private function isSettingAllowed(string $setting, ?string $appId): bool { + // TODO when we depend on NC 34, drop App::getAppIdForClass + $appId = $appId ?? App::getAppIdForClass($setting); return $this->appWhitelist->isAppWhitelisted($appId); } #[\Override] - public function registerSection(string $type, string $section): void { - $this->manager->registerSection($type, $section); + public function registerSection(string $type, string $section, ?string $appId = null): void { + /** @psalm-suppress TooManyArguments Starting with NC34, we have 3 args */ + $this->manager->registerSection($type, $section, $appId); } #[\Override] - public function registerSetting(string $type, string $setting): void { - if (!$this->isSettingAllowed($setting)) { + public function registerSetting(string $type, string $setting, ?string $appId = null): void { + if (!$this->isSettingAllowed($setting, $appId)) { return; } - $this->manager->registerSetting($type, $setting); + /** @psalm-suppress TooManyArguments Starting with NC34, we have 3 args */ + $this->manager->registerSetting($type, $setting, $appId); } #[\Override]