8000 [Cache] fix processing chain adapter based cache pool by xabbuh · Pull Request #35244 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Cache] fix processing chain adapter based cache pool #35244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2020
Merged

[Cache] fix processing chain adapter based cache pool #35244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix processing chain adapter based cache pool
  • Loading branch information
@xabbuh
xabbuh committed Jan 7, 2020
commit 8d7fa32d15fb07de6f9d05c0718c34fbe12b44fd
7 changes: 6 additions & 1 deletion src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ public function process(ContainerBuilder $container)
if (ChainAdapter::class === $class) {
$adapters = [];
foreach ($adapter->getArgument(0) as $provider => $adapter) {
$chainedPool = $adapter = new ChildDefinition($adapter);
if ($adapter instanceof ChildDefinition) {
$chainedPool = $adapter;
} else {
$chainedPool = $adapter = new ChildDefinition($adapter);
}

$chainedTags = [\is_int($provider) ? [] : ['provider' => $provider]];
$chainedClass = '';

Expand Down
40 changes: 40 additions & 0 deletions src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
namespace Symfony\Component\Cache\Tests\DependencyInjection;

use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\Adapter\ApcuAdapter;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Symfony\Component\Cache\Adapter\ChainAdapter;
use Symfony\Component\Cache\Adapter\RedisAdapter;
use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
use Symfony\Component\DependencyInjection\ChildDefinition;
Expand Down Expand Up @@ -174,4 +176,42 @@ public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()

$this->cachePoolPass->process($container);
}

public function testChainAdapterPool()
{
$container = new ContainerBuilder();
$container->setParameter('kernel.container_class', 'app');
$container->setParameter('kernel.project_dir', 'foo');

$container->register('cache.adapter.array', ArrayAdapter::class)
->addTag('cache.pool');
$container->register('cache.adapter.apcu', ApcuAdapter::class)
->setArguments([null, 0, null])
->addTag('cache.pool');
$container->register('cache.chain', ChainAdapter::class)
->addArgument(['cache.adapter.array', 'cache.adapter.apcu'])
->addTag('cache.pool');
$container->setDefinition('cache.app', new ChildDefinition('cache.chain'))
->addTag('cache.pool');
$container->setDefinition('doctrine.result_cache_pool', new ChildDefinition('cache.app'))
->addTag('cache.pool');

$this->cachePoolPass->process($container);

$appCachePool = $container->getDefinition('cache.app');
$this->assertInstanceOf(ChildDefinition::class, $appCachePool);
$this->assertSame('cache.chain', $appCachePool->getParent());

$chainCachePool = $container->getDefinition('cache.chain');
$this->assertNotInstanceOf(ChildDefinition::class, $chainCachePool);
$this->assertCount(2, $chainCachePool->getArgument(0));
$this->assertInstanceOf(ChildDefinition::class, $chainCachePool->getArgument(0)[0]);
$this->assertSame('cache.adapter.array', $chainCachePool->getArgument(0)[0]->getParent());
$this->assertInstanceOf(ChildDefinition::class, $chainCachePool->getArgument(0)[1]);
$this->assertSame('cache.adapter.apcu', $chainCachePool->getArgument(0)[1]->getParent());

$doctrineCachePool = $container->getDefinition('doctrine.result_cache_pool');
$this->assertInstanceOf(ChildDefinition::class, $doctrineCachePool);
$this->assertSame('cache.app', $doctrineCachePool->getParent());
}
}
0