[FrameworkBundle] fix named autowiring aliases for TagAwareCacheInterface

nicolas-grekas · nicolas-grekas · commit decd87b47c41 · 2019-05-22T22:42:19.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -33,6 +33,7 @@
 use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
 use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\TagAwareCacheInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\DirectoryResource;
@@ -1819,10 +1820,6 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
                 $pool['adapter'] = '.'.$pool['adapter'].'.inner';
             }
             $definition = new ChildDefinition($pool['adapter']);
-            if (!\in_array($name, ['cache.app', 'cache.system'], true)) {
-                $container->registerAliasForArgument($name, CacheInterface::class);
-                $container->registerAliasForArgument($name, CacheItemPoolInterface::class);
-            }
 
             if ($pool['tags']) {
                 if ($config['pools'][$pool['tags']]['tags'] ?? false) {
@@ -1837,7 +1834,21 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
                 $pool['name'] = $name;
                 $pool['public'] = false;
                 $name = '.'.$name.'.inner';
+
+                if (!\in_array($pool['name'], ['cache.app', 'cache.system'], true)) {
+                    $container->registerAliasForArgument($pool['name'], TagAwareCacheInterface::class);
+                    $container->registerAliasForArgument($name, CacheInterface::class, $pool['name']);
+                    $container->registerAliasForArgument($name, CacheItemPoolInterface::class, $pool['name']);
+                }
+            } elseif (!\in_array($name, ['cache.app', 'cache.system'], true)) {
+                $container->register('.'.$name.'.taggable', TagAwareAdapter::class)
+                    ->addArgument(new Reference($name))
+                ;
+                $container->registerAliasForArgument('.'.$name.'.taggable', TagAwareCacheInterface::class, $name);
+                $container->registerAliasForArgument($name, CacheInterface::class);
+                $container->registerAliasForArgument($name, CacheItemPoolInterface::class);
             }
+
             $definition->setPublic($pool['public']);
             unset($pool['adapter'], $pool['public'], $pool['tags']);
 
