Making cache tags more efficient by rewriting the API.

Related to php-cache/issues#21

Author: Nyholm

ArrayCachePool.php

@@ -15,15 +15,19 @@
 use Cache\Adapter\Common\CacheItem;
 use Cache\Hierarchy\HierarchicalCachePoolTrait;
 use Cache\Hierarchy\HierarchicalPoolInterface;
+use Cache\Taggable\TaggableItemInterface;
+use Cache\Taggable\TaggablePoolInterface;
+use Cache\Taggable\TaggablePoolTrait;
 use Psr\Cache\CacheItemInterface;
 
 /**
  * Array cache pool. You could set a limit of how many items you wantt to be stored to avoid memory leaks.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class ArrayCachePool extends AbstractCachePool implements HierarchicalPoolInterface
+class ArrayCachePool extends AbstractCachePool implements HierarchicalPoolInterface, TaggablePoolInterface
 {
+    use TaggablePoolTrait;
     use HierarchicalCachePoolTrait;
 
     /**
@@ -78,6 +82,18 @@ protected function getItemWithoutGenerateCacheKey($key)
      */
     protected function fetchObjectFromCache($key)
     {
+        // Not used
+    }
+
+    public function getItem($key)
+    {
+        $this->validateKey($key);
+        if (isset($this->deferred[$key])) {
+            $item = $this->deferred[$key];
+
+            return is_object($item) ? clone $item : $item;
+        }
+
         $storageKey = $this->getHierarchyKey($key);
         if (isset($this->cache[$storageKey])) {
             return $this->cache[$storageKey];
@@ -102,6 +118,7 @@ protected function clearAllObjectsFromCache()
     protected function clearOneObjectFromCache($key)
     {
         $this->commit();
+        $this->preRemoveItem($key);
         $keyString = $this->getHierarchyKey($key, $path);
         if (isset($this->cache[$path])) {
             $this->cache[$path]++;
@@ -118,9 +135,9 @@ protected function clearOneObjectFromCache($key)
     /**
      * {@inheritdoc}
      */
-    protected function storeItemInCache($key, CacheItemInterface $item, $ttl)
+    protected function storeItemInCache(CacheItemInterface $item, $ttl)
     {
-        $key               = $this->getHierarchyKey($key);
+        $key               = $this->getHierarchyKey($item->getKey());
         $this->cache[$key] = $item;
 
         if ($this->limit !== null) {
@@ -139,6 +156,15 @@ protected function storeItemInCache($key, CacheItemInterface $item, $ttl)
         return true;
     }
 
+    public function save(CacheItemInterface $item)
+    {
+        if ($item instanceof TaggableItemInterface) {
+            $this->saveTags($item);
+        }
+
+        return parent::save($item);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -148,4 +174,34 @@ protected function getValueFormStore($key)
             return $this->cache[$key];
         }
     }
+
+    protected function getList($name)
+    {
+        if (!isset($this->cache[$name])) {
+            $this->cache[$name] = [];
+        }
+
+        return $this->cache[$name];
+    }
+
+    protected function removeList($name)
+    {
+        unset($this->cache[$name]);
+
+        return true;
+    }
+
+    protected function appendListItem($name, $key)
+    {
+        $this->cache[$name][] = $key;
+    }
+
+    protected function removeListItem($name, $key)
+    {
+        foreach ($this->cache[$name] as $i => $item) {
+            if ($item === $key) {
+                unset($this->cache[$name][$i]);
+            }
+        }
+    }
 }

composer.json

@@ -32,7 +32,7 @@
     },
     "require-dev":       {
         "phpunit/phpunit":         "^4.0|^5.1",
-        "cache/integration-tests": "0.7.0"
+        "cache/integration-tests": "0.9.0"
     },
     "provide":           {
         "psr/cache-implementation": "^1.0"