github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-22 06:39:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Register database and cache implementations as binding for the settings repository

Browse Source
This commit is contained in:
Franz Liedke
2015-07-15 23:54:56 +02:00
parent 1675d26723
commit 6a7889934c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core.php
View File

@ -18,10 +18,6 @@ class Core
return $default; return $default;
} }
if (is_null($value = app('flarum.db')->table('config')->where('key', $key)->pluck('value'))) { return app('Flarum\Core\Settings\SettingsRepository')->get($key, $default);
$value = $default;
}
return $value;
} }
} }

10
src/Core/CoreServiceProvider.php
View File

@ -1,5 +1,7 @@
<?php namespace Flarum\Core; <?php namespace Flarum\Core;
use Flarum\Core\Settings\CachedSettingsRepository;
use Flarum\Core\Settings\DatabaseSettingsRepository;
use Flarum\Core\Users\User; use Flarum\Core\Users\User;
use Flarum\Support\ServiceProvider; use Flarum\Support\ServiceProvider;
use Flarum\Extend; use Flarum\Extend;
@ -31,6 +33,14 @@ class CoreServiceProvider extends ServiceProvider
*/ */
public function register() 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'); $this->app->singleton('flarum.forum', 'Flarum\Core\Forum');
// TODO: probably use Illuminate's AggregateServiceProvider // TODO: probably use Illuminate's AggregateServiceProvider