From 93c66d913a44bd0ee3bd29b40d3937a2617b2cf8 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 1 Dec 2019 22:10:58 +0100 Subject: [PATCH] Fix implementations of settings repo interface --- framework/core/src/Settings/OverrideSettingsRepository.php | 2 +- framework/core/src/Settings/UninstalledSettingsRepository.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/core/src/Settings/OverrideSettingsRepository.php b/framework/core/src/Settings/OverrideSettingsRepository.php index fc1a05fcd..4f735c0ba 100644 --- a/framework/core/src/Settings/OverrideSettingsRepository.php +++ b/framework/core/src/Settings/OverrideSettingsRepository.php @@ -35,7 +35,7 @@ class OverrideSettingsRepository implements SettingsRepositoryInterface $this->overrides = $overrides; } - public function all() + public function all(): array { return array_merge($this->inner->all(), $this->overrides); } diff --git a/framework/core/src/Settings/UninstalledSettingsRepository.php b/framework/core/src/Settings/UninstalledSettingsRepository.php index 8ca681524..de1675350 100644 --- a/framework/core/src/Settings/UninstalledSettingsRepository.php +++ b/framework/core/src/Settings/UninstalledSettingsRepository.php @@ -11,7 +11,7 @@ namespace Flarum\Settings; class UninstalledSettingsRepository implements SettingsRepositoryInterface { - public function all() + public function all(): array { return []; }