Added options resolver

Author: Nyholm

composer.json

@@ -14,7 +14,8 @@
         "php": ">=5.4",
         "php-http/httplug": "1.0.0-alpha3",
         "php-http/client-tools": "^0.1@dev",
-        "php-http/message-factory": "^1.0"
+        "php-http/message-factory": "^1.0",
+        "symfony/options-resolver": "^2.3|^3.0"
     },
     "require-dev": {
         "phpspec/phpspec": "^2.4-alpha",

src/CachePlugin.php

@@ -7,6 +7,7 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Allow for caching a response.
@@ -25,32 +26,22 @@ class CachePlugin implements Plugin
      */
     private $streamFactory;
 
-    /**
-     * Default time to store object in cache. This value is used if CachePlugin::respectCacheHeaders is false or
-     * if cache headers are missing.
-     *
-     * @var int
-     */
-    private $defaultTtl;
-
-    /**
-     * Look at the cache headers to know how long this response is going to be cached.
-     *
-     * @var bool
-     */
-    private $respectCacheHeaders;
+    private $config = [
+        'default_ttl'            => null,
+        'respect_cache_headers' => true
+    ];
 
     /**
      * @param CacheItemPoolInterface $pool
      * @param StreamFactory          $streamFactory
-     * @param array                  $options
+     * @param array                  $config
      */
-    public function __construct(CacheItemPoolInterface $pool, StreamFactory $streamFactory, array $options = [])
+    public function __construct(CacheItemPoolInterface $pool, StreamFactory $streamFactory, array $config = [])
     {
         $this->pool = $pool;
         $this->streamFactory = $streamFactory;
-        $this->defaultTtl = isset($options['default_ttl']) ? $options['default_ttl'] : null;
-        $this->respectCacheHeaders = isset($options['respect_cache_headers']) ? $options['respect_cache_headers'] : true;
+
+        $this->config = $this->configure($config);
     }
 
     /**
@@ -151,8 +142,8 @@ private function createCacheKey(RequestInterface $request)
      */
     private function getMaxAge(ResponseInterface $response)
     {
-        if (!$this->respectCacheHeaders) {
-            return $this->defaultTtl;
+        if (!$this->config['respect_cache_headers']) {
+            return $this->config['default_ttl'];
         }
 
         // check for max age in the Cache-Control header
@@ -172,6 +163,22 @@ private function getMaxAge(ResponseInterface $response)
             return (new \DateTime($header))->getTimestamp() - (new \DateTime())->getTimestamp();
         }
 
-        return $this->defaultTtl;
+        return $this->config['default_ttl'];
+    }
+
+    /**
+     * @param array $config
+     *
+     * @return array
+     */
+    protected function configure(array $config = [])
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults($this->config);
+
+        $resolver->setAllowedTypes('default_ttl', 'int');
+        $resolver->setAllowedTypes('respect_cache_headers', 'bool');
+
+        return $resolver->resolve($config);
     }
 }