Show additional messages only in verbose

symfony · jrmyio · Nov 7, 2013 · Nov 7, 2013 · Nov 8, 2013 · Nov 15, 2013
commit 5a0da3800bedc9d47699acf63d72d71e119d1b61
diff --git 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 <info>%s</info> environment with debug <info>%s</info>:', $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,24 +78,53 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $warmupDir = substr($realCacheDir, 0, -1).'_';
 
             if ($filesystem->exists($warmupDir)) {
-                $output->writeln('Clearing outdated warmup directory...');
+                $this->writelnIfVerbose($output, 'Clearing outdated warmup directory...');
                 $filesystem->remove($warmupDir);
             }
 
-            $output->writeln('Warming up cache...');
+            $this->writelnIfVerbose($output, 'Warming up cache...');
             $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
 
             $filesystem->rename($realCacheDir, $oldCacheDir);
             if (defined('PHP_WINDOWS_VERSION_BUILD')) {
                 sleep(1);  // workaround for windows php rename bug
             }
             $filesystem->rename($warmupDir, $realCacheDir);
-            $output->writeln('Warm up completed...');
+            $this->writelnIfVerbose($output, 'Warm up completed...');
         }
 
-        $output->writeln('Removing old cache directory...');
+        $this->writelnIfVerbose($output, 'Removing old cache directory...');
         $filesystem->remove($oldCacheDir);
-        $output->writeln('Completed clearing cache' . ($input->getOption('no-warmup') ? "!" : " and warmup!"));
+        $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 <info>%s</info> environment with debug <info>%s</info>';
+        $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();
     }
 
     /**