Added support for simple cache (#134)

* Added support for SimpleCache

* Added tests

* Bugfix with cloning

* Style fix

* Minor

* Updated integration tests version

* Bugfix

* Allow same keys

* cs

Author: Nyholm

ArrayCachePool.php

@@ -80,29 +80,17 @@ protected function getItemWithoutGenerateCacheKey($key)
      */
     protected function fetchObjectFromCache($key)
     {
-        // Not used
-    }
-
-    public function getItem($key)
-    {
-        $this->validateKey($key);
-        if (isset($this->deferred[$key])) {
-            /** @type CacheItem $item */
-            $item = clone $this->deferred[$key];
-            $item->moveTagsToPrevious();
-
-            return $item;
+        if (!isset($this->cache[$key])) {
+            return [false, null, [], null];
         }
 
-        $storageKey = $this->getHierarchyKey($key);
-        if (isset($this->cache[$storageKey])) {
-            $item = $this->cache[$storageKey];
-            $item->moveTagsToPrevious();
+        list($data, $tags, $timestamp) = $this->cache[$key];
 
-            return $item;
+        if (is_object($data)) {
+            $data = clone $data;
         }
 
-        return new CacheItem($key, false);
+        return [true, $data, $tags, $timestamp];
     }
 
     /**
@@ -140,7 +128,11 @@ protected function clearOneObjectFromCache($key)
     protected function storeItemInCache(PhpCacheItem $item, $ttl)
     {
         $key               = $this->getHierarchyKey($item->getKey());
-        $this->cache[$key] = $item;
+        $value             = $item->get();
+        if (is_object($value)) {
+            $value = clone $value;
+        }
+        $this->cache[$key] = [$value, $item->getTags(), $item->getExpirationTimestamp()];
 
         if ($this->limit !== null) {
             // Remove the oldest value

Tests/CreatePoolTrait.php

@@ -21,4 +21,9 @@ public function createCachePool()
     {
         return new ArrayCachePool(null, $this->cacheArray);
     }
+
+    public function createSimpleCache()
+    {
+        return $this->createCachePool();
+    }
 }

Tests/IntegrationSimpleCacheTest.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of php-cache organization.
+ *
+ * (c) 2015 Aaron Scherer <[email protected]>, Tobias Nyholm <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Cache\Adapter\PHPArray\Tests;
+
+use Cache\IntegrationTests\SimpleCacheTest;
+
+class IntegrationSimpleCacheTest extends SimpleCacheTest
+{
+    use CreatePoolTrait;
+}

composer.json

@@ -26,12 +26,13 @@
     "require":           {
         "php":                      "^5.5 || ^7.0",
         "psr/cache":                "^1.0",
+        "psr/simple-cache":         "^1.0",
         "cache/adapter-common":     "^0.4",
         "cache/hierarchical-cache": "^0.4"
     },
     "require-dev":       {
         "phpunit/phpunit":         "^4.0 || ^5.1",
-        "cache/integration-tests": "^0.14"
+        "cache/integration-tests": "^0.16"
     },
     "provide":           {
         "psr/cache-implementation": "^1.0"