tag cache.app.taggable as a cache pool

With this change the CacheCollectorPass will be able to decorate the TagAwareAdapter and thus injects a traceable cache when a service argument's type declaration asks for a TagAwareCacheInterface implementation.
symfony · Jan 10, 2020 · 56e90f3 · 56e90f3
1 parent 2787024
commit 56e90f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -18,6 +18,7 @@
 
         <service id="cache.app.taggable" class="Symfony\Component\Cache\Adapter\TagAwareAdapter">
             <argument type="service" id="cache.app" />
+            <tag name="cache.pool" />
         </service>
 
         <service id="cache.system" parent="cache.adapter.system" public="true">

diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -106,11 +107,12 @@ public function process(ContainerBuilder $container)
                     if ($tags[0][$attr]) {
                         $pool->addTag($this->kernelResetTag, ['method' => $tags[0][$attr]]);
                     }
-                } elseif ('namespace' !== $attr || ArrayAdapter::class !== $adapter->getClass()) {
+                } elseif (('namespace' !== $attr || ArrayAdapter::class !== $adapter->getClass()) && TagAwareAdapter::class !== $class && !is_subclass_of($class, TagAwareAdapter::class)) {
                     $pool->replaceArgument($i++, $tags[0][$attr]);
                 }
                 unset($tags[0][$attr]);
             }
+
             if (!empty($tags[0])) {
                 throw new InvalidArgumentException(sprintf('Invalid "%s" tag for service "%s": accepted attributes are "clearer", "provider", "name", "namespace", "default_lifetime" and "reset", found "%s".', $this->cachePoolTag, $id, implode('", "', array_keys($tags[0]))));
             }