[FrameworkBundle] Allow clearing private cache pools

Author: chalasr

CacheClearer/Psr6CacheClearer.php

@@ -20,11 +20,32 @@ class Psr6CacheClearer implements CacheClearerInterface
 {
     private $pools = array();
 
+    public function __construct(array $pools = array())
+    {
+        $this->pools = $pools;
+    }
+
     public function addPool(CacheItemPoolInterface $pool)
     {
+        @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Pass an array of pools indexed by name to the constructor instead.', __METHOD__), E_USER_DEPRECATED);
+
         $this->pools[] = $pool;
     }
 
+    public function hasPool($name)
+    {
+        return isset($this->pools[$name]);
+    }
+
+    public function clearPool($name)
+    {
+        if (!isset($this->pools[$name])) {
+            throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));
+        }
+
+        return $this->pools[$name]->clear();
+    }
+
     /**
      * {@inheritdoc}
      */

Tests/CacheClearer/Psr6CacheClearerTest.php

@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\CacheClearer;
+
+use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
+use Psr\Cache\CacheItemPoolInterface;
+
+class Psr6CacheClearerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testClearPoolsInjectedInConstructor()
+    {
+        $pool = $this->getMock(CacheItemPoolInterface::class);
+        $pool
+            ->expects($this->once())
+            ->method('clear');
+
+        (new Psr6CacheClearer(array('pool' => $pool)))->clear('');
+    }
+
+    public function testClearPool()
+    {
+        $pool = $this->getMock(CacheItemPoolInterface::class);
+        $pool
+            ->expects($this->once())
+            ->method('clear');
+
+        (new Psr6CacheClearer(array('pool' => $pool)))->clearPool('pool');
+    }
+
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Cache pool not found: unknown
+     */
+    public function testClearPoolThrowsExceptionOnUnreferencedPool()
+    {
+        (new Psr6CacheClearer())->clearPool('unknown');
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation The Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer::addPool() method is deprecated since version 3.3 and will be removed in 4.0. Pass an array of pools indexed by name to the constructor instead.
+     */
+    public function testClearPoolsInjectedByAdder()
+    {
+        $pool1 = $this->getMock(CacheItemPoolInterface::class);
+        $pool1
+            ->expects($this->once())
+            ->method('clear');
+
+        $pool2 = $this->getMock(CacheItemPoolInterface::class);
+        $pool2
+            ->expects($this->once())
+            ->method('clear');
+
+        $clearer = new Psr6CacheClearer(array('pool1' => $pool1));
+        $clearer->addPool($pool2);
+        $clearer->clear('');
+    }
+}