Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5ff45ba

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
[FrameworkBundle] reset cache pools between requests
1 parent 081c601 commit 5ff45ba
Copy full SHA for 5ff45ba

File tree

Expand file treeCollapse file tree

2 files changed

+7
-12
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+7
-12
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<defaults public="false" />
99

1010
<service id="cache.app" parent="cache.adapter.filesystem" public="true">
11-
<tag name="cache.pool" clearer="cache.app_clearer" reset="reset" />
11+
<tag name="cache.pool" clearer="cache.app_clearer" />
1212
</service>
1313

1414
<service id="cache.system" parent="cache.adapter.system" public="true">
@@ -29,7 +29,7 @@
2929

3030
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
3131
<factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
32-
<tag name="cache.pool" clearer="cache.system_clearer" />
32+
<tag name="cache.pool" clearer="cache.system_clearer" reset="reset" />
3333
<tag name="monolog.logger" channel="cache" />
3434
<argument /> <!-- namespace -->
3535
<argument>0</argument> <!-- default lifetime -->
@@ -39,7 +39,7 @@
3939
</service>
4040

4141
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
42-
<tag name="cache.pool" clearer="cache.default_clearer" />
42+
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
4343
<tag name="monolog.logger" channel="cache" />
4444
<argument /> <!-- namespace -->
4545
<argument>0</argument> <!-- default lifetime -->
@@ -50,7 +50,7 @@
5050
</service>
5151

5252
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true">
53-
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" />
53+
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" reset="reset" />
5454
<tag name="monolog.logger" channel="cache" />
5555
<argument /> <!-- Doctrine provider service -->
5656
<argument /> <!-- namespace -->
@@ -61,7 +61,7 @@
6161
</service>
6262

6363
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true">
64-
<tag name="cache.pool" clearer="cache.default_clearer" />
64+
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
6565
<tag name="monolog.logger" channel="cache" />
6666
<argument /> <!-- namespace -->
6767
<argument>0</argument> <!-- default lifetime -->
@@ -72,14 +72,14 @@
7272
</service>
7373

7474
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true">
75-
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" />
75+
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" reset="reset" />
7676
<argument /> <!-- PSR-6 provider service -->
7777
<argument /> <!-- namespace -->
7878
<argument>0</argument> <!-- default lifetime -->
7979
</service>
8080

8181
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true">
82-
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" />
82+
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" reset="reset" />
8383
<tag name="monolog.logger" channel="cache" />
8484
<argument /> <!-- Redis connection service -->
8585
<argument /> <!-- namespace -->

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
use Symfony\Component\Cache\Adapter\AdapterInterface;
2020
use Symfony\Component\Cache\Adapter\ApcuAdapter;
2121
use Symfony\Component\Cache\Adapter\ArrayAdapter;
22-
use Symfony\Component\Cache\Adapter\ChainAdapter;
2322
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
2423
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
2524
use Symfony\Component\Cache\Adapter\ProxyAdapter;
@@ -1244,10 +1243,6 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
12441243
$this->assertSame(DoctrineAdapter::class, $parentDefinition->getClass());
12451244
break;
12461245
case 'cache.app':
1247-
if (ChainAdapter::class === $parentDefinition->getClass()) {
1248-
break;
1249-
}
1250-
// no break
12511246
case 'cache.adapter.filesystem':
12521247
$this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
12531248
break;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.