The inner cacheItem should always be encrypted (#135)

* The inner cacheItem should always be encrypted

* cs

Author: Nyholm

EncryptedCachePool.php

@@ -49,13 +49,9 @@ public function __construct(PhpCachePool $cachePool, Key $key)
      */
     public function getItem($key)
     {
-        $item = $this->cachePool->getItem($key);
+        $items = $this->getItems([$key]);
 
-        if (!($item instanceof EncryptedItemDecorator)) {
-            return new EncryptedItemDecorator($item, $this->key);
-        }
-
-        return $item;
+        return reset($items);
     }
 
     /**
@@ -109,31 +105,23 @@ 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);
+        if (!$item instanceof EncryptedItemDecorator) {
+            throw new InvalidArgumentException('Cache items are not transferable between pools. Item MUST implement EncryptedItemDecorator.');
         }
 
-        return $this->cachePool->save($item);
+        return $this->cachePool->save($item->getCacheItem());
     }
 
     /**
      * {@inheritdoc}
      */
     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);
+        if (!$item instanceof EncryptedItemDecorator) {
+            throw new InvalidArgumentException('Cache items are not transferable between pools. Item MUST implement EncryptedItemDecorator.');
         }
 
-        return $this->cachePool->saveDeferred($item);
+        return $this->cachePool->saveDeferred($item->getCacheItem());
     }
 
     /**

EncryptedItemDecorator.php

@@ -24,6 +24,8 @@
 class EncryptedItemDecorator implements PhpCacheItem
 {
     /**
+     * The cacheItem should always contain encrypted data.
+     *
      * @type PhpCacheItem
      */
     private $cacheItem;
@@ -51,6 +53,14 @@ public function getKey()
         return $this->cacheItem->getKey();
     }
 
+    /**
+     * @return PhpCacheItem
+     */
+    public function getCacheItem()
+    {
+        return $this->cacheItem;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -176,9 +186,9 @@ private function transform(array $item)
     }
 
     /**
-     * @internal This function should never be used and considered private.
+     * Move tags from $tags to $prevTags.
      *
-     * Move tags from $tags to $prevTags
+     * @internal This function should never be used and considered private.
      */
     public function moveTagsToPrevious()
     {