bug #38548 [FrameworkBundle] Bugfixes in buildDir in the CacheClear command (Nyholm)

nicolas-grekas · nicolas-grekas · commit 8fa0573ab643 · 2020-10-13T20:01:53.000+02:00
This PR was squashed before being merged into the 5.x branch. Discussion ---------- [FrameworkBundle] Bugfixes in buildDir in the CacheClear command | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38547 | License | MIT | Doc PR | n/a Making sure one can clear cache with and without a buildDir Commits ------- 2cad6bb [FrameworkBundle] Bugfixes in buildDir in the CacheClear command
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -83,19 +83,27 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $realCacheDir = $kernel->getContainer()->getParameter('kernel.cache_dir');
         // the old cache dir name must not be longer than the real one to avoid exceeding
         // the maximum length of a directory or file path within it (esp. Windows MAX_PATH)
-        $oldBuildDir = substr($realBuildDir, 0, -1).('~' === substr($realBuildDir, -1) ? '+' : '~');
         $oldCacheDir = substr($realCacheDir, 0, -1).('~' === substr($realCacheDir, -1) ? '+' : '~');
-        $fs->remove([$oldBuildDir, $oldCacheDir]);
+        $fs->remove($oldCacheDir);
 
-        if (!is_writable($realBuildDir)) {
-            throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realBuildDir));
-        }
         if (!is_writable($realCacheDir)) {
             throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir));
         }
 
+        $useBuildDir = $realBuildDir !== $realCacheDir;
+        if ($useBuildDir) {
+            $oldBuildDir = substr($realBuildDir, 0, -1).('~' === substr($realBuildDir, -1) ? '+' : '~');
+            $fs->remove($oldBuildDir);
+
+            if (!is_writable($realBuildDir)) {
+                throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realBuildDir));
+            }
+        }
+
         $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
-        $this->cacheClearer->clear($realBuildDir);
+        if ($useBuildDir) {
+            $this->cacheClearer->clear($realBuildDir);
+        }
         $this->cacheClearer->clear($realCacheDir);
 
         // The current event dispatcher is stale, let's not use it anymore
@@ -141,7 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             if (!$fs->exists($warmupDir.'/'.$containerDir)) {
-                $fs->rename($realCacheDir.'/'.$containerDir, $warmupDir.'/'.$containerDir);
+                $fs->rename($realBuildDir.'/'.$containerDir, $warmupDir.'/'.$containerDir);
                 touch($warmupDir.'/'.$containerDir.'.legacy');
             }
 
@@ -161,31 +169,33 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 }
             }
 
-            if ($oldBuildDir) {
-                $fs->rename($realBuildDir, $oldBuildDir);
-            } else {
-                $fs->remove($realBuildDir);
-            }
             if ($oldCacheDir) {
                 $fs->rename($realCacheDir, $oldCacheDir);
             } else {
                 $fs->remove($realCacheDir);
             }
             $fs->rename($warmupDir, $realCacheDir);
-            // Copy the content of the warmed cache in the build dir
-            $fs->copy($realCacheDir, $realBuildDir);
+
+            if ($useBuildDir) {
+                $fs->rename($realBuildDir, $oldBuildDir);
+                // Copy the content of the warmed cache in the build dir
+                $fs->mirror($realCacheDir, $realBuildDir);
+            }
 
             if ($output->isVerbose()) {
                 $io->comment('Removing old build and cache directory...');
             }
 
-            try {
-                $fs->remove($oldBuildDir);
-            } catch (IOException $e) {
-                if ($output->isVerbose()) {
-                    $io->warning($e->getMessage());
+            if ($useBuildDir) {
+                try {
+                    $fs->remove($oldBuildDir);
+                } catch (IOException $e) {
+                    if ($output->isVerbose()) {
+                        $io->warning($e->getMessage());
+                    }
                 }
             }
+
             try {
                 $fs->remove($oldCacheDir);
             } catch (IOException $e) {
