Merge remote-tracking branch 'origin/main'

android-com-pl · May 29, 2023 · 6608000 · 6608000
2 parents b7aa755 + 647707f
commit 6608000
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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;