Merge pull request #1941 from alissn/DeleteCache

Delete cache of module_status.json
nWidart · Sep 14, 2024 · 27d90b2 · 27d90b2
2 parents f183d64 + f1badf4
commit 27d90b2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 80 deletions.
diff --git a/config/config.php b/config/config.php
@@ -247,21 +247,6 @@
         'composer-output' => false,
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Caching
-    |--------------------------------------------------------------------------
-    |
-    | Here is the config for setting up the caching feature.
-    |
-    */
-    'cache' => [
-        'enabled' => env('MODULES_CACHE_ENABLED', false),
-        'driver' => env('MODULES_CACHE_DRIVER', 'file'),
-        'key' => env('MODULES_CACHE_KEY', 'laravel-modules'),
-        'lifetime' => env('MODULES_CACHE_LIFETIME', 60),
-    ],
-
     /*
     |--------------------------------------------------------------------------
     | Choose what laravel-modules will register as custom namespaces.
@@ -290,8 +275,6 @@
         'file' => [
             'class' => FileActivator::class,
             'statuses-file' => base_path('modules_statuses.json'),
-            'cache-key' => 'activator.installed',
-            'cache-lifetime' => 604800,
         ],
     ],
 

diff --git a/src/Activators/FileActivator.php b/src/Activators/FileActivator.php
@@ -12,13 +12,6 @@
 
 class FileActivator implements ActivatorInterface
 {
-    /**
-     * Laravel cache instance
-     *
-     * @var CacheManager
-     */
-    private $cache;
-
     /**
      * Laravel Filesystem instance
      *
@@ -33,16 +26,6 @@ class FileActivator implements ActivatorInterface
      */
     private $config;
 
-    /**
-     * @var string
-     */
-    private $cacheKey;
-
-    /**
-     * @var string
-     */
-    private $cacheLifetime;
-
     /**
      * Array of modules activation statuses
      *
@@ -59,13 +42,10 @@ class FileActivator implements ActivatorInterface
 
     public function __construct(Container $app)
     {
-        $this->cache = $app['cache'];
         $this->files = $app['files'];
         $this->config = $app['config'];
         $this->statusesFile = $this->config('statuses-file');
-        $this->cacheKey = $this->config('cache-key');
-        $this->cacheLifetime = $this->config('cache-lifetime');
-        $this->modulesStatuses = $this->getModulesStatuses();
+        $this->modulesStatuses = $this->readJson();
     }
 
     /**
@@ -85,7 +65,6 @@ public function reset(): void
             $this->files->delete($this->statusesFile);
         }
         $this->modulesStatuses = [];
-        $this->flushCache();
     }
 
     /**
@@ -131,7 +110,6 @@ public function setActiveByName(string $name, bool $status): void
     {
         $this->modulesStatuses[$name] = $status;
         $this->writeJson();
-        $this->flushCache();
     }
 
     /**
@@ -144,7 +122,6 @@ public function delete(Module $module): void
         }
         unset($this->modulesStatuses[$module->getName()]);
         $this->writeJson();
-        $this->flushCache();
     }
 
     /**
@@ -166,24 +143,7 @@ private function readJson(): array
             return [];
         }
 
-        return json_decode($this->files->get($this->statusesFile), true);
-    }
-
-    /**
-     * Get modules statuses, either from the cache or from
-     * the json statuses file if the cache is disabled.
-     *
-     * @throws FileNotFoundException
-     */
-    private function getModulesStatuses(): array
-    {
-        if (! $this->config->get('modules.cache.enabled')) {
-            return $this->readJson();
-        }
-
-        return $this->cache->store($this->config->get('modules.cache.driver'))->remember($this->cacheKey, $this->cacheLifetime, function () {
-            return $this->readJson();
-        });
+        return $this->files->json($this->statusesFile);
     }
 
     /**
@@ -195,12 +155,4 @@ private function config(string $key, $default = null)
     {
         return $this->config->get('modules.activators.file.'.$key, $default);
     }
-
-    /**
-     * Flushes the modules activation statuses cache
-     */
-    private function flushCache(): void
-    {
-        $this->cache->store($this->config->get('modules.cache.driver'))->forget($this->cacheKey);
-    }
 }
diff --git a/src/Module.php b/src/Module.php
@@ -347,7 +347,6 @@ public function disable(): void
         $this->fireEvent(ModuleEvent::DISABLING);
 
         $this->activator->disable($this);
-        $this->flushCache();
 
         $this->fireEvent(ModuleEvent::DISABLED);
     }
@@ -360,7 +359,6 @@ public function enable(): void
         $this->fireEvent(ModuleEvent::ENABLING);
 
         $this->activator->enable($this);
-        $this->flushCache();
 
         $this->fireEvent(ModuleEvent::ENABLED);
     }
@@ -399,13 +397,6 @@ protected function isLoadFilesOnBoot(): bool
             ! class_exists('\Modules\Core\Foundation\AsgardCms');
     }
 
-    private function flushCache(): void
-    {
-        if (config('modules.cache.enabled')) {
-            $this->cache->store(config('modules.cache.driver'))->flush();
-        }
-    }
-
     /**
      * Register a translation file namespace.
      */

diff --git a/src/Traits/CanClearModulesCache.php b/src/Traits/CanClearModulesCache.php
@@ -9,10 +9,6 @@ trait CanClearModulesCache
      */
     public function clearCache()
     {
-        if (config('modules.cache.enabled') === true) {
-            app('cache')->forget(config('modules.cache.key'));
-        }
-
         $this->laravel['modules']->resetModules();
     }
 }