refactor: organize extension compatibility middlewares

android-com-pl · Jan 28, 2024 · 53d2dfc · 53d2dfc
1 parent 1f644e7
commit 53d2dfc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -54,6 +54,7 @@
             },
             "optional-dependencies": [
                 "flarum/tags",
+                "flarum/likes",
                 "fof/masquerade"
             ]
         },

diff --git a/extend.php b/extend.php
@@ -14,9 +14,9 @@
 use ACPL\FlarumCache\Api\Controller\LSCacheCsrfResponseController;
 use ACPL\FlarumCache\Api\Controller\PurgeLSCacheController;
 use ACPL\FlarumCache\Command\LSCacheClearCommand;
-use ACPL\FlarumCache\Compatibility\FlarumLikes\FlarumLikesPurgeMiddleware;
-use ACPL\FlarumCache\Compatibility\FlarumTags\FlarumTagsPurgeMiddleware;
-use ACPL\FlarumCache\Compatibility\FofMasquerade\Middleware as FofMasqueradeMiddleware;
+use ACPL\FlarumCache\Compatibility\Flarum\Likes\FlarumLikesPurgeMiddleware;
+use ACPL\FlarumCache\Compatibility\Flarum\Tags\FlarumTagsPurgeMiddleware;
+use ACPL\FlarumCache\Compatibility\FriendsOfFlarum\Masquerade\FofMasqueradePurgeMiddleware;
 use ACPL\FlarumCache\Listener\ClearingCacheListener;
 use ACPL\FlarumCache\Middleware\LoginMiddleware;
 use ACPL\FlarumCache\Middleware\LogoutMiddleware;
@@ -72,7 +72,7 @@
     (new Extend\Console())->command(LSCacheClearCommand::class),
     (new Extend\Event())->listen(ClearingCache::class, ClearingCacheListener::class),
 
-    // Extensions
+    // Compatibility with extensions
     (new Extend\Conditional)
         ->whenExtensionEnabled('flarum-tags', [
             (new Extend\Middleware('api'))->add(FlarumTagsPurgeMiddleware::class),
@@ -81,6 +81,6 @@
             (new Extend\Middleware('api'))->add(FlarumLikesPurgeMiddleware::class),
         ])
         ->whenExtensionEnabled('fof-masquerade', [
-            (new Extend\Middleware('api'))->add(FofMasqueradeMiddleware::class),
+            (new Extend\Middleware('api'))->add(FofMasqueradePurgeMiddleware::class),
         ])
 ];
diff --git a/...larumLikes/FlarumLikesPurgeMiddleware.php → ...arum/Likes/FlarumLikesPurgeMiddleware.php b/...larumLikes/FlarumLikesPurgeMiddleware.php → ...arum/Likes/FlarumLikesPurgeMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\FlarumLikes;
+namespace ACPL\FlarumCache\Compatibility\Flarum\Likes;
 
 use ACPL\FlarumCache\Abstract\PurgeMiddleware;
 use Illuminate\Support\Arr;

diff --git a/.../FlarumTags/FlarumTagsPurgeMiddleware.php → ...Flarum/Tags/FlarumTagsPurgeMiddleware.php b/.../FlarumTags/FlarumTagsPurgeMiddleware.php → ...Flarum/Tags/FlarumTagsPurgeMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\FlarumTags;
+namespace ACPL\FlarumCache\Compatibility\Flarum\Tags;
 
 use ACPL\FlarumCache\Abstract\PurgeMiddleware;
 use Flarum\Discussion\Discussion;

diff --git a/...ompatibility/FofMasquerade/Middleware.php → ...squerade/FofMasqueradePurgeMiddleware.php b/...ompatibility/FofMasquerade/Middleware.php → ...squerade/FofMasqueradePurgeMiddleware.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\FofMasquerade;
+namespace ACPL\FlarumCache\Compatibility\FriendsOfFlarum\Masquerade;
 
 use ACPL\FlarumCache\Abstract\PurgeMiddleware;
 use Flarum\User\User;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-class Middleware extends PurgeMiddleware
+class FofMasqueradePurgeMiddleware extends PurgeMiddleware
 {
     protected function processPurge(
         ServerRequestInterface $request,