Merge branch 'release/2.0.0'

Author: Toflar

README.md

@@ -19,11 +19,11 @@ that…
 * …instead of re-implementing locking and caching mechanisms again, uses the well
 tested Symfony Cache and Lock components, both with the local filesystem adapters
 by default.
-* …thanks to the `TagAwareAdapter` of the Cache component, supports tag based cache
-invalidation.
+* …thanks to the `TagAwareAdapterInterface` of the Cache component, supports tag
+based cache invalidation.
 * …thanks to the `PrunableInterface` of the Cache component, supports auto-pruning
 of expired entries on the filesystem trying to prevent flooding the filesystem.
-* …allows you to use a different PSR-6 cache adapters as well as a differenent 
+* …allows you to use a different PSR-6 cache adapters as well as a different 
 lock adapter than the local filesystem ones.
  However, **be careful about choosing the right adapters**, see warning below.
 
@@ -86,8 +86,11 @@ passing an array of `$options` in the constructor:
 
   **Type**: `string`
 
-* **cache**: Explicitly specify the cache adapter you want to use. Make sure
-  that `lock` and `cache` have the same scope. *See warning below!*
+* **cache**: Explicitly specify the cache adapter you want to use.
+
+  Note that if you want to make use of cache tagging, this cache must
+  implement the `Symfony\Component\Cache\Adapter\TagAwareAdapterInterface`
+  Make sure that `lock` and `cache` have the same scope. *See warning below!*
 
   **Type**: `Symfony\Component\Cache\Adapter\AdapterInterface`
   **Default**: `FilesystemAdapter` instance with `cache_directory`

src/Psr6Store.php

@@ -14,6 +14,7 @@
 use Psr\Cache\InvalidArgumentException;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemTagAwareAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
 use Symfony\Component\Cache\PruneableInterface;
@@ -72,7 +73,11 @@ class Psr6Store implements Psr6StoreInterface
      *                      adapter and lock factory.
      *
      * - cache:             Explicitly specify the cache adapter you want to
-     *                      use. Make sure that lock and cache have the same
+     *                      use. Note that if you want to make use of cache
+     *                      tagging, this cache must implement the
+     *                      Symfony\Component\Cache\Adapter\TagAwareAdapterInterface
+     *
+     *                      Make sure that lock and cache have the same
      *                      scope. *Read the warning in the README!*
      *
      *                      Type: Symfony\Component\Cache\Adapter\AdapterInterface
@@ -118,8 +123,13 @@ public function __construct(array $options = [])
                 throw new MissingOptionsException('The cache_directory option is required unless you set the cache explicitly');
             }
 
+            // As of Symfony 4.3+ we can use the optimized FilesystemTagAwareAdapter
+            if (class_exists(FilesystemTagAwareAdapter::class)) {
+                return new FilesystemTagAwareAdapter('', 0, $options['cache_directory']);
+            }
+
             return new TagAwareAdapter(
-                new FilesystemAdapter('http_cache', 0, $options['cache_directory'])
+                new FilesystemAdapter('', 0, $options['cache_directory'])
             );
         })->setAllowedTypes('cache', AdapterInterface::class);