Merge branch 'feature/issue-1'

Author: ddrv

.phpunit.result.cache

@@ -20,7 +20,6 @@
     "psr/http-factory": "^1.0"
   },
   "require-dev": {
-    "cache/array-adapter": "^1.0",
     "guzzlehttp/psr7": "^1.7",
     "phpunit/phpunit": ">=6.5",
     "squizlabs/php_codesniffer": "^3.5",

composer.json

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php" colors="true" cacheResult="false">
     <testsuites>
         <testsuite name="all">
             <directory>tests</directory>

phpunit.xml.dist

@@ -0,0 +1,131 @@
+<?php
+
+namespace Stuff\Webclient\Extension\Cache;
+
+use DateInterval;
+use Psr\SimpleCache\CacheInterface;
+
+class ArrayCache implements CacheInterface
+{
+
+    /**
+     * @var array
+     */
+    private $storage = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function get($key, $default = null)
+    {
+        if (!$this->has($key)) {
+            return $default;
+        }
+        return $this->storage[$key]['value'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function set($key, $value, $ttl = null)
+    {
+        $item = [
+            'value' => $value,
+        ];
+        $seconds = is_int($ttl) ? $ttl : 0;
+        if ($ttl instanceof DateInterval) {
+            if ($ttl->invert === 1) {
+                return false;
+            }
+            $seconds = $ttl->days * 86400 + $ttl->h * 3600 + $ttl->i * 60 + $ttl->s;
+        }
+        if ($seconds) {
+            $item['expired'] = time() + $seconds;
+        }
+        $this->storage[$key] = $item;
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete($key)
+    {
+        if (array_key_exists($key, $this->storage)) {
+            unset($this->storage[$key]);
+        }
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function clear()
+    {
+        $this->storage = [];
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMultiple($keys, $default = null)
+    {
+        $result = [];
+        foreach ($keys as $key) {
+            $result[$key] = $this->get($key, $default);
+        }
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setMultiple($values, $ttl = null)
+    {
+        $result = true;
+        foreach ($values as $key => $value) {
+            if (!$this->set($key, $value, $ttl)) {
+                $result = false;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function deleteMultiple($keys)
+    {
+        $result = true;
+        foreach ($keys as $key) {
+            if (!$this->delete($key)) {
+                $result = false;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function has($key)
+    {
+        if (!array_key_exists($key, $this->storage)) {
+            return false;
+        }
+        if (!array_key_exists('value', $this->storage[$key])) {
+            unset($this->storage[$key]);
+            return false;
+        }
+        $expired = false;
+        if (array_key_exists('expired', $this->storage[$key])) {
+            $expired = time() >= $this->storage[$key]['expired'];
+        }
+        if ($expired) {
+            unset($this->storage[$key]);
+            return false;
+        }
+        return true;
+    }
+}

stuff/ArrayCache.php

@@ -4,10 +4,10 @@
 
 namespace Tests\Webclient\Extension\Cache;
 
-use Cache\Adapter\PHPArray\ArrayCachePool;
 use GuzzleHttp\Psr7\Request;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientExceptionInterface;
+use Stuff\Webclient\Extension\Cache\ArrayCache;
 use Stuff\Webclient\Extension\Cache\Handler;
 use Stuff\Webclient\Extension\Cache\HttpFactory;
 use Webclient\Extension\Cache\Client;
@@ -21,9 +21,8 @@ class ClientTest extends TestCase
      */
     public function testClient()
     {
-        $items = [];
         $factory = new HttpFactory();
-        $cache = new ArrayCachePool(null, $items);
+        $cache = new ArrayCache();
         $client = new Client(
             new FakeClient(new Handler($factory, $factory)),
             $cache,