Throw exception when clear failed

jderusse · jderusse · commit f36d2d0580ec · 2021-01-26T12:24:15.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
@@ -89,16 +89,25 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $clearer->clear($kernel->getContainer()->getParameter('kernel.cache_dir'));
         }
 
+        $failures = [];
         foreach ($pools as $id => $pool) {
             $io->comment(sprintf('Clearing cache pool: <info>%s</info>', $id));
 
             if ($pool instanceof CacheItemPoolInterface) {
-                $pool->clear();
+                if (!$pool->clear()) {
+                    $failures[] = $id;
+                }
             } else {
-                $this->poolClearer->clearPool($id);
+                if (false === $this->poolClearer->clearPool($id)) {
+                    $failures[] = $id;
+                }
             }
         }
 
+        if ($failures) {
+            throw new \Exception(sprintf('Cache pool "%s" could not be cleared.', implode('", "', $failures)));
+        }
+
         $io->success('Cache was successfully cleared.');
 
         return 0;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -13,7 +13,9 @@
 
 use Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Finder\SplFileInfo;
 
 /**
  * @group functional
@@ -73,6 +75,33 @@ public function testClearUnexistingPool()
             ->execute(['pools' => ['unknown_pool']], ['decorated' => false]);
     }
 
+    public function testClearFailed()
+    {
+        $tester = $this->createCommandTester();
+        /** @var FilesystemAdapter $pool */
+        $pool = static::$container->get('cache.public_pool');
+        $item = $pool->getItem('foo');
+        $item->set('baz');
+        $pool->save($item);
+        $r = new \ReflectionObject($pool);
+        $p = $r->getProperty('directory');
+        $p->setAccessible(true);
+        $poolDir = $p->getValue($pool);
+
+        /** @var SplFileInfo $entry */
+        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($poolDir)) as $entry) {
+            // converts files into dir to make adapter fail
+            if ($entry->isFile()) {
+                \unlink($entry->getPathname());
+                \mkdir($entry->getPathname());
+            }
+        }
+
+        $this->expectExceptionMessage('Cache pool "cache.public_pool" could not be cleared.');
+
+        $tester->execute(['pools' => ['cache.public_pool']]);
+    }
+
     private function createCommandTester()
     {
         $application = new Application(static::$kernel);
