From 6a7889934cfd0deab7f3e748ebd8ef72578f2713 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 15 Jul 2015 23:54:56 +0200
Subject: [PATCH] Register database and cache implementations as binding for
 the settings repository

---
 src/Core.php                     |  6 +-----
 src/Core/CoreServiceProvider.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Core.php b/src/Core.php
index 8772d1f27..f7ba7546c 100644
--- a/src/Core.php
+++ b/src/Core.php
@@ -18,10 +18,6 @@ class Core
             return $default;
         }
 
-        if (is_null($value = app('flarum.db')->table('config')->where('key', $key)->pluck('value'))) {
-            $value = $default;
-        }
-
-        return $value;
+        return app('Flarum\Core\Settings\SettingsRepository')->get($key, $default);
     }
 }
diff --git a/src/Core/CoreServiceProvider.php b/src/Core/CoreServiceProvider.php
index a33ebda76..cb49ded2b 100644
--- a/src/Core/CoreServiceProvider.php
+++ b/src/Core/CoreServiceProvider.php
@@ -1,5 +1,7 @@
 <?php namespace Flarum\Core;
 
+use Flarum\Core\Settings\CachedSettingsRepository;
+use Flarum\Core\Settings\DatabaseSettingsRepository;
 use Flarum\Core\Users\User;
 use Flarum\Support\ServiceProvider;
 use Flarum\Extend;
@@ -31,6 +33,14 @@ class CoreServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->app->singleton('Flarum\Core\Settings\SettingsRepository', function() {
+            return new CachedSettingsRepository(
+                new DatabaseSettingsRepository(
+                    $this->app->make('Illuminate\Database\ConnectionInterface')
+                )
+            );
+        });
+
         $this->app->singleton('flarum.forum', 'Flarum\Core\Forum');
 
         // TODO: probably use Illuminate's AggregateServiceProvider