Merge pull request #16 from android-com-pl/analysis-lZLJEr

Apply fixes from StyleCI
android-com-pl · Jun 16, 2023 · b6be422 · b6be422
2 parents 111915a + 008df91
commit b6be422
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/extend.php b/extend.php
@@ -74,7 +74,7 @@
     // Extensions
     (new Extend\Conditional)
         ->whenExtensionEnabled('flarum-tags', [
-            (new Extend\Middleware('api'))->add(FlarumTagsPurgeMiddleware ::class),
+            (new Extend\Middleware('api'))->add(FlarumTagsPurgeMiddleware::class),
         ])
         ->whenExtensionEnabled('fof-masquerade', [
             (new Extend\Middleware('api'))->add(FofMasqueradeMiddleware::class),

diff --git a/src/Abstract/PurgeMiddleware.php b/src/Abstract/PurgeMiddleware.php
@@ -40,13 +40,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         // If this is just an update of the last read post, there is no point in clearing the public cache
         if ($this->isDiscussion && Arr::get(
-                $request->getParsedBody(),
-                'data.attributes.lastReadPostNumber')
+            $request->getParsedBody(),
+            'data.attributes.lastReadPostNumber'
+        )
         ) {
             return $response;
         }
 
-
         return $this->processPurge($request, $handler, $response);
     }
 
@@ -56,7 +56,6 @@ abstract protected function processPurge(
         ResponseInterface $response
     ): ResponseInterface;
 
-
     protected function addPurgeParamsToResponse(ResponseInterface $response, array $newPurgeParams): ResponseInterface
     {
         if ($response->hasHeader(LSCacheHeadersEnum::PURGE)) {

diff --git a/src/Compatibility/FofMasquerade/Middleware.php b/src/Compatibility/FofMasquerade/Middleware.php
@@ -8,7 +8,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-
 class Middleware extends PurgeMiddleware
 {
     protected function processPurge(
@@ -19,6 +18,7 @@ protected function processPurge(
         // Purge user profile cache when updating FriendsOfFlarum/masquerade fields
         if ($this->currentRouteName === 'masquerade.api.configure.save') {
             $user = RequestUtil::getActor($request);
+
             return $this->addPurgeParamsToResponse(
                 $response,
                 [

diff --git a/src/Middleware/LSCachePurgeMiddleware.php b/src/Middleware/LSCachePurgeMiddleware.php
@@ -4,16 +4,11 @@
 
 use ACPL\FlarumCache\Abstract\PurgeMiddleware;
 use ACPL\FlarumCache\LSCache;
-use ACPL\FlarumCache\LSCacheHeadersEnum;
-use Flarum\Discussion\Discussion;
-use Flarum\Http\RequestUtil;
 use Flarum\Post\Post;
-use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 class LSCachePurgeMiddleware extends PurgeMiddleware
@@ -39,7 +34,7 @@ protected function processPurge(
             if (! empty($purgeList)) {
                 $purgeList = explode("\n", $purgeList);
                 // Get only valid items
-                $purgeList = array_filter($purgeList, fn($item) => Str::startsWith($item, ['/', 'tag=']));
+                $purgeList = array_filter($purgeList, fn ($item) => Str::startsWith($item, ['/', 'tag=']));
                 $purgeParams = array_merge($purgeParams, $purgeList);
             }
 

diff --git a/src/Middleware/LSTagsMiddleware.php b/src/Middleware/LSTagsMiddleware.php
@@ -4,7 +4,6 @@
 
 use ACPL\FlarumCache\LSCache;
 use ACPL\FlarumCache\LSCacheHeadersEnum;
-use Laminas\Diactoros\Response\HtmlResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;