New throwable settings

visual-ideas · Feb 26, 2024 · a03983f · a03983f
1 parent 29261eb
commit a03983f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/LaravelSiteSettings.php b/src/LaravelSiteSettings.php
@@ -10,12 +10,17 @@
 class LaravelSiteSettings implements ConfigContract
 {
 
-    protected array $items;
+    protected array $items = [];
 
     public function __construct()
     {
 
-        $this->items = cache()->rememberForever(config('laravelsitesettings.cache_key'), function () {
+        if (cache()->has(config('laravelsitesettings.cache_key'))) {
+            $this->items = cache()->get(config('laravelsitesettings.cache_key'));
+            return;
+        }
+
+        try {
             $withGroup = SettingGroup::all()
                 ->load('settings')
                 ->keyBy('slug')
@@ -27,8 +32,10 @@ public function __construct()
                 ->pluck('value', 'slug')
                 ->toArray();
 
-            return array_merge($withGroup, $withoutGroup);
-        });
+            $this->items = array_merge($withGroup, $withoutGroup); 
+        } catch (\Throwable $e) {
+            $this->items = [];
+        }
 
     }