[Security] Avoid having an unremoved, but unused, cache pool

wouterj · wouterj · commit 23b6ae86f148 · 2021-03-16T14:37:00.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginLinkFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginLinkFactory.php
@@ -98,6 +98,10 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
 
         if (null !== $config['max_uses'] && !isset($config['used_link_cache'])) {
             $config['used_link_cache'] = 'security.authenticator.cache.expired_links';
+            $defaultCacheDefinition = $container->getDefinition($config['used_link_cache']);
+            if (!$defaultCacheDefinition->hasTag('cache.pool')) {
+                $defaultCacheDefinition->addTag('cache.pool');
+            }
         }
 
         $expiredStorageId = null;
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_login_link.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_login_link.php
@@ -51,7 +51,6 @@
         ->set('security.authenticator.cache.expired_links')
             ->parent('cache.app')
             ->private()
-            ->tag('cache.pool')
 
         ->set('security.authenticator.firewall_aware_login_link_handler', FirewallAwareLoginLinkHandler::class)
             ->args([

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,10 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal`
`98`	`98`
`99`	`99`	`if (null !== $config['max_uses'] && !isset($config['used_link_cache'])) {`
`100`	`100`	`$config['used_link_cache'] = 'security.authenticator.cache.expired_links';`
	`101`	`+ $defaultCacheDefinition = $container->getDefinition($config['used_link_cache']);`
	`102`	`+ if (!$defaultCacheDefinition->hasTag('cache.pool')) {`
	`103`	`+ $defaultCacheDefinition->addTag('cache.pool');`
	`104`	`+ }`
`101`	`105`	`}`
`102`	`106`
`103`	`107`	`$expiredStorageId = null;`