Merge branch '4.3' into 4.4
* 4.3: [DI] fix processing of regular parameter bags by MergeExtensionConfigurationPass [FrameworkBundle] reset cache pools between requests
This commit is contained in:
commit
b9b03fe1d3
@ -8,7 +8,7 @@
|
|||||||
<defaults public="false" />
|
<defaults public="false" />
|
||||||
|
|
||||||
<service id="cache.app" parent="cache.adapter.filesystem" public="true">
|
<service id="cache.app" parent="cache.adapter.filesystem" public="true">
|
||||||
<tag name="cache.pool" clearer="cache.app_clearer" reset="reset" />
|
<tag name="cache.pool" clearer="cache.app_clearer" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.app.simple" class="Symfony\Component\Cache\Psr16Cache">
|
<service id="cache.app.simple" class="Symfony\Component\Cache\Psr16Cache">
|
||||||
@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
|
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
|
||||||
<factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
|
<factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
|
||||||
<tag name="cache.pool" clearer="cache.system_clearer" />
|
<tag name="cache.pool" clearer="cache.system_clearer" reset="reset" />
|
||||||
<tag name="monolog.logger" channel="cache" />
|
<tag name="monolog.logger" channel="cache" />
|
||||||
<argument /> <!-- namespace -->
|
<argument /> <!-- namespace -->
|
||||||
<argument>0</argument> <!-- default lifetime -->
|
<argument>0</argument> <!-- default lifetime -->
|
||||||
@ -56,7 +56,7 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
|
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
|
||||||
<tag name="cache.pool" clearer="cache.default_clearer" />
|
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
|
||||||
<tag name="monolog.logger" channel="cache" />
|
<tag name="monolog.logger" channel="cache" />
|
||||||
<argument /> <!-- namespace -->
|
<argument /> <!-- namespace -->
|
||||||
<argument>0</argument> <!-- default lifetime -->
|
<argument>0</argument> <!-- default lifetime -->
|
||||||
@ -67,7 +67,7 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true">
|
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true">
|
||||||
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" />
|
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" reset="reset" />
|
||||||
<tag name="monolog.logger" channel="cache" />
|
<tag name="monolog.logger" channel="cache" />
|
||||||
<argument /> <!-- Doctrine provider service -->
|
<argument /> <!-- Doctrine provider service -->
|
||||||
<argument /> <!-- namespace -->
|
<argument /> <!-- namespace -->
|
||||||
@ -78,7 +78,7 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true">
|
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true">
|
||||||
<tag name="cache.pool" clearer="cache.default_clearer" />
|
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
|
||||||
<tag name="monolog.logger" channel="cache" />
|
<tag name="monolog.logger" channel="cache" />
|
||||||
<argument /> <!-- namespace -->
|
<argument /> <!-- namespace -->
|
||||||
<argument>0</argument> <!-- default lifetime -->
|
<argument>0</argument> <!-- default lifetime -->
|
||||||
@ -90,14 +90,14 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true">
|
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true">
|
||||||
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" />
|
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" reset="reset" />
|
||||||
<argument /> <!-- PSR-6 provider service -->
|
<argument /> <!-- PSR-6 provider service -->
|
||||||
<argument /> <!-- namespace -->
|
<argument /> <!-- namespace -->
|
||||||
<argument>0</argument> <!-- default lifetime -->
|
<argument>0</argument> <!-- default lifetime -->
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true">
|
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true">
|
||||||
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" />
|
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" reset="reset" />
|
||||||
<tag name="monolog.logger" channel="cache" />
|
<tag name="monolog.logger" channel="cache" />
|
||||||
<argument /> <!-- Redis connection service -->
|
<argument /> <!-- Redis connection service -->
|
||||||
<argument /> <!-- namespace -->
|
<argument /> <!-- namespace -->
|
||||||
@ -134,7 +134,7 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.adapter.array" class="Symfony\Component\Cache\Adapter\ArrayAdapter" abstract="true">
|
<service id="cache.adapter.array" class="Symfony\Component\Cache\Adapter\ArrayAdapter" abstract="true">
|
||||||
<tag name="cache.pool" clearer="cache.default_clearer" />
|
<tag name="cache.pool" clearer="cache.default_clearer" reset="reset" />
|
||||||
<tag name="monolog.logger" channel="cache" />
|
<tag name="monolog.logger" channel="cache" />
|
||||||
<argument>0</argument> <!-- default lifetime -->
|
<argument>0</argument> <!-- default lifetime -->
|
||||||
<call method="setLogger">
|
<call method="setLogger">
|
||||||
|
@ -20,7 +20,6 @@ use Symfony\Bundle\FullStack;
|
|||||||
use Symfony\Component\Cache\Adapter\AdapterInterface;
|
use Symfony\Component\Cache\Adapter\AdapterInterface;
|
||||||
use Symfony\Component\Cache\Adapter\ApcuAdapter;
|
use Symfony\Component\Cache\Adapter\ApcuAdapter;
|
||||||
use Symfony\Component\Cache\Adapter\ArrayAdapter;
|
use Symfony\Component\Cache\Adapter\ArrayAdapter;
|
||||||
use Symfony\Component\Cache\Adapter\ChainAdapter;
|
|
||||||
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
|
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
|
||||||
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
|
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
|
||||||
use Symfony\Component\Cache\Adapter\ProxyAdapter;
|
use Symfony\Component\Cache\Adapter\ProxyAdapter;
|
||||||
@ -1663,10 +1662,6 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$this->assertSame(DoctrineAdapter::class, $parentDefinition->getClass());
|
$this->assertSame(DoctrineAdapter::class, $parentDefinition->getClass());
|
||||||
break;
|
break;
|
||||||
case 'cache.app':
|
case 'cache.app':
|
||||||
if (ChainAdapter::class === $parentDefinition->getClass()) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
// no break
|
|
||||||
case 'cache.adapter.filesystem':
|
case 'cache.adapter.filesystem':
|
||||||
$this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
|
$this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
|
||||||
break;
|
break;
|
||||||
|
@ -200,6 +200,10 @@ class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder
|
|||||||
$bag = $this->getParameterBag();
|
$bag = $this->getParameterBag();
|
||||||
$value = $bag->resolveValue($value);
|
$value = $bag->resolveValue($value);
|
||||||
|
|
||||||
|
if (!$bag instanceof EnvPlaceholderParameterBag) {
|
||||||
|
return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
|
foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
|
||||||
if (false === strpos($env, ':')) {
|
if (false === strpos($env, ':')) {
|
||||||
continue;
|
continue;
|
||||||
|
Reference in New Issue
Block a user