[Cache] Fix possible infinite loop in CachePoolPass

HypeMC · HypeMC · commit 7cd9f93d98fc · 2024-01-23T09:26:04.000+01:00
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
@@ -209,10 +209,10 @@ public function process(ContainerBuilder $container)
         }
 
         $notAliasedCacheClearerId = $this->cacheClearerId;
-        while ($container->hasAlias($this->cacheClearerId)) {
-            $this->cacheClearerId = (string) $container->getAlias($this->cacheClearerId);
+        while ($container->hasAlias($notAliasedCacheClearerId)) {
+            $notAliasedCacheClearerId = (string) $container->getAlias($notAliasedCacheClearerId);
         }
-        if ($container->hasDefinition($this->cacheClearerId)) {
+        if ($container->hasDefinition($notAliasedCacheClearerId)) {
             $clearers[$notAliasedCacheClearerId] = $allPools;
         }
 
diff --git a/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php b/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php
@@ -20,8 +20,10 @@
 use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
 
 class CachePoolPassTest extends TestCase
 {
@@ -232,4 +234,33 @@ public function testChainAdapterPool()
         $this->assertInstanceOf(ChildDefinition::class, $doctrineCachePool);
         $this->assertSame('cache.app', $doctrineCachePool->getParent());
     }
+
+    public function testGlobalClearerAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.container_class', 'app');
+        $container->setParameter('kernel.project_dir', 'foo');
+
+        $container->register('cache.default_clearer', Psr6CacheClearer::class);
+
+        $container->setDefinition('cache.system_clearer', new ChildDefinition('cache.default_clearer'));
+
+        $container->setDefinition('cache.foo_bar_clearer', new ChildDefinition('cache.default_clearer'));
+        $container->setAlias('cache.global_clearer', 'cache.foo_bar_clearer');
+
+        $container->register('cache.adapter.array', ArrayAdapter::class)
+            ->setAbstract(true)
+            ->addTag('cache.pool');
+
+        $cachePool = new ChildDefinition('cache.adapter.array');
+        $cachePool->addTag('cache.pool', ['clearer' => 'cache.system_clearer']);
+        $container->setDefinition('app.cache_pool', $cachePool);
+
+        $this->cachePoolPass->process($container);
+
+        $definition = $container->getDefinition('cache.foo_bar_clearer');
+
+        $this->assertTrue($definition->hasTag('cache.pool.clearer'));
+        $this->assertEquals(['app.cache_pool' => new Reference('app.cache_pool', ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)], $definition->getArgument(0));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -209,10 +209,10 @@ public function process(ContainerBuilder $container)`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`$notAliasedCacheClearerId = $this->cacheClearerId;`
`212`		`- while ($container->hasAlias($this->cacheClearerId)) {`
`213`		`- $this->cacheClearerId = (string) $container->getAlias($this->cacheClearerId);`
	`212`	`+ while ($container->hasAlias($notAliasedCacheClearerId)) {`
	`213`	`+ $notAliasedCacheClearerId = (string) $container->getAlias($notAliasedCacheClearerId);`
`214`	`214`	`}`
`215`		`- if ($container->hasDefinition($this->cacheClearerId)) {`
	`215`	`+ if ($container->hasDefinition($notAliasedCacheClearerId)) {`
`216`	`216`	`$clearers[$notAliasedCacheClearerId] = $allPools;`
`217`	`217`	`}`
`218`	`218`