From a683f0ea4260bb34ab7369cd28ab05cbf5d07f5f Mon Sep 17 00:00:00 2001 From: cp6 Date: Fri, 31 Mar 2023 11:56:18 +1100 Subject: [PATCH] Updated Settings.php getSettings() now uses Eloquent rather than DB Gave getSettings() return type of Settings --- app/Models/Settings.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Models/Settings.php b/app/Models/Settings.php index b4792e6..0a2760c 100644 --- a/app/Models/Settings.php +++ b/app/Models/Settings.php @@ -5,7 +5,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Session; class Settings extends Model @@ -16,11 +15,10 @@ class Settings extends Model protected $fillable = ['id', 'show_versions_footer', 'show_servers_public', 'show_server_value_ip', 'show_server_value_hostname', 'show_server_value_provider', 'show_server_value_location', 'show_server_value_price', 'show_server_value_yabs', 'save_yabs_as_txt', 'default_currency', 'default_server_os', 'due_soon_amount', 'recently_added_amount', 'dark_mode', 'dashboard_currency', 'sort_on', 'favicon']; - public static function getSettings() + public static function getSettings(): Settings { return Cache::remember('settings', now()->addWeek(1), function () { - return DB::table('settings')->where('id', '=', 1) - ->first(); + return self::where('id', 1)->first(); }); } @@ -72,5 +70,4 @@ class Settings extends Model return ['created_at', 'desc']; } - }