From a1f64114ab9822473694d2ff62f4cc9dffe37435 Mon Sep 17 00:00:00 2001 From: ConneXNL Date: Tue, 7 Jan 2014 15:01:26 +0100 Subject: [PATCH] [FrameworkBundle] added feedback in cache:clear --- .../Command/CacheClearCommand.php | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index b7e4bfd0c633..faf58103e8a7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -66,7 +66,8 @@ protected function execute(InputInterface $input, OutputInterface $output) } $kernel = $this->getContainer()->get('kernel'); - $output->writeln(sprintf('Clearing the cache for the %s environment with debug %s', $kernel->getEnvironment(), var_export($kernel->isDebug(), true))); + $output->writeln($this->getClearingCacheMessage($output, $kernel)); + $this->getContainer()->get('cache_clearer')->clear($realCacheDir); if ($input->getOption('no-warmup')) { @@ -77,9 +78,11 @@ protected function execute(InputInterface $input, OutputInterface $output) $warmupDir = substr($realCacheDir, 0, -1).'_'; if ($filesystem->exists($warmupDir)) { + $this->writelnIfVerbose($output, 'Clearing outdated warmup directory...'); $filesystem->remove($warmupDir); } + $this->writelnIfVerbose($output, 'Warming up cache...'); $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers')); $filesystem->rename($realCacheDir, $oldCacheDir); @@ -87,9 +90,41 @@ protected function execute(InputInterface $input, OutputInterface $output) sleep(1); // workaround for Windows PHP rename bug } $filesystem->rename($warmupDir, $realCacheDir); + $this->writelnIfVerbose($output, 'Warm up completed...'); } + $this->writelnIfVerbose($output, 'Removing old cache directory...'); $filesystem->remove($oldCacheDir); + $this->writelnIfVerbose($output, 'Completed clearing cache' . ($input->getOption('no-warmup') ? "!" : " and warmup!")); + } + + /** + * @param OutputInterface $output + * @param KernelInterface $kernel + * @return string + */ + protected function getClearingCacheMessage(OutputInterface $output, KernelInterface $kernel){ + $message = 'Clearing the cache for the %s environment with debug %s'; + $message .= $this->isVerbose($output) ? ":" : ""; + return sprintf($message, $kernel->getEnvironment(), var_export($kernel->isDebug(), true)); + } + + /** + * @param OutputInterface $output + * @param string $message + */ + protected function writelnIfVerbose(OutputInterface $output, $message){ + if ($this->isVerbose($output)){ + $output->writeln($message); + } + } + + /** + * @param OutputInterface $output + * @return bool + */ + protected function isVerbose(OutputInterface $output){ + return OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity(); } /**