[BUGFIX] Don't try to flush DB caches after install

Classes/Command/CacheCommandController.php

@@ -49,11 +49,16 @@ public function __construct(CacheService $cacheService, CommandDispatcher $comma
      * Flushes TYPO3 core caches first and after that, flushes caches from extensions.
      *
      * @param bool $force Cache is forcibly flushed (low level operations are performed)
+     * @param bool $filesOnly Only file caches are flushed (low level operations are performed)
      * @throws \Helhum\Typo3Console\Mvc\Cli\FailedSubProcessCommandException
      */
-    public function flushCommand($force = false)
+    public function flushCommand($force = false, $filesOnly = false)
     {
-        $this->cacheService->flush($force);
+        $this->cacheService->flush($force, $filesOnly);
+        if ($filesOnly) {
+            $this->outputLine('Force flushed file caches.');
+            return;
+        }
         $this->commandDispatcher->executeCommand('cache:flushcomplete');
         $this->outputLine(sprintf('%slushed all caches.', $force ? 'Force f' : 'F'));
     }

Classes/Install/CliSetupRequestHandler.php

@@ -148,7 +148,7 @@ public function setup($interactiveSetup, array $givenRequestArguments)
             $this->output->outputLine('<warning>The error message was "%s"</warning>', [$e->getPrevious()->getMessage()]);
         }
         // Flush caches, as the extension list has changed
-        $this->commandDispatcher->executeCommand('cache:flush', ['--force' => true]);
+        $this->commandDispatcher->executeCommand('cache:flush', ['--files-only' => true]);
         $this->commandDispatcher->executeCommand('extension:setupactive');
     }
 

Classes/Service/CacheService.php

@@ -54,11 +54,12 @@ public function __construct(CacheManager $cacheManager, ConfigurationService $co
      * Flushes all caches
      *
      * @param bool $force
+     * @param bool $onlyFileCaches
      */
-    public function flush($force = false)
+    public function flush($force = false, $onlyFileCaches = false)
     {
-        if ($force) {
-            $this->forceFlushCoreFileAndDatabaseCaches();
+        if ($force || $onlyFileCaches) {
+            $this->forceFlushCoreFileAndDatabaseCaches($onlyFileCaches);
         }
         $this->cacheManager->flushCaches();
     }
@@ -167,23 +168,30 @@ protected function ensureCacheGroupsExist($groups)
 
     /**
      * Recursively delete cache directory and truncate all DB tables prefixed with 'cf_'
+     *
+     * @param bool $onlyFileCaches
      */
-    protected function forceFlushCoreFileAndDatabaseCaches()
+    protected function forceFlushCoreFileAndDatabaseCaches($onlyFileCaches)
     {
         if (class_exists(ConnectionPool::class)) {
-            $this->_forceFlushCoreFileAndDatabaseCaches();
+            $this->_forceFlushCoreFileAndDatabaseCaches($onlyFileCaches);
         } else {
-            $this->_legacyForceFlushCoreFileAndDatabaseCaches();
+            $this->_legacyForceFlushCoreFileAndDatabaseCaches($onlyFileCaches);
         }
     }
 
     /**
      * Recursively delete cache directory and truncate all DB tables prefixed with 'cf_'
+     *
      * @deprecated Will be removed once TYPO3 7.6 support is removed
+     * @param bool $onlyFileCaches
      */
-    private function _legacyForceFlushCoreFileAndDatabaseCaches()
+    private function _legacyForceFlushCoreFileAndDatabaseCaches($onlyFileCaches)
     {
         GeneralUtility::flushDirectory(PATH_site . 'typo3temp/Cache', true);
+        if ($onlyFileCaches) {
+            return;
+        }
         // Get all table names starting with 'cf_' and truncate them
         /** @var DatabaseConnection $db */
         $db = $GLOBALS['TYPO3_DB'];
@@ -198,11 +206,16 @@ private function _legacyForceFlushCoreFileAndDatabaseCaches()
 
     /**
      * Recursively delete cache directory and truncate all DB tables prefixed with 'cf_'
+     *
+     * @param bool $onlyFileCaches
      */
-    private function _forceFlushCoreFileAndDatabaseCaches()
+    private function _forceFlushCoreFileAndDatabaseCaches($onlyFileCaches)
     {
         // Delete typo3temp/Cache
         GeneralUtility::flushDirectory(PATH_site . 'typo3temp/var/Cache', true);
+        if ($onlyFileCaches) {
+            return;
+        }
         // Get all table names from Default connection starting with 'cf_' and truncate them
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $connection = $connectionPool->getConnectionByName('Default');

Documentation/CommandReference/Index.rst

@@ -159,6 +159,8 @@ Options
 
 ``--force``
   Cache is forcibly flushed (low level operations are performed)
+``--files-only``
+  Only file caches are flushed (low level operations are performed)
 
 
 

Tests/Functional/Command/CacheCommandControllerTest.php

@@ -35,6 +35,15 @@ public function cacheCanBeForceFlushedFlushed()
         $this->assertSame('Force flushed all caches.', $output);
     }
 
+    /**
+     * @test
+     */
+    public function fileCachesCanBeForceFlushedFlushed()
+    {
+        $output = $this->commandDispatcher->executeCommand('cache:flush', ['--files-only' => true]);
+        $this->assertSame('Force flushed file caches.', $output);
+    }
+
     /**
      * @test
      */