alias cache.app.taggable to cache.app if using cache.adapter.redis_tag_aware

kbond · kbond · commit 9676bd684b09 · 2021-12-16T13:11:58.000-05:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Environment variable `SYMFONY_IDE` is read by default when `framework.ide` config is not set.
+ * When `cache.app` is `cache.adapter.redis_tag_aware`, set `cache.app.taggable` as an alias.
 
 6.0
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2103,6 +2103,15 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
                 'tags' => false,
             ];
         }
+
+        if ('cache.adapter.redis_tag_aware' === $config['app']) {
+            $container->setAlias('cache.app.taggable', 'cache.app');
+        } else {
+            $container->register('cache.app.taggable', TagAwareAdapter::class)
+                ->addArgument(new Reference('cache.app'))
+            ;
+        }
+
         foreach ($config['pools'] as $name => $pool) {
             $pool['adapters'] = $pool['adapters'] ?: ['cache.app'];
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
@@ -23,7 +23,6 @@
 use Symfony\Component\Cache\Adapter\ProxyAdapter;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
 use Symfony\Component\Cache\Messenger\EarlyExpirationHandler;
 use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
@@ -37,9 +36,6 @@
             ->public()
             ->tag('cache.pool', ['clearer' => 'cache.app_clearer'])
 
-        ->set('cache.app.taggable', TagAwareAdapter::class)
-            ->args([service('cache.app')])
-
         ->set('cache.system')
             ->parent('cache.adapter.system')
             ->public()
