Remove singleton cache - fix

fomvasss · Jul 30, 2020 · 2510c3c · 2510c3c
1 parent 0eb6777
commit 2510c3c
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/src/VariableManager.php b/src/VariableManager.php
@@ -75,19 +75,15 @@ public function set(string $key, $value = null)
      */
     public function all(): array
     {
-        if ($this->variables === null) {
-
-            $all = $this->cacheRepository->remember($this->config['cache']['name'], $this->config['cache']['time'], function () {
-                return $this->getCollection();
-            });
-
-            if ($all) {
-                $allByLocale = $this->locale ? $all->where('locale', $this->locale) : $all;
-                $this->variables = $allByLocale->pluck('value', 'key')->toArray();
-            } else {
-                $this->variables = [];
-            }
-
+        $all = $this->cacheRepository->remember($this->config['cache']['name'], $this->config['cache']['time'], function () {
+            return $this->getCollection();
+        });
+
+        if ($all) {
+            $allByLocale = $this->locale ? $all->where('locale', $this->locale) : $all;
+            $this->variables = $allByLocale->pluck('value', 'key')->toArray();
+        } else {
+            $this->variables = [];
         }
 
         return $this->variables;