[FrameworkBundle] Don't clear app pools on cache:clear

nicolas-grekas · nicolas-grekas · commit b0c04f83544c · 2017-09-30T20:17:55.000+02:00
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -113,6 +113,10 @@ Form
 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
    require doctrine/cache` if you are using Doctrine cache in your project.
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 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`
  * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -106,7 +106,7 @@ public function process(ContainerBuilder $container)
 
         foreach ($clearers as $id => $pools) {
             $clearer = $container->getDefinition($id);
-            if ($clearer instanceof ChilDefinition) {
+            if ($clearer instanceof ChildDefinition) {
                 $clearer->replaceArgument(0, $pools);
             } else {
                 $clearer->setArgument(0, $pools);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1802,7 +1802,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
             if (!$container->getParameter('kernel.debug')) {
                 $propertyAccessDefinition->setFactory(array(PropertyAccessor::class, 'createCache'));
                 $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'));
             } else {
                 $propertyAccessDefinition->setClass(ArrayAdapter::class);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -29,7 +29,7 @@
 
         <service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
             <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" />
             <argument /> <!-- namespace -->
             <argument>0</argument> <!-- default lifetime -->
@@ -101,6 +101,10 @@
         </service>
 
         <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" />
         </service>
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -11,15 +11,15 @@
 
 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\Exception\InvalidArgumentException;
 
 class CachePoolsTest extends WebTestCase
 {
     public function testCachePools()
     {
-        $this->doTestCachePools(array(), FilesystemAdapter::class);
+        $this->doTestCachePools(array(), AdapterInterface::class);
     }
 
     /**
@@ -67,7 +67,7 @@ public function testRedisCustomCachePools()
         }
     }
 
-    public function doTestCachePools($options, $adapterClass)
+    private function doTestCachePools($options, $adapterClass)
     {
         static::bootKernel($options);
         $container = static::$kernel->getContainer();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/config.yml
@@ -6,6 +6,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                adapter: cache.system
             cache.pool2:
                 public: true
                 adapter: cache.pool3
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_config.yml
@@ -11,6 +11,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                clearer: cache.system_clearer
             cache.pool2:
                 public: true
                 clearer: ~
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
@@ -22,6 +22,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                clearer: cache.system_clearer
             cache.pool2:
                 public: true
                 clearer: ~

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;`
`13`	`13`
`14`		`-use Symfony\Component\Cache\Adapter\FilesystemAdapter;`
	`14`	`+use Symfony\Component\Cache\Adapter\AdapterInterface;`
`15`	`15`	`use Symfony\Component\Cache\Adapter\RedisAdapter;`
`16`	`16`	`use Symfony\Component\Cache\Exception\InvalidArgumentException;`
`17`	`17`
`18`	`18`	`class CachePoolsTest extends WebTestCase`
`19`	`19`	`{`
`20`	`20`	`public function testCachePools()`
`21`	`21`	`{`
`22`		`- $this->doTestCachePools(array(), FilesystemAdapter::class);`
	`22`	`+ $this->doTestCachePools(array(), AdapterInterface::class);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/**`
`@@ -67,7 +67,7 @@ public function testRedisCustomCachePools()`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- public function doTestCachePools($options, $adapterClass)`
	`70`	`+ private function doTestCachePools($options, $adapterClass)`
`71`	`71`	`{`
`72`	`72`	`static::bootKernel($options);`
`73`	`73`	`$container = static::$kernel->getContainer();`