diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index b0d5565398d2d..053810757a0d8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -137,14 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
if ($output->isVerbose()) {
$io->comment('Warming up optional cache...');
}
- $warmer = $kernel->getContainer()->get('cache_warmer');
- // non optional warmers already ran during container compilation
- $warmer->enableOnlyOptionalWarmers();
- $preload = (array) $warmer->warmUp($realCacheDir);
-
- if ($preload && file_exists($preloadFile = $realCacheDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
- Preloader::append($preloadFile, $preload);
- }
+ $this->warmupOptionals($realCacheDir);
}
} else {
$fs->mkdir($warmupDir);
@@ -153,7 +146,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
if ($output->isVerbose()) {
$io->comment('Warming up cache...');
}
- $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
+ $this->warmup($warmupDir, $realBuildDir);
+
+ if (!$input->getOption('no-optional-warmers')) {
+ if ($output->isVerbose()) {
+ $io->comment('Warming up optional cache...');
+ }
+ $this->warmupOptionals($realCacheDir);
+ }
}
if (!$fs->exists($warmupDir.'/'.$containerDir)) {
@@ -227,7 +227,7 @@ private function isNfs(string $dir): bool
return false;
}
- private function warmup(string $warmupDir, string $realBuildDir, bool $enableOptionalWarmers = true)
+ private function warmup(string $warmupDir, string $realBuildDir): void
{
// create a temporary kernel
$kernel = $this->getApplication()->getKernel();
@@ -236,18 +236,6 @@ private function warmup(string $warmupDir, string $realBuildDir, bool $enableOpt
}
$kernel->reboot($warmupDir);
- // warmup temporary dir
- if ($enableOptionalWarmers) {
- $warmer = $kernel->getContainer()->get('cache_warmer');
- // non optional warmers already ran during container compilation
- $warmer->enableOnlyOptionalWarmers();
- $preload = (array) $warmer->warmUp($warmupDir);
-
- if ($preload && file_exists($preloadFile = $warmupDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
- Preloader::append($preloadFile, $preload);
- }
- }
-
// fix references to cached files with the real cache directory name
$search = [$warmupDir, str_replace('\\', '\\\\', $warmupDir)];
$replace = str_replace('\\', '/', $realBuildDir);
@@ -258,4 +246,17 @@ private function warmup(string $warmupDir, string $realBuildDir, bool $enableOpt
}
}
}
+
+ private function warmupOptionals(string $realCacheDir): 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);
+
+ if ($preload && file_exists($preloadFile = $realCacheDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
+ Preloader::append($preloadFile, $preload);
+ }
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy