From d8f967eaccf4fc8a8ecd62faa7eab4aff7bedd4b Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 29 May 2023 14:03:35 +0000 Subject: [PATCH] Apply fixes from StyleCI --- extend.php | 1 - src/Middleware/LoginMiddleware.php | 8 ++++---- src/Middleware/LogoutMiddleware.php | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/extend.php b/extend.php index 02d15a1..0195f6b 100644 --- a/extend.php +++ b/extend.php @@ -24,7 +24,6 @@ use Flarum\Extend; use Flarum\Foundation\Event\ClearingCache; use Flarum\Http\Middleware\CheckCsrfToken; -use Flarum\Http\Middleware\StartSession; use Flarum\Settings\Event\Saved; return [ diff --git a/src/Middleware/LoginMiddleware.php b/src/Middleware/LoginMiddleware.php index 659d6b8..11e320d 100644 --- a/src/Middleware/LoginMiddleware.php +++ b/src/Middleware/LoginMiddleware.php @@ -5,10 +5,8 @@ use ACPL\FlarumCache\LSCache; use Dflydev\FigCookies\FigResponseCookies; use Flarum\Http\CookieFactory; -use Flarum\Http\UrlGenerator; use Illuminate\Contracts\Config\Repository as ConfigRepository; use Illuminate\Contracts\Session\Session; -use Laminas\Diactoros\Uri; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface; @@ -43,7 +41,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface private function withVaryCookie(Response $response, Session $session): Response { - return FigResponseCookies::set($response, - $this->cookie->make(LSCache::VARY_COOKIE, $session->token(), $this->session['lifetime'] * 60)); + return FigResponseCookies::set( + $response, + $this->cookie->make(LSCache::VARY_COOKIE, $session->token(), $this->session['lifetime'] * 60) + ); } } diff --git a/src/Middleware/LogoutMiddleware.php b/src/Middleware/LogoutMiddleware.php index a69e1dd..cba8254 100644 --- a/src/Middleware/LogoutMiddleware.php +++ b/src/Middleware/LogoutMiddleware.php @@ -5,11 +5,8 @@ use ACPL\FlarumCache\LSCache; use ACPL\FlarumCache\LSCacheHeadersEnum; use Dflydev\FigCookies\FigResponseCookies; -use Flarum\Http\CookieFactory; -use Flarum\Http\UrlGenerator; use Illuminate\Contracts\Session\Session; use Laminas\Diactoros\Response\RedirectResponse; -use Laminas\Diactoros\Uri; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface;