From 7cd9f93d98fc4f2e7f4d1bbd076472c4d3882abe Mon Sep 17 00:00:00 2001 From: HypeMC Date: Tue, 23 Jan 2024 00:31:35 +0100 Subject: [PATCH] [Cache] Fix possible infinite loop in `CachePoolPass` --- .../DependencyInjection/CachePoolPass.php | 6 ++-- .../DependencyInjection/CachePoolPassTest.php | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php index 14ac2bde48f04..ee539af7730be 100644 --- 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 index 39350274aea33..401abac24f628 100644 --- 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)); + } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy