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 b9b03fe

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass [FrameworkBundle] reset cache pools between requests
2 parents e3927b6 + f59bc48 commit b9b03fe
Copy full SHA for b9b03fe

File tree

3 files changed

+12
-13
lines changed
Filter options

3 files changed

+12
-13
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
+8-8Lines changed: 8 additions & 8 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.app.simple" class="Symfony\Component\Cache\Psr16Cache">
@@ -46,7 +46,7 @@
4646

4747
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
4848
<factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
49-
<tag name="cache.pool" clearer="cache.system_clearer" />
49+
<tag name="cache.pool" clearer="cache.system_clearer" reset="reset" />
5050
<tag name="monolog.logger" channel="cache" />
5151
<argument /> <!-- namespace -->
5252
<argument>0</argument> <!-- default lifetime -->
@@ -56,7 +56,7 @@
5656
</service>
5757

5858
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
59-
<tag name="cache.pool" clearer="cache.default_clearer" />
59+
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
6060
<tag name="monolog.logger" channel="cache" />
6161
<argument /> <!-- namespace -->
6262
<argument>0</argument> <!-- default lifetime -->
@@ -67,7 +67,7 @@
6767
</service>
6868

6969
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true">
70-
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" />
70+
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" reset="reset" />
7171
<tag name="monolog.logger" channel="cache" />
7272
<argument /> <!-- Doctrine provider service -->
7373
<argument /> <!-- namespace -->
@@ -78,7 +78,7 @@
7878
</service>
7979

8080
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true">
81-
<tag name="cache.pool" clearer="cache.default_clearer" />
81+
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
8282
<tag name="monolog.logger" channel="cache" />
8383
<argument /> <!-- namespace -->
8484
<argument>0</argument> <!-- default lifetime -->
@@ -90,14 +90,14 @@
9090
</service>
9191

9292
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true">
93-
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" />
93+
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" reset="reset" />
9494
<argument /> <!-- PSR-6 provider service -->
9595
<argument /> <!-- namespace -->
9696
<argument>0</argument> <!-- default lifetime -->
9797
</service>
9898

9999
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true">
100-
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" />
100+
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" reset="reset" />
101101
<tag name="monolog.logger" channel="cache" />
102102
<argument /> <!-- Redis connection service -->
103103
<argument /> <!-- namespace -->
@@ -134,7 +134,7 @@
134134
</service>
135135

136136
<service id="cache.adapter.array" class="Symfony\Component\Cache\Adapter\ArrayAdapter" abstract="true">
137-
<tag name="cache.pool" clearer="cache.default_clearer" />
137+
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
138138
<tag name="monolog.logger" channel="cache" />
139139
<argument>0</argument> <!-- default lifetime -->
140140
<call method="setLogger">

‎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
@@ -20,7 +20,6 @@
2020
use Symfony\Component\Cache\Adapter\AdapterInterface;
2121
use Symfony\Component\Cache\Adapter\ApcuAdapter;
2222
use Symfony\Component\Cache\Adapter\ArrayAdapter;
23-
use Symfony\Component\Cache\Adapter\ChainAdapter;
2423
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
2524
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
2625
use Symfony\Component\Cache\Adapter\ProxyAdapter;
@@ -1663,10 +1662,6 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
16631662
$this->assertSame(DoctrineAdapter::class, $parentDefinition->getClass());
16641663
break;
16651664
case 'cache.app':
1666-
if (ChainAdapter::class === $parentDefinition->getClass()) {
1667-
break;
1668-
}
1669-
// no break
16701665
case 'cache.adapter.filesystem':
16711666
$this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
16721667
break;

‎src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
200200
$bag = $this->getParameterBag();
201201
$value = $bag->resolveValue($value);
202202

203+
if (!$bag instanceof EnvPlaceholderParameterBag) {
204+
return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
205+
}
206+
203207
foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
204208
if (false === strpos($env, ':')) {
205209
continue;

0 commit comments

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