refactor: update extension namespace

composer.json

@@ -45,7 +45,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "ACPL\\FlarumCache\\": "src/"
+            "ACPL\\FlarumLSCache\\": "src/"
         }
     },
     "extra": {

extend.php

@@ -9,24 +9,24 @@
  * file that was distributed with this source code.
  */
 
-namespace ACPL\FlarumCache;
+namespace ACPL\FlarumLSCache;
 
-use ACPL\FlarumCache\Api\Controller\{LSCacheCsrfResponseController, PurgeLSCacheController};
-use ACPL\FlarumCache\Command\LSCacheClearCommand;
-use ACPL\FlarumCache\Compatibility\{
+use ACPL\FlarumLSCache\Api\Controller\{LSCacheCsrfResponseController, PurgeLSCacheController};
+use ACPL\FlarumLSCache\Command\LSCacheClearCommand;
+use ACPL\FlarumLSCache\Compatibility\{
     ClarkWinkelmann\AuthorChange\ClarkWinkelmannAuthorChangeEventSubscriber,
     Flarum\Likes\FlarumLikesEventSubscriber,
     Flarum\Tags\FlarumTagsEventSubscriber,
     FriendsOfFlarum\Masquerade\FofMasqueradePurgeCacheMiddleware,
     v17development\FlarumBlog\FlarumBlogEventSubscriber
 };
-use ACPL\FlarumCache\Listener\{
+use ACPL\FlarumLSCache\Listener\{
     ClearingCacheListener,
     DiscussionEventSubscriber,
     PostEventSubscriber,
     UserEventSubscriber
 };
-use ACPL\FlarumCache\Middleware\{
+use ACPL\FlarumLSCache\Middleware\{
     CacheControlMiddleware,
     LSTagsMiddleware,
     LoginMiddleware,

migrations/2023_05_16_000001_update_htaccess.php

@@ -1,6 +1,6 @@
 <?php
 
-use ACPL\FlarumCache\Utility\HtaccessManager;
+use ACPL\FlarumLSCache\Utility\HtaccessManager;
 use Flarum\Foundation\Paths;
 use Flarum\Http\CookieFactory;
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -22,5 +22,5 @@ function lsCacheGetHtaccessManager(): HtaccessManager
     'down' => function () {
         $htaccessManager = lsCacheGetHtaccessManager();
         $htaccessManager->removeLsCacheBlock();
-    }
+    },
 ];

src/Api/Controller/LSCacheCsrfResponseController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Api\Controller;
+namespace ACPL\FlarumLSCache\Api\Controller;
 
 use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;

src/Api/Controller/PurgeLSCacheController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Api\Controller;
+namespace ACPL\FlarumLSCache\Api\Controller;
 
-use ACPL\FlarumCache\LSCacheHeader;
+use ACPL\FlarumLSCache\LSCacheHeader;
 use Flarum\Http\RequestUtil;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Exception\PermissionDeniedException;

src/Command/LSCacheClearCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Command;
+namespace ACPL\FlarumLSCache\Command;
 
 use Flarum\Api\ApiKey;
 use Flarum\Console\AbstractCommand;

src/Compatibility/ClarkWinkelmann/AuthorChange/ClarkWinkelmannAuthorChangeEventSubscriber.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\ClarkWinkelmann\AuthorChange;
+namespace ACPL\FlarumLSCache\Compatibility\ClarkWinkelmann\AuthorChange;
 
-use ACPL\FlarumCache\Listener\AbstractCachePurgeSubscriber;
+use ACPL\FlarumLSCache\Listener\AbstractCachePurgeSubscriber;
 use ClarkWinkelmann\AuthorChange\Event\DiscussionCreateDateChanged;
 use ClarkWinkelmann\AuthorChange\Event\DiscussionUserChanged;
 use ClarkWinkelmann\AuthorChange\Event\PostCreateDateChanged;

src/Compatibility/Flarum/Likes/FlarumLikesEventSubscriber.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\Flarum\Likes;
+namespace ACPL\FlarumLSCache\Compatibility\Flarum\Likes;
 
-use ACPL\FlarumCache\Listener\AbstractCachePurgeSubscriber;
+use ACPL\FlarumLSCache\Listener\AbstractCachePurgeSubscriber;
 use Flarum\Likes\Event\PostWasLiked;
 use Flarum\Likes\Event\PostWasUnliked;
 use Illuminate\Contracts\Events\Dispatcher;

src/Compatibility/Flarum/Tags/FlarumTagsEventSubscriber.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\Flarum\Tags;
+namespace ACPL\FlarumLSCache\Compatibility\Flarum\Tags;
 
-use ACPL\FlarumCache\Listener\AbstractCachePurgeSubscriber;
+use ACPL\FlarumLSCache\Listener\AbstractCachePurgeSubscriber;
 use Flarum\Discussion\Discussion;
 use Flarum\Discussion\Event\Deleted as DiscussionDeleted;
 use Flarum\Discussion\Event\Hidden as DiscussionHidden;

src/Compatibility/FriendsOfFlarum/Masquerade/FofMasqueradePurgeCacheMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\FriendsOfFlarum\Masquerade;
+namespace ACPL\FlarumLSCache\Compatibility\FriendsOfFlarum\Masquerade;
 
-use ACPL\FlarumCache\Middleware\AbstractPurgeCacheMiddleware;
+use ACPL\FlarumLSCache\Middleware\AbstractPurgeCacheMiddleware;
 use Flarum\User\User;
 use Psr\Http\Message\ServerRequestInterface;
 

src/Compatibility/v17development/FlarumBlog/FlarumBlogEventSubscriber.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ACPL\FlarumCache\Compatibility\v17development\FlarumBlog;
+namespace ACPL\FlarumLSCache\Compatibility\v17development\FlarumBlog;
 
-use ACPL\FlarumCache\Event\LSCachePurging;
-use ACPL\FlarumCache\Listener\AbstractCachePurgeSubscriber;
+use ACPL\FlarumLSCache\Event\LSCachePurging;
+use ACPL\FlarumLSCache\Listener\AbstractCachePurgeSubscriber;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Support\Arr;
 use V17Development\FlarumBlog\Event\BlogMetaSaving;

src/Event/LSCachePurging.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Event;
+namespace ACPL\FlarumLSCache\Event;
 
 use Flarum\User\User;
 

src/LSCache.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache;
+namespace ACPL\FlarumLSCache;
 
 use Illuminate\Support\Str;
 

src/LSCacheHeader.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache;
+namespace ACPL\FlarumLSCache;
 
 final class LSCacheHeader
 {

src/Listener/AbstractCachePurgeListener.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
-use ACPL\FlarumCache\Utility\LSCachePurger;
+use ACPL\FlarumLSCache\Utility\LSCachePurger;
 use Illuminate\Contracts\Events\Dispatcher;
 
 abstract class AbstractCachePurgeListener

src/Listener/AbstractCachePurgeSubscriber.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
-use ACPL\FlarumCache\Utility\LSCachePurger;
+use ACPL\FlarumLSCache\Utility\LSCachePurger;
 use Illuminate\Contracts\Events\Dispatcher;
 
 abstract class AbstractCachePurgeSubscriber

src/Listener/ClearingCacheListener.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
-use ACPL\FlarumCache\Utility\LSCachePurger;
+use ACPL\FlarumLSCache\Utility\LSCachePurger;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Events\Dispatcher;
 

src/Listener/DiscussionEventSubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
 use Flarum\Discussion\Event\Deleted;
 use Flarum\Discussion\Event\Hidden;

src/Listener/PostEventSubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
 use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Post\Event\Deleted;

src/Listener/UpdateSettingsListener.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
-use ACPL\FlarumCache\Utility\HtaccessManager;
-use ACPL\FlarumCache\Utility\LSCachePurger;
+use ACPL\FlarumLSCache\Utility\HtaccessManager;
+use ACPL\FlarumLSCache\Utility\LSCachePurger;
 use Flarum\Settings\Event\Saved;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 

src/Listener/UserEventSubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ACPL\FlarumCache\Listener;
+namespace ACPL\FlarumLSCache\Listener;
 
 use Flarum\User\Event\AvatarChanged;
 use Flarum\User\Event\Deleted;

src/Middleware/AbstractCacheTagsMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCacheHeader;
+use ACPL\FlarumLSCache\LSCacheHeader;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\{MiddlewareInterface, RequestHandlerInterface};
 

src/Middleware/AbstractPurgeCacheMiddleware.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\Event\LSCachePurging;
-use ACPL\FlarumCache\LSCacheHeader;
-use ACPL\FlarumCache\Utility\LSCachePurger;
+use ACPL\FlarumLSCache\Event\LSCachePurging;
+use ACPL\FlarumLSCache\LSCacheHeader;
+use ACPL\FlarumLSCache\Utility\LSCachePurger;
 use Flarum\Http\RequestUtil;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Events\Dispatcher;

src/Middleware/CacheControlMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCacheHeader;
+use ACPL\FlarumLSCache\LSCacheHeader;
 use Flarum\Http\RequestUtil;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;

src/Middleware/LSTagsMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCache;
+use ACPL\FlarumLSCache\LSCache;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\RequestHandlerInterface;
 

src/Middleware/LoginMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCache;
+use ACPL\FlarumLSCache\LSCache;
 use Dflydev\FigCookies\FigResponseCookies;
 use Flarum\Http\CookieFactory;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;

src/Middleware/LogoutMiddleware.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCache;
-use ACPL\FlarumCache\LSCacheHeader;
+use ACPL\FlarumLSCache\LSCache;
+use ACPL\FlarumLSCache\LSCacheHeader;
 use Dflydev\FigCookies\FigResponseCookies;
 use Flarum\Http\CookieFactory;
 use Illuminate\Contracts\Session\Session;

src/Middleware/PurgeCacheMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCache;
+use ACPL\FlarumLSCache\LSCache;
 use Illuminate\Support\Str;
 use Psr\Http\Message\ServerRequestInterface;
 

src/Middleware/VaryCookieMiddleware.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ACPL\FlarumCache\Middleware;
+namespace ACPL\FlarumLSCache\Middleware;
 
-use ACPL\FlarumCache\LSCache;
-use ACPL\FlarumCache\LSCacheHeader;
+use ACPL\FlarumLSCache\LSCache;
+use ACPL\FlarumLSCache\LSCacheHeader;
 use Dflydev\FigCookies\FigResponseCookies;
 use Flarum\Http\CookieFactory;
 use Flarum\Http\RequestUtil;

src/Utility/HtaccessManager.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ACPL\FlarumCache\Utility;
+namespace ACPL\FlarumLSCache\Utility;
 
-use ACPL\FlarumCache\LSCache;
+use ACPL\FlarumLSCache\LSCache;
 use Flarum\Foundation\Paths;
 use Flarum\Http\CookieFactory;
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -59,8 +59,8 @@ private function generateLsCacheBlock(): string
                 'RewriteRule .* - [E="Cache-Vary:'.implode(',', [
                     $this->cookie->getName(LSCache::VARY_COOKIE),
                     $this->cookie->getName('remember'),
-                    'locale'
-                ]).'"]'
+                    'locale',
+                ]).'"]',
             );
 
         // In the extend.php, there is an extender for default settings,

src/Utility/LSCachePurger.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace ACPL\FlarumCache\Utility;
+namespace ACPL\FlarumLSCache\Utility;
 
-use ACPL\FlarumCache\Command\LSCacheClearCommand;
-use ACPL\FlarumCache\Event\LSCachePurging;
+use ACPL\FlarumLSCache\Command\LSCacheClearCommand;
+use ACPL\FlarumLSCache\Event\LSCachePurging;
 use Illuminate\Events\Dispatcher;
 use Symfony\Component\Console\{Input\ArrayInput, Output\NullOutput};