[FrameworkBundle] Don't clear app pools on cache:clear
This commit is contained in:
parent
09afa64909
commit
b0c04f8354
@ -113,6 +113,10 @@ Form
|
|||||||
FrameworkBundle
|
FrameworkBundle
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
* The `cache:clear` command doesn't clear "app" PSR-6 cache pools anymore,
|
||||||
|
but still clears "system" ones.
|
||||||
|
Use the `cache:pool:clear` command to clear "app" pools instead.
|
||||||
|
|
||||||
* The `doctrine/cache` dependency has been removed; require it via `composer
|
* The `doctrine/cache` dependency has been removed; require it via `composer
|
||||||
require doctrine/cache` if you are using Doctrine cache in your project.
|
require doctrine/cache` if you are using Doctrine cache in your project.
|
||||||
|
|
||||||
|
@ -4,6 +4,8 @@ CHANGELOG
|
|||||||
3.4.0
|
3.4.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
* Made the `cache:clear` command to *not* clear "app" PSR-6 cache pools anymore,
|
||||||
|
but to still clear "system" ones; use the `cache:pool:clear` command to clear "app" pools instead
|
||||||
* Always register a minimalist logger that writes in `stderr`
|
* Always register a minimalist logger that writes in `stderr`
|
||||||
* Deprecated `profiler.matcher` option
|
* Deprecated `profiler.matcher` option
|
||||||
* Added support for `EventSubscriberInterface` on `MicroKernelTrait`
|
* Added support for `EventSubscriberInterface` on `MicroKernelTrait`
|
||||||
|
@ -106,7 +106,7 @@ class CachePoolPass implements CompilerPassInterface
|
|||||||
|
|
||||||
foreach ($clearers as $id => $pools) {
|
foreach ($clearers as $id => $pools) {
|
||||||
$clearer = $container->getDefinition($id);
|
$clearer = $container->getDefinition($id);
|
||||||
if ($clearer instanceof ChilDefinition) {
|
if ($clearer instanceof ChildDefinition) {
|
||||||
$clearer->replaceArgument(0, $pools);
|
$clearer->replaceArgument(0, $pools);
|
||||||
} else {
|
} else {
|
||||||
$clearer->setArgument(0, $pools);
|
$clearer->setArgument(0, $pools);
|
||||||
|
@ -1802,7 +1802,7 @@ class FrameworkExtension extends Extension
|
|||||||
if (!$container->getParameter('kernel.debug')) {
|
if (!$container->getParameter('kernel.debug')) {
|
||||||
$propertyAccessDefinition->setFactory(array(PropertyAccessor::class, 'createCache'));
|
$propertyAccessDefinition->setFactory(array(PropertyAccessor::class, 'createCache'));
|
||||||
$propertyAccessDefinition->setArguments(array(null, null, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
|
$propertyAccessDefinition->setArguments(array(null, null, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
|
||||||
$propertyAccessDefinition->addTag('cache.pool', array('clearer' => 'cache.default_clearer'));
|
$propertyAccessDefinition->addTag('cache.pool', array('clearer' => 'cache.system_clearer'));
|
||||||
$propertyAccessDefinition->addTag('monolog.logger', array('channel' => 'cache'));
|
$propertyAccessDefinition->addTag('monolog.logger', array('channel' => 'cache'));
|
||||||
} else {
|
} else {
|
||||||
$propertyAccessDefinition->setClass(ArrayAdapter::class);
|
$propertyAccessDefinition->setClass(ArrayAdapter::class);
|
||||||
|
@ -29,7 +29,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.default_clearer" />
|
<tag name="cache.pool" clearer="cache.system_clearer" />
|
||||||
<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 -->
|
||||||
@ -101,6 +101,10 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer">
|
<service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer">
|
||||||
|
<argument type="collection" />
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<service id="cache.system_clearer" parent="cache.default_clearer" public="true">
|
||||||
<tag name="kernel.cache_clearer" />
|
<tag name="kernel.cache_clearer" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
|
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
|
||||||
|
|
||||||
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
|
use Symfony\Component\Cache\Adapter\AdapterInterface;
|
||||||
use Symfony\Component\Cache\Adapter\RedisAdapter;
|
use Symfony\Component\Cache\Adapter\RedisAdapter;
|
||||||
use Symfony\Component\Cache\Exception\InvalidArgumentException;
|
use Symfony\Component\Cache\Exception\InvalidArgumentException;
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ class CachePoolsTest extends WebTestCase
|
|||||||
{
|
{
|
||||||
public function testCachePools()
|
public function testCachePools()
|
||||||
{
|
{
|
||||||
$this->doTestCachePools(array(), FilesystemAdapter::class);
|
$this->doTestCachePools(array(), AdapterInterface::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -67,7 +67,7 @@ class CachePoolsTest extends WebTestCase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function doTestCachePools($options, $adapterClass)
|
private function doTestCachePools($options, $adapterClass)
|
||||||
{
|
{
|
||||||
static::bootKernel($options);
|
static::bootKernel($options);
|
||||||
$container = static::$kernel->getContainer();
|
$container = static::$kernel->getContainer();
|
||||||
|
@ -6,6 +6,7 @@ framework:
|
|||||||
pools:
|
pools:
|
||||||
cache.pool1:
|
cache.pool1:
|
||||||
public: true
|
public: true
|
||||||
|
adapter: cache.system
|
||||||
cache.pool2:
|
cache.pool2:
|
||||||
public: true
|
public: true
|
||||||
adapter: cache.pool3
|
adapter: cache.pool3
|
||||||
|
@ -11,6 +11,7 @@ framework:
|
|||||||
pools:
|
pools:
|
||||||
cache.pool1:
|
cache.pool1:
|
||||||
public: true
|
public: true
|
||||||
|
clearer: cache.system_clearer
|
||||||
cache.pool2:
|
cache.pool2:
|
||||||
public: true
|
public: true
|
||||||
clearer: ~
|
clearer: ~
|
||||||
|
@ -22,6 +22,7 @@ framework:
|
|||||||
pools:
|
pools:
|
||||||
cache.pool1:
|
cache.pool1:
|
||||||
public: true
|
public: true
|
||||||
|
clearer: cache.system_clearer
|
||||||
cache.pool2:
|
cache.pool2:
|
||||||
public: true
|
public: true
|
||||||
clearer: ~
|
clearer: ~
|
||||||
|
Reference in New Issue
Block a user