Remove dependency on cache/common (#137)

* Remove dependency on cache/common

This will fix php-cache/issues#89

* bugfix

Author: Nyholm

EncryptedCachePool.php

@@ -11,8 +11,7 @@
 
 namespace Cache\Encryption;
 
-use Cache\Adapter\Common\PhpCacheItem;
-use Cache\Adapter\Common\PhpCachePool;
+use Cache\TagInterop\TaggableCacheItemPoolInterface;
 use Defuse\Crypto\Key;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\InvalidArgumentException;
@@ -22,10 +21,10 @@
  *
  * @author Daniel Bannert <[email protected]>
  */
-class EncryptedCachePool implements PhpCachePool
+class EncryptedCachePool implements TaggableCacheItemPoolInterface
 {
     /**
-     * @type PhpCachePool
+     * @type TaggableCacheItemPoolInterface
      */
     private $cachePool;
 
@@ -35,10 +34,10 @@ class EncryptedCachePool implements PhpCachePool
     private $key;
 
     /**
-     * @param PhpCachePool $cachePool
-     * @param Key          $key
+     * @param TaggableCacheItemPoolInterface $cachePool
+     * @param Key                            $key
      */
-    public function __construct(PhpCachePool $cachePool, Key $key)
+    public function __construct(TaggableCacheItemPoolInterface $cachePool, Key $key)
     {
         $this->cachePool = $cachePool;
         $this->key       = $key;
@@ -59,7 +58,7 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        return array_map(function (PhpCacheItem $inner) {
+        return array_map(function (CacheItemInterface $inner) {
             if (!($inner instanceof EncryptedItemDecorator)) {
                 return new EncryptedItemDecorator($inner, $this->key);
             }

EncryptedItemDecorator.php

@@ -11,22 +11,21 @@
 
 namespace Cache\Encryption;
 
-use Cache\Adapter\Common\PhpCacheItem;
+use Cache\TagInterop\TaggableCacheItemInterface;
 use Defuse\Crypto\Crypto;
 use Defuse\Crypto\Key;
-use Psr\Cache\CacheItemInterface;
 
 /**
  * Encrypt and Decrypt all the stored items.
  *
  * @author Daniel Bannert <[email protected]>
  */
-class EncryptedItemDecorator implements PhpCacheItem
+class EncryptedItemDecorator implements TaggableCacheItemInterface
 {
     /**
      * The cacheItem should always contain encrypted data.
      *
-     * @type PhpCacheItem
+     * @type TaggableCacheItemInterface
      */
     private $cacheItem;
 
@@ -36,10 +35,10 @@ class EncryptedItemDecorator implements PhpCacheItem
     private $key;
 
     /**
-     * @param PhpCacheItem $cacheItem
-     * @param Key          $key
+     * @param TaggableCacheItemInterface $cacheItem
+     * @param Key                        $key
      */
-    public function __construct(PhpCacheItem $cacheItem, Key $key)
+    public function __construct(TaggableCacheItemInterface $cacheItem, Key $key)
     {
         $this->cacheItem = $cacheItem;
         $this->key       = $key;
@@ -54,7 +53,7 @@ public function getKey()
     }
 
     /**
-     * @return PhpCacheItem
+     * @return TaggableCacheItemInterface
      */
     public function getCacheItem()
     {
@@ -101,14 +100,6 @@ public function isHit()
         return $this->cacheItem->isHit();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getExpirationTimestamp()
-    {
-        return $this->cacheItem->getExpirationTimestamp();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -137,16 +128,6 @@ public function getPreviousTags()
         return $this->cacheItem->getPreviousTags();
     }
 
-    /**
-     * Get the current tags. These are not the same tags as getPrevious tags.
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->cacheItem->getTags();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -158,15 +139,15 @@ public function setTags(array $tags)
     }
 
     /**
-     * Creating a copy of the orginal CacheItemInterface object.
+     * Creating a copy of the original CacheItemInterface object.
      */
     public function __clone()
     {
         $this->cacheItem = clone $this->cacheItem;
     }
 
     /**
-     * Transfrom value back to it orginal type.
+     * Transform value back to it original type.
      *
      * @param array $item
      *
@@ -184,14 +165,4 @@ private function transform(array $item)
 
         return $value;
     }
-
-    /**
-     * Move tags from $tags to $prevTags.
-     *
-     * @internal This function should never be used and considered private.
-     */
-    public function moveTagsToPrevious()
-    {
-        $this->cacheItem->moveTagsToPrevious();
-    }
 }

composer.json

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