1
0
mirror of https://github.com/flarum/core.git synced 2025-10-18 02:06:08 +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,16 +12,13 @@
namespace Flarum\Http\Middleware;
use Flarum\Http\AccessToken;
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 RememberFromCookie implements MiddlewareInterface
{
/**
* {@inheritdoc}
*/
public function __invoke(Request $request, Response $response, callable $out = null)
public function process(Request $request, DelegateInterface $delegate)
{
$id = array_get($request->getCookieParams(), 'flarum_remember');
@@ -36,6 +33,6 @@ class RememberFromCookie implements MiddlewareInterface
}
}
return $out ? $out($request, $response) : $response;
return $delegate->process($request);
}
}