Adding function moveTagsToPrevious

Author: Nyholm

EncryptedCachePool.php

@@ -11,6 +11,7 @@
 
 namespace Cache\Encryption;
 
+use Cache\Adapter\Common\PhpCacheItem;
 use Cache\Adapter\Common\PhpCachePool;
 use Cache\TagInterop\TaggableCacheItemInterface;
 use Cache\Taggable\TaggablePSR6PoolAdapter;
@@ -25,10 +26,10 @@
  *
  * @author Daniel Bannert <[email protected]>
  */
-class EncryptedCachePool implements TaggableCacheItemPoolInterface
+class EncryptedCachePool implements PhpCachePool
 {
     /**
-     * @type TaggableCacheItemInterface
+     * @type PhpCachePool
      */
     private $cachePool;
 
@@ -38,12 +39,12 @@ class EncryptedCachePool implements TaggableCacheItemPoolInterface
     private $key;
 
     /**
-     * @param CacheItemPoolInterface $cachePool
-     * @param Key                    $key
+     * @param PhpCachePool $cachePool
+     * @param Key          $key
      */
-    public function __construct(CacheItemPoolInterface $cachePool, Key $key)
+    public function __construct(PhpCachePool $cachePool, Key $key)
     {
-        $this->cachePool = TaggablePSR6PoolAdapter::makeTaggable($cachePool);
+        $this->cachePool = $cachePool;
         $this->key       = $key;
     }
 
@@ -66,7 +67,7 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        return array_map(function (CacheItemInterface $inner) {
+        return array_map(function (PhpCacheItem $inner) {
             if (!($inner instanceof EncryptedItemDecorator)) {
                 return new EncryptedItemDecorator($inner, $this->key);
             }
@@ -112,6 +113,10 @@ public function deleteItems(array $keys)
      */
     public function save(CacheItemInterface $item)
     {
+        if (!$item instanceof PhpCacheItem) {
+            throw new InvalidArgumentException('Cache items are not transferable between pools. Item MUST implement PhpCacheItem.');
+        }
+
         if (!($item instanceof EncryptedItemDecorator)) {
             $item = new EncryptedItemDecorator($item, $this->key);
         }
@@ -124,6 +129,10 @@ public function save(CacheItemInterface $item)
      */
     public function saveDeferred(CacheItemInterface $item)
     {
+        if (!$item instanceof PhpCacheItem) {
+            throw new InvalidArgumentException('Cache items are not transferable between pools. Item MUST implement PhpCacheItem.');
+        }
+
         if (!($item instanceof EncryptedItemDecorator)) {
             $item = new EncryptedItemDecorator($item, $this->key);
         }

EncryptedItemDecorator.php

@@ -22,7 +22,7 @@
  *
  * @author Daniel Bannert <[email protected]>
  */
-class EncryptedItemDecorator implements TaggableCacheItemInterface
+class EncryptedItemDecorator implements PhpCacheItem
 {
     /**
      * @type PhpCacheItem
@@ -175,4 +175,14 @@ private function transform(array $item)
 
         return $value;
     }
+
+    /**
+     * @internal This function should never be used and considered private.
+     *
+     * Move tags from $tags to $prevTags
+     */
+    public function moveTagsToPrevious()
+    {
+        $this->cacheItem->moveTagsToPrevious();
+    }
 }

composer.json

@@ -30,8 +30,7 @@
     "require":     {
         "php":                   "^5.5 || ^7.0",
         "defuse/php-encryption": "^2.0",
-        "cache/taggable-cache":  "^0.5",
-        "cache/tag-interop":     "^1.0",
+        "cache/adapter-common":  "^0.4",
         "psr/cache":             "^1.0"
     },
     "require-dev": {