From 9676bd684b096fda13848f2abf3a1ceb5ff7af26 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Thu, 16 Dec 2021 13:08:33 -0500
Subject: [PATCH] alias `cache.app.taggable` to `cache.app` if using
 `cache.adapter.redis_tag_aware`

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md          | 1 +
 .../DependencyInjection/FrameworkExtension.php           | 9 +++++++++
 .../Bundle/FrameworkBundle/Resources/config/cache.php    | 4 ----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index d3c5731888f6e..d8de07d486b88 100644
--- 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
index 2a74d17458882..9170cc309b52b 100644
--- 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
index d1a10e2b36c4b..9997abae42561 100644
--- 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()