github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Load extensions after other service providers 

And let them know what kind of request this is via a “type” binding on
the container. Not sure if there is a better way to do this. But they
need to know somehow, so extenders can act selectively (e.g. the
ForumClient extender should only act on forum requests, not on API or
admin requests)
pull/9/head
Toby Zerner 2015-06-18 17:46:49 +09:30
parent e75f8f2ba2
commit 07856bd53e
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin.php
View File

@ -9,7 +9,9 @@ use Zend\Stratigility\MiddlewarePipe;
$app = require __DIR__.'/system/bootstrap.php'; $app = require __DIR__.'/system/bootstrap.php';
// Set up everything we need for the frontend // Set up everything we need for the frontend
$app->instance('type', 'admin');
$app->register('Flarum\Admin\AdminServiceProvider'); $app->register('Flarum\Admin\AdminServiceProvider');
$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
$admin = new MiddlewarePipe(); $admin = new MiddlewarePipe();
$admin->pipe($app->make('Flarum\Admin\Middleware\LoginWithCookieAndCheckAdmin')); $admin->pipe($app->make('Flarum\Admin\Middleware\LoginWithCookieAndCheckAdmin'));

2
api.php
View File

@ -9,7 +9,9 @@ use Zend\Stratigility\MiddlewarePipe;
$app = require __DIR__.'/system/bootstrap.php'; $app = require __DIR__.'/system/bootstrap.php';
// Set up everything we need for the API // Set up everything we need for the API
$app->instance('type', 'api');
$app->register('Flarum\Api\ApiServiceProvider'); $app->register('Flarum\Api\ApiServiceProvider');
$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
// Build a middleware pipeline for the API // Build a middleware pipeline for the API
$api = new MiddlewarePipe(); $api = new MiddlewarePipe();

2
index.php
View File

@ -9,7 +9,9 @@ use Zend\Stratigility\MiddlewarePipe;
$app = require __DIR__.'/system/bootstrap.php'; $app = require __DIR__.'/system/bootstrap.php';
// Set up everything we need for the frontend // Set up everything we need for the frontend
$app->instance('type', 'forum');
$app->register('Flarum\Forum\ForumServiceProvider'); $app->register('Flarum\Forum\ForumServiceProvider');
$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
// Build a middleware pipeline for Flarum // Build a middleware pipeline for Flarum
$flarum = new MiddlewarePipe(); $flarum = new MiddlewarePipe();

1
system/config/app.php
View File

@ -133,7 +133,6 @@ return [
'Illuminate\View\ViewServiceProvider', 'Illuminate\View\ViewServiceProvider',
'Flarum\Core\CoreServiceProvider', 'Flarum\Core\CoreServiceProvider',
'Flarum\Support\Extensions\ExtensionsServiceProvider',
'Flarum\Console\ConsoleServiceProvider', 'Flarum\Console\ConsoleServiceProvider',