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

Frontends: Populate default routes only when they are resolved

Browse Source
This commit is contained in:
Franz Liedke 2018-12-19 21:55:58 +01:00
parent 6d1349e861
commit c923d23f32
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/src/Admin/AdminServiceProvider.php
View File

@ -44,6 +44,10 @@ class AdminServiceProvider extends AbstractServiceProvider
return new RouteCollection; return new RouteCollection;
}); });
$this->app->afterResolving('flarum.admin.routes', function (RouteCollection $routes) {
$this->populateRoutes($routes);
});
$this->app->singleton('flarum.admin.middleware', function (Application $app) { $this->app->singleton('flarum.admin.middleware', function (Application $app) {
$pipe = new MiddlewarePipe; $pipe = new MiddlewarePipe;
@ -103,8 +107,6 @@ class AdminServiceProvider extends AbstractServiceProvider
*/ */
public function boot() public function boot()
{ {
$this->populateRoutes($this->app->make('flarum.admin.routes'));
$this->loadViewsFrom(__DIR__.'/../../views', 'flarum.admin'); $this->loadViewsFrom(__DIR__.'/../../views', 'flarum.admin');
$events = $this->app->make('events'); $events = $this->app->make('events');

6
framework/core/src/Forum/ForumServiceProvider.php
View File

@ -49,6 +49,10 @@ class ForumServiceProvider extends AbstractServiceProvider
return new RouteCollection; return new RouteCollection;
}); });
$this->app->afterResolving('flarum.forum.routes', function (RouteCollection $routes) {
$this->populateRoutes($routes);
});
$this->app->singleton('flarum.forum.middleware', function (Application $app) { $this->app->singleton('flarum.forum.middleware', function (Application $app) {
$pipe = new MiddlewarePipe; $pipe = new MiddlewarePipe;
@ -110,8 +114,6 @@ class ForumServiceProvider extends AbstractServiceProvider
*/ */
public function boot() public function boot()
{ {
$this->populateRoutes($this->app->make('flarum.forum.routes'));
$this->loadViewsFrom(__DIR__.'/../../views', 'flarum.forum'); $this->loadViewsFrom(__DIR__.'/../../views', 'flarum.forum');
$this->app->make('view')->share([ $this->app->make('view')->share([