1
0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00

Update Stratigility, use http-interop middleware

This commit is contained in:
Franz Liedke
2018-03-18 13:52:16 +01:00
parent d5ef9486d0
commit 9d30be1617
19 changed files with 72 additions and 101 deletions

View File

@@ -46,7 +46,6 @@ class AdminServiceProvider extends AbstractServiceProvider
$this->app->singleton('flarum.admin.middleware', function ($app) {
$pipe = new MiddlewarePipe;
$pipe->raiseThrowables();
// All requests should first be piped through our global error handler
$debugMode = ! $app->isUpToDate() || $app->inDebugMode();

View File

@@ -12,21 +12,18 @@
namespace Flarum\Admin\Middleware;
use Flarum\User\AssertPermissionTrait;
use Psr\Http\Message\ResponseInterface as Response;
use Interop\Http\ServerMiddleware\DelegateInterface;
use Interop\Http\ServerMiddleware\MiddlewareInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Stratigility\MiddlewareInterface;
class RequireAdministrateAbility implements MiddlewareInterface
{
use AssertPermissionTrait;
/**
* {@inheritdoc}
*/
public function __invoke(Request $request, Response $response, callable $out = null)
public function process(Request $request, DelegateInterface $delegate)
{
$this->assertAdmin($request->getAttribute('actor'));
return $out ? $out($request, $response) : $response;
return $delegate->process($request);
}
}