mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-19 18:56:44 +02:00
Code Issues Releases Wiki Activity

Change order of bootstrapping

Browse Source 
See commit on flarum/flarum for explanation
This commit is contained in:
Toby Zerner
2015-07-20 18:01:08 +09:30
parent 57650fa648
commit 19fe138770
6 changed files with 52 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/CoreServiceProvider.php
View File

@@ -1,7 +1,5 @@
<?php namespace Flarum\Core;
use Flarum\Core\Settings\MemoryCacheSettingsRepository;
use Flarum\Core\Settings\DatabaseSettingsRepository;
use Flarum\Core\Users\User;
use Flarum\Events\ModelAllow;
use Flarum\Support\ServiceProvider;
@@ -39,14 +37,6 @@ class CoreServiceProvider extends ServiceProvider
*/
public function register()
{
$this->app->singleton('Flarum\Core\Settings\SettingsRepository', function () {
return new MemoryCacheSettingsRepository(
new DatabaseSettingsRepository(
$this->app->make('Illuminate\Database\ConnectionInterface')
)
);
});
$this->app->singleton('flarum.forum', 'Flarum\Core\Forum');
// TODO: probably use Illuminate's AggregateServiceProvider

22
src/Core/Settings/SettingsServiceProvider.php Normal file
View File

@@ -0,0 +1,22 @@
<?php namespace Flarum\Core\Settings;
use Flarum\Support\ServiceProvider;
class SettingsServiceProvider extends ServiceProvider
{
/**
* Register the service provider.
*
* @return void
*/
public function register()
{
$this->app->singleton('Flarum\Core\Settings\SettingsRepository', function () {
return new MemoryCacheSettingsRepository(
new DatabaseSettingsRepository(
$this->app->make('Illuminate\Database\ConnectionInterface')
)
);
});
}
}