symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
+12-10Lines changed: 12 additions & 10 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
+12-10Lines changed: 12 additions & 10 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/CacheClearer/CachePoolClearer.php
Copy file name to clipboard
+55Lines changed: 55 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/CacheClearer/CachePoolClearer.php
Copy file name to clipboard
+55Lines changed: 55 additions & 0 deletions
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Command;
 
-use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -55,16 +54,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $clearers = array();
         $container = $this->getContainer();
         $cacheDir = $container->getParameter('kernel.cache_dir');
+        $poolClearer = $container->get('cache.pool_clearer');
 
         foreach ($input->getArgument('pools') as $id) {
-            $pool = $container->get($id);
-
-            if ($pool instanceof CacheItemPoolInterface) {
-                $pools[$id] = $pool;
-            } elseif ($pool instanceof Psr6CacheClearer) {
-                $clearers[$id] = $pool;
+            if ($poolClearer->hasPool($id)) {
+                $pools[] = $id;
             } else {
-                throw new \InvalidArgumentException(sprintf('"%s" is not a cache pool nor a cache clearer.', $id));
+                $clearer = $container->get($id);
+
+                if (!$clearer instanceof Psr6CacheClearer) {
+                    throw new \InvalidArgumentException(sprintf('"%s" is not a cache pool nor a cache clearer.', $id));
+                }
+
+                $clearers[$id] = $clearer;
             }
         }
 
@@ -73,9 +75,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $clearer->clear($cacheDir);
         }
 
-        foreach ($pools as $id => $pool) {
+        foreach ($pools as $id) {
             $io->comment(sprintf('Clearing cache pool: <info>%s</info>', $id));
-            $pool->clear();
+            $poolClearer->clearPool($id);
         }
 
         $io->success('Cache was successfully cleared.');
 
@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\HttpKernel\CacheClearer\CachePoolClearer;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -42,6 +43,10 @@ public function process(ContainerBuilder $container)
             'namespace',
             'default_lifetime',
         );
+
+        $poolClearer = new Definition(CachePoolClearer::class);
+        $container->setDefinition('cache.pool_clearer', $poolClearer);
+
         foreach ($container->findTaggedServiceIds('cache.pool') as $id => $tags) {
             $adapter = $pool = $container->getDefinition($id);
             if ($pool->isAbstract()) {
@@ -83,6 +88,8 @@ public function process(ContainerBuilder $container)
             if (null !== $clearer) {
                 $pool->addTag('cache.pool', array('clearer' => $clearer));
             }
+
+            $poolClearer->addMethodCall('addPool', array($id, new Reference($id)));
         }
     }
 
 
@@ -0,0 +1,55 @@
+<?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\CacheClearer;
+
+use Psr\Cache\CacheItemPoolInterface;
+
+/**
+ * PSR-6 per-pool cache clearer.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ *
+ * @internal
+ */
+final class CachePoolClearer implements CacheClearerInterface
+{
+    private $pools = array();
+
+    public function addPool($id, CacheItemPoolInterface $pool)
+    {
+        $this->pools[$id] = $pool;
+    }
+
+    public function hasPool($id)
+    {
+        return isset($this->pools[$id]);
+    }
+
+    public function clearPool($id)
+    {
+        if (!$this->hasPool($id)) {
+            throw new \LogicException(sprintf('Cache pool "%s" doesn\'t exist', $id));
+        }
+
+        $this->pools[$id]->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear($cacheDir)
+    {
+        foreach ($this->pools as $pool) {
+            $pool->clear();
+        }
+    }
+}