1
0
mirror of https://github.com/flarum/core.git synced 2025-10-15 00:44:40 +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

@@ -12,9 +12,9 @@
namespace Flarum\Http\Middleware;
use Flarum\Locale\LocaleManager;
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 SetLocale implements MiddlewareInterface
{
@@ -31,10 +31,7 @@ class SetLocale implements MiddlewareInterface
$this->locales = $locales;
}
/**
* {@inheritdoc}
*/
public function __invoke(Request $request, Response $response, callable $out = null)
public function process(Request $request, DelegateInterface $delegate)
{
$actor = $request->getAttribute('actor');
@@ -48,6 +45,6 @@ class SetLocale implements MiddlewareInterface
$this->locales->setLocale($locale);
}
return $out ? $out($request, $response) : $response;
return $delegate->process($request);
}
}