Merge pull request #6 from Jarlskov/issue/3-implement-psr-16

Require psr/simple-cache and have NullCache implement it, thanks @Jarlskov

Author: dannyvankooten

composer.json

@@ -10,11 +10,15 @@
     }
   ],
   "require": {
-    "php": ">=5.6"
+    "php": ">=5.6",
+    "psr/simple-cache": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.0"
   },
+  "provide": {
+      "psr/simple-cache-implementation": "1.0"
+  },
   "autoload": {
     "psr-4": {
       "DvK\\Vat\\": "src/"

src/Rates/Caches/NullCache.php

@@ -2,30 +2,88 @@
 
 namespace DvK\Vat\Rates\Caches;
 
-use DvK\Vat\Rates\Interfaces\Cache;
-
-class NullCache implements Cache {
+use Psr\SimpleCache\CacheInterface;
 
+class NullCache implements CacheInterface
+{
     /**
      * @param string $key
+     * @param (optional) mixed $default
      *
      * @return mixed
      */
-    public function get($key)
+    public function get($key, $default = null)
     {
-        return null;
+        return $default;
     }
 
     /**
      * @param string $key
      * @param mixed $value
-     * @param int $expiration
+     * @param null|int|DateInterval $ttl
      *
-     * @return mixed
+     * @return bool
+     */
+    public function set($key, $value, $expiration = null)
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function delete($key)
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function clear()
+    {
+        return true;
+    }
+
+    /**
+     * @param iterable $keys
+     * @param mixed $default
+     *
+     * @return iterable
      */
-    public function put($key, $value, $expiration)
+    public function getMultiple($keys, $default = null)
     {
-        return null;
+        return $default;
     }
 
-}
+    /**
+     * @param iterable $values
+     * @param null|int|DateInterval $ttl
+     *
+     * @return bool
+     */
+    public function setMultiple($values, $ttl = null)
+    {
+        return true;
+    }
+
+    /**
+     * @param iterable $keys
+     *
+     * @return bool
+     */
+    public function deleteMultiple($keys)
+    {
+        return true;
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return bool
+     */
+    public function has($key)
+    {
+        return false;
+    }
+}

src/Rates/Interfaces/Cache.php

@@ -4,9 +4,9 @@
 
 use DvK\Vat\Rates\Caches\NullCache;
 use DvK\Vat\Rates\Clients\JsonVat;
-use DvK\Vat\Rates\Interfaces\Cache;
 use DvK\Vat\Rates\Interfaces\Client;
 use DvK\Vat\Rates\Exceptions\Exception;
+use Psr\SimpleCache\CacheInterface;
 
 class Rates
 {
@@ -32,7 +32,7 @@ class Rates
      * @param Client $client     (optional)
      * @param Cache $cache          (optional)
      */
-    public function __construct( Client $client = null, Cache $cache = null )
+    public function __construct( Client $client = null, CacheInterface $cache = null )
     {
         $this->client = $client;
         $this->cache = $cache ? $cache : new NullCache();
@@ -49,7 +49,7 @@ protected function load()
             $map = $this->fetch();
 
             // store in cache
-            $this->cache->put('vat-rates', $map, 86400);
+            $this->cache->set('vat-rates', $map, 86400);
         }
 
         return $map;

src/Rates/Rates.php

@@ -116,7 +116,7 @@ public function test_ratesAreStoredInCache() {
 
         $cacheMock
             ->expects(self::once())
-            ->method('put');
+            ->method('set');
 
         $rates = new Rates( $clientMock, $cacheMock );
     }