Aligned setting helper with new get method changes

Also removed old unsused facade that existed for settings.

diff --git a/app/Config/app.php b/app/Config/app.php
index c97e36e62098f48e536444b8d07a48965e29db9d..ea9738da443814a7499e946bf22b8f7a03b7aaed 100755 (executable)
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -183,7 +183,6 @@ return [
 
         // Custom BookStack
         'Activity' => BookStack\Facades\Activity::class,
-        'Setting'  => BookStack\Facades\Setting::class,
         'Views'    => BookStack\Facades\Views::class,
         'Images'   => BookStack\Facades\Images::class,
         'Permissions' => BookStack\Facades\Permissions::class,

diff --git a/app/Facades/Setting.php b/app/Facades/Setting.php
deleted file mode 100644 (file)
index 80feef8..0000000
--- a/app/Facades/Setting.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php namespace BookStack\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-class Setting extends Facade
-{
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'setting';
-    }
-}

diff --git a/app/Providers/CustomFacadeProvider.php b/app/Providers/CustomFacadeProvider.php
index b4158187cd5fe5225b68aa013d033d67d05edb30..0918c0aba9f594adb90eff4f29ca71b459b4b9f1 100644 (file)
--- a/app/Providers/CustomFacadeProvider.php
+++ b/app/Providers/CustomFacadeProvider.php
@@ -5,7 +5,6 @@ namespace BookStack\Providers;
 use BookStack\Actions\ActivityService;
 use BookStack\Actions\ViewService;
 use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Settings\SettingService;
 use BookStack\Uploads\ImageService;
 use Illuminate\Support\ServiceProvider;
 
@@ -36,10 +35,6 @@ class CustomFacadeProvider extends ServiceProvider
             return $this->app->make(ViewService::class);
         });
 
-        $this->app->singleton('setting', function () {
-            return $this->app->make(SettingService::class);
-        });
-
         $this->app->singleton('images', function () {
             return $this->app->make(ImageService::class);
         });

diff --git a/app/helpers.php b/app/helpers.php
index c090bfd055acc400e1ad4c46e7059b6c19820f60..c1d72b91da4fb7f5bb3efba3a2de46490ec3dce9 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -79,9 +79,9 @@ function userCanOnAny(string $permission, string $entityClass = null): bool
 
 /**
  * Helper to access system settings.
- * @return bool|string|SettingService
+ * @return mixed|SettingService
  */
-function setting(string $key = null, $default = false)
+function setting(string $key = null, $default = null)
 {
     $settingService = resolve(SettingService::class);