Renamed option + fixes

Author: acrobat

src/CachePlugin.php

@@ -9,6 +9,7 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -61,7 +62,13 @@ public function __construct(CacheItemPoolInterface $pool, StreamFactory $streamF
     public static function clientCache(CacheItemPoolInterface $pool, StreamFactory $streamFactory, array $config = [])
     {
         // Allow caching of private requests
-        $config['excluded_directives'] = ['no-cache'];
+        if (isset($config['respect_response_cache_directives'])) {
+            if (!in_array('no-cache', $config['respect_response_cache_directives'], true)) {
+                $config['respect_response_cache_directives'][] = ['no-cache'];
+            }
+        } else {
+            $config['respect_response_cache_directives'] = ['no-cache'];
+        }
 
         self::__construct($pool, $streamFactory, $config);
     }
@@ -200,7 +207,7 @@ protected function isCacheable(ResponseInterface $response)
             return true;
         }
 
-        foreach ($this->config['excluded_directives'] as $cacheDirective) {
+        foreach ($this->config['respect_response_cache_directives'] as $cacheDirective) {
             if ($this->getCacheControlDirective($response, $cacheDirective)) {
                 return false;
             }
@@ -258,7 +265,7 @@ private function createCacheKey(RequestInterface $request)
      */
     private function getMaxAge(ResponseInterface $response)
     {
-        if (!$this->config['respect_cache_headers']) {
+        if (!$this->config['respect_cache_headers'] || !in_array('max-age', $this->config['respect_response_cache_directives'], true)) {
             return $this->config['default_ttl'];
         }
 
@@ -292,10 +299,11 @@ private function configureOptions(OptionsResolver $resolver)
         $resolver->setDefaults([
             'cache_lifetime' => 86400 * 30, // 30 days
             'default_ttl' => 0,
+            //Deprecated as of v1.3, to be removed in v2.0. Use respect_response_cache_directives instead
             'respect_cache_headers' => true,
             'hash_algo' => 'sha1',
             'methods' => ['GET', 'HEAD'],
-            'excluded_directives' => ['no-cache', 'private'],
+            'respect_response_cache_directives' => ['no-cache', 'private', 'max-age'],
         ]);
 
         $resolver->setAllowedTypes('cache_lifetime', ['int', 'null']);
@@ -309,6 +317,14 @@ private function configureOptions(OptionsResolver $resolver)
 
             return empty($matches);
         });
+
+        $resolver->setNormalizer('respect_cache_headers', function (Options $options, $value) {
+            if (null !== $value) {
+                @trigger_error('The option "respect_cache_headers" is deprecated since version 1.3 and will be removed in 2.0. Use "respect_response_cache_directives" instead.', E_USER_DEPRECATED);
+            }
+
+            return $value;
+        });
     }
 
     /**