Deprecated cache fields

phact-cmf · May 14, 2019 · 09abdde · 09abdde
1 parent 108f937
commit 09abdde
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/Phact/Orm/Configuration/ConfigurationManager.php b/src/Phact/Orm/Configuration/ConfigurationManager.php
@@ -64,6 +64,7 @@ public function __construct(
 
     /**
      * @return int
+     * @deprecated
      */
     public function setCacheFieldsTimeout(?int $timeout): self
     {
@@ -73,6 +74,7 @@ public function setCacheFieldsTimeout(?int $timeout): self
 
     /**
      * @return int
+     * @deprecated
      */
     public function getCacheFieldsTimeout(): ?int
     {

diff --git a/src/Phact/Orm/Configuration/ConfigurationManagerInterface.php b/src/Phact/Orm/Configuration/ConfigurationManagerInterface.php
@@ -19,6 +19,10 @@
 
 interface ConfigurationManagerInterface
 {
+    /**
+     * @deprecated
+     * @return int|null
+     */
     public function getCacheFieldsTimeout(): ?int;
     public function getCacheQueryTimeout(): ?int;
     public function getContainer(): ContainerInterface;

diff --git a/src/Phact/Orm/FieldsManager.php b/src/Phact/Orm/FieldsManager.php
@@ -31,21 +31,7 @@ class FieldsManager
 
     public static function makeInstance($modelClass, $fields, $metaData = [])
     {
-        $configuration = ConfigurationProvider::getInstance()->getManager();
-        $cache = $configuration->getCache();
-        $key = 'PHACT__FIELDS_MANAGER_' . $modelClass;
-        $manager = null;
-        $cacheTimeout = $configuration->getCacheFieldsTimeout();
-        if ($cache && $cacheTimeout !== null) {
-            $manager = $cache->get($key);
-        }
-        if (!$manager) {
-            $manager = new self($modelClass, $fields, $metaData);
-            if ($cache && $cacheTimeout !== null) {
-                $cache->set($key, $manager, $cacheTimeout);
-            }
-        }
-        return $manager;
+        return new self($modelClass, $fields, $metaData);
     }
 
     public function __construct($modelClass, $fields, $metaData = [])