Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Cache] ChainAdapter with custom namespace #60594

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

Open
wants to merge 2 commits into
base: 6.4
Choose a base branch
from
Open

[Cache] ChainAdapter with custom namespace #60594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad4b87b
failing tests
IndraGunawan May 30, 2025
8e3d149
fix CachePoolPass
IndraGunawan May 31, 2025
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
140 changes: 80 additions & 60 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,85 @@
<?php

$container->loadFromExtension('framework', [
'annotations' => false,
'http_method_override' => false,
'handle_all_throwables' => true,
'php_errors' => ['log' => true],
'cache' => [
'pools' => [
'cache.foo' => [
'adapter' => 'cache.adapter.apcu',
'default_lifetime' => 30,
],
'cache.baz' => [
'adapter' => 'cache.adapter.filesystem',
'default_lifetime' => 7,
],
'cache.foobar' => [
'adapter' => 'cache.adapter.psr6',
'default_lifetime' => 10,
'provider' => 'app.cache_pool',
],
'cache.def' => [
'default_lifetime' => 'PT11S',
],
'cache.expr' => [
'default_lifetime' => '13 seconds',
],
'cache.chain' => [
'default_lifetime' => 12,
'adapter' => [
'cache.adapter.array',
'cache.adapter.filesystem',
'redis://foo' => 'cache.adapter.redis',
namespace Symfony\Component\DependencyInjection\Loader\Configurator;

use Symfony\Component\Cache\Adapter\ChainAdapter;

return static function (ContainerConfigurator $container) {
$services = $container->services()
->defaults()
->autowire(true)
->autoconfigure(true)
;

$services->set('chain_cache_custom_ns', ChainAdapter::class)
->arg(0, ['cache.adapter.array', 'cache.adapter.filesystem'])
->tag('cache.pool', ['namespace' => 'my-custom-ns']);

$container->extension('framework', [
'annotations' => false,
'http_method_override' => false,
'handle_all_throwables' => true,
'php_errors' => ['log' => true],
'cache' => [
'pools' => [
'cache.foo' => [
'adapter' => 'cache.adapter.apcu',
'default_lifetime' => 30,
],
'cache.baz' => [
'adapter' => 'cache.adapter.filesystem',
'default_lifetime' => 7,
],
'cache.foobar' => [
'adapter' => 'cache.adapter.psr6',
'default_lifetime' => 10,
'provider' => 'app.cache_pool',
],
'cache.def' => [
'default_lifetime' => 'PT11S',
],
'cache.expr' => [
'default_lifetime' => '13 seconds',
],
'cache.chain' => [
'default_lifetime' => 12,
'adapter' => [
'cache.adapter.array',
'cache.adapter.filesystem',
'redis://foo' => 'cache.adapter.redis',
],
],
'cache.custom_ns_chain' => [
'default_lifetime' => 12,
'adapters' => ['chain_cache_custom_ns'],
],
'cache.ccc' => [
'adapter' => 'cache.adapter.array',
'default_lifetime' => 410,
'tags' => true,
],
'cache.redis_tag_aware.foo' => [
'adapter' => 'cache.adapter.redis_tag_aware',
],
'cache.redis_tag_aware.foo2' => [
'tags' => true,
'adapter' => 'cache.adapter.redis_tag_aware',
],
'cache.redis_tag_aware.bar' => [
'adapter' => 'cache.redis_tag_aware.foo',
],
'cache.redis_tag_aware.bar2' => [
'tags' => true,
'adapter' => 'cache.redis_tag_aware.foo',
],
'cache.redis_tag_aware.baz' => [
'adapter' => 'cache.redis_tag_aware.foo2',
],
'cache.redis_tag_aware.baz2' => [
'tags' => true,
'adapter' => 'cache.redis_tag_aware.foo2',
],
],
'cache.ccc' => [
'adapter' => 'cache.adapter.array',
'default_lifetime' => 410,
'tags' => true,
],
'cache.redis_tag_aware.foo' => [
'adapter' => 'cache.adapter.redis_tag_aware',
],
'cache.redis_tag_aware.foo2' => [
'tags' => true,
'adapter' => 'cache.adapter.redis_tag_aware',
],
'cache.redis_tag_aware.bar' => [
'adapter' => 'cache.redis_tag_aware.foo',
],
'cache.redis_tag_aware.bar2' => [
'tags' => true,
'adapter' => 'cache.redis_tag_aware.foo',
],
'cache.redis_tag_aware.baz' => [
'adapter' => 'cache.redis_tag_aware.foo2',
],
'cache.redis_tag_aware.baz2' => [
'tags' => true,
'adapter' => 'cache.redis_tag_aware.foo2',
],
],
],
]);
]);
};
13 changes: 13 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<services>
<defaults autowire="true" autoconfigure="true"/>

<service id="chain_cache_custom_ns" class="Symfony\Component\Cache\Adapter\ChainAdapter">
<argument type="collection">
<argument type="service" id="cache.adapter.array"/>
<argument type="service" id="cache.adapter.filesystem"/>
</argument>
<tag name="cache.pool" namespace="my-custom-ns" />
</service>
</services>

<framework:config http-method-override="false" handle-all-throwables="true">
<framework:annotations enabled="false" />
<framework:php-errors log="true" />
Expand All @@ -19,6 +31,7 @@
<framework:adapter name="cache.adapter.filesystem" />
<framework:adapter name="cache.adapter.redis" provider="redis://foo" />
</framework:pool>
<framework:pool name="cache.custom_ns_chain" adapter="chain_cache_custom_ns" default-lifetime="12" />
<framework:pool name="cache.ccc" adapter="cache.adapter.array" default-lifetime="410" tags="true" />
<framework:pool name="cache.redis_tag_aware.foo" adapter="cache.adapter.redis_tag_aware" />
<framework:pool name="cache.redis_tag_aware.foo2" tags="true" adapter="cache.adapter.redis_tag_aware" />
Expand Down
16 changes: 16 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
services:
_defaults:
autowire: true
autoconfigure: true

chain_cache_custom_ns:
class: Symfony\Component\Cache\Adapter\ChainAdapter
arguments:
- ['@cache.adapter.array', '@cache.adapter.filesystem']
tags:
- { name: cache.pool, namespace: 'my-custom-ns' }


framework:
annotations: false
http_method_override: false
Expand Down Expand Up @@ -26,6 +39,9 @@ framework:
- cache.adapter.array
- cache.adapter.filesystem
- {name: cache.adapter.redis, provider: 'redis://foo'}
cache.custom_ns_chain:
default_lifetime: 12
adapter: 'chain_cache_custom_ns'
cache.ccc:
adapter: cache.adapter.array
default_lifetime: 410
Expand Down
19 changes: 17 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,6 +1752,7 @@ public function testCachePoolServices()
{
$container = $this->createContainerFromFile('cache', [], true, false);
$container->setParameter('cache.prefix.seed', 'test');
$container->addCompilerPass(new ResolveInstanceofConditionalsPass());
$container->addCompilerPass(new CachePoolPass());
$container->compile();

Expand All @@ -1762,9 +1763,7 @@ public function testCachePoolServices()
$this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.expr', 'cache.app', '13 seconds');

$chain = $container->getDefinition('cache.chain');

$this->assertSame(ChainAdapter::class, $chain->getClass());

$this->assertCount(2, $chain->getArguments());
$this->assertCount(3, $chain->getArguments()[0]);

Expand All @@ -1785,6 +1784,22 @@ public function testCachePoolServices()
];
$this->assertEquals($expected, $chain->getArguments());

$chainCustomNs = $container->getDefinition('cache.custom_ns_chain');
$this->assertCount(2, $chainCustomNs->getArguments());
$this->assertCount(2, $chainCustomNs->getArguments()['index_0']);

$expectedCustomNsChain = [
'index_0' => [
(new ChildDefinition('cache.adapter.array'))
->replaceArgument(0, 12),
(new ChildDefinition('cache.adapter.filesystem'))
->replaceArgument(0, 'my-custom-ns')
->replaceArgument(1, 12),
],
'index_1' => 12,
];
$this->assertEquals($expectedCustomNsChain, $chainCustomNs->getArguments());

// Test "tags: true" wrapping logic
$tagAwareDefinition = $container->getDefinition('cache.ccc');
$this->assertSame(TagAwareAdapter::class, $tagAwareDefinition->getClass());
Expand Down
2 changes: 1 addition & 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 @@ -58,7 +58,7 @@ public function process(ContainerBuilder $container)
continue;
}
$class = $adapter->getClass();
while ($adapter instanceof ChildDefinition) {
while (ChainAdapter::class !== $class && $adapter instanceof ChildDefinition) {
$adapter = $container->findDefinition($adapter->getParent());
$class = $class ?: $adapter->getClass();
if ($t = $adapter->getTag('cache.pool')) {
Expand Down
Loading