restored FilterManager caching

heimrichhannot · Mar 22, 2018 · 22e2168 · 22e2168
1 parent a54fcff
commit 22e2168
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/Manager/FilterManager.php b/src/Manager/FilterManager.php
@@ -29,6 +29,14 @@ class FilterManager
      */
     protected $session;
 
+
+    /**
+     * All available filter configurations cache
+     *
+     * @var FilterConfig[]
+     */
+    protected $filters;
+
     /**
      * Constructor.
      *
@@ -81,6 +89,10 @@ public function getSessionKey(array $filter)
      */
     public function findById(int $id)
     {
+        if (isset($this->filters[$id])) {
+            return $this->filters[$id];
+        }
+
         /**
          * @var FilterConfigModel
          */
@@ -90,9 +102,9 @@ public function findById(int $id)
             return null;
         }
 
-        $config = $this->getConfig($filter->row());
+        $this->filters[$id] = $this->getConfig($filter->row());
 
-        return $config ?: null;
+        return isset($this->filters[$id]) ? $this->filters[$id] : null;
     }
 
     /**