bug #50475 [FrameworkBundle] Prevent cache:clear to lose files on subsequent runs (Okhoshi)

nicolas-grekas · nicolas-grekas · commit 8e9351715506 · 2023-07-07T10:27:02.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #50474 | License | MIT | Doc PR | N/A See #50474 for the details and reproduction information. Commits ------- 61bdd80 [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 if ($output->isVerbose()) {
                     $io->comment('Warming up optional cache...');
                 }
-                $this->warmupOptionals($realCacheDir);
+                $this->warmupOptionals($realCacheDir, $realBuildDir);
             }
         } else {
             $fs->mkdir($warmupDir);
@@ -152,7 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     if ($output->isVerbose()) {
                         $io->comment('Warming up optional cache...');
                     }
-                    $this->warmupOptionals($realCacheDir);
+                    $this->warmupOptionals($useBuildDir ? $realCacheDir : $warmupDir, $warmupDir);
                 }
             }
 
@@ -247,15 +247,15 @@ private function warmup(string $warmupDir, string $realBuildDir): void
         }
     }
 
-    private function warmupOptionals(string $realCacheDir): void
+    private function warmupOptionals(string $cacheDir, string $warmupDir): void
     {
         $kernel = $this->getApplication()->getKernel();
         $warmer = $kernel->getContainer()->get('cache_warmer');
         // non optional warmers already ran during container compilation
         $warmer->enableOnlyOptionalWarmers();
-        $preload = (array) $warmer->warmUp($realCacheDir);
+        $preload = (array) $warmer->warmUp($cacheDir);
 
-        if ($preload && file_exists($preloadFile = $realCacheDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
+        if ($preload && file_exists($preloadFile = $warmupDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
             Preloader::append($preloadFile, $preload);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`137`	`137`	`if ($output->isVerbose()) {`
`138`	`138`	`$io->comment('Warming up optional cache...');`
`139`	`139`	`}`
`140`		`- $this->warmupOptionals($realCacheDir);`
	`140`	`+ $this->warmupOptionals($realCacheDir, $realBuildDir);`
`141`	`141`	`}`
`142`	`142`	`} else {`
`143`	`143`	`$fs->mkdir($warmupDir);`
`@@ -152,7 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`152`	`152`	`if ($output->isVerbose()) {`
`153`	`153`	`$io->comment('Warming up optional cache...');`
`154`	`154`	`}`
`155`		`- $this->warmupOptionals($realCacheDir);`
	`155`	`+ $this->warmupOptionals($useBuildDir ? $realCacheDir : $warmupDir, $warmupDir);`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`@@ -247,15 +247,15 @@ private function warmup(string $warmupDir, string $realBuildDir): void`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`
`250`		`- private function warmupOptionals(string $realCacheDir): void`
	`250`	`+ private function warmupOptionals(string $cacheDir, string $warmupDir): void`
`251`	`251`	`{`
`252`	`252`	`$kernel = $this->getApplication()->getKernel();`
`253`	`253`	`$warmer = $kernel->getContainer()->get('cache_warmer');`
`254`	`254`	`// non optional warmers already ran during container compilation`
`255`	`255`	`$warmer->enableOnlyOptionalWarmers();`
`256`		`- $preload = (array) $warmer->warmUp($realCacheDir);`
	`256`	`+ $preload = (array) $warmer->warmUp($cacheDir);`
`257`	`257`
`258`		`- if ($preload && file_exists($preloadFile = $realCacheDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {`
	`258`	`+ if ($preload && file_exists($preloadFile = $warmupDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {`
`259`	`259`	`Preloader::append($preloadFile, $preload);`
`260`	`260`	`}`
`261`	`261`	`}`