Service Provider: Move loadViewsFrom() to boot()

This method relies on the "view" being bound in the IoC container.
This is only guaranteed after all register() methods have run, thus
it should be done in boot().
This commit is contained in:
Franz Liedke 2018-04-25 00:05:12 +02:00
parent 076288db21
commit 24fd2f32c7
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4

View File

@ -53,8 +53,6 @@ class InstallServiceProvider extends AbstractServiceProvider
$this->app->singleton('flarum.install.routes', function () {
return new RouteCollection;
});
$this->loadViewsFrom(__DIR__.'/../../views/install', 'flarum.install');
}
/**
@ -62,6 +60,8 @@ class InstallServiceProvider extends AbstractServiceProvider
*/
public function boot()
{
$this->loadViewsFrom(__DIR__.'/../../views/install', 'flarum.install');
$this->populateRoutes($this->app->make('flarum.install.routes'));
}