Merge branch 'trickreich-bugfix/symfony-support-tag'

Author: dbu

CHANGELOG.md

@@ -3,6 +3,14 @@ Changelog
 
 See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpCache/releases).
 
+2.5.1
+-----
+
+### Symfony
+
+* Have cache invalidator check for presence of Psr6Store for a better guess
+  whether the cache really is TagCapable or not.
+
 2.5.0
 -----
 

src/CacheInvalidator.php

@@ -21,8 +21,10 @@
 use FOS\HttpCache\ProxyClient\Invalidation\RefreshCapable;
 use FOS\HttpCache\ProxyClient\Invalidation\TagCapable;
 use FOS\HttpCache\ProxyClient\ProxyClient;
+use FOS\HttpCache\ProxyClient\Symfony;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Toflar\Psr6HttpCacheStore\Psr6Store;
 
 /**
  * Manages HTTP cache invalidation.
@@ -97,7 +99,12 @@ public function supports($operation)
             case self::INVALIDATE:
                 return $this->cache instanceof BanCapable;
             case self::TAGS:
-                return $this->cache instanceof TagCapable;
+                $supports = $this->cache instanceof TagCapable;
+                if ($supports && $this->cache instanceof Symfony) {
+                    return class_exists(Psr6Store::class);
+                }
+
+                return $supports;
             default:
                 throw new InvalidArgumentException('Unknown operation '.$operation);
         }