From 5970d0360c5b60a5af7bbaef37ffb8bb9932f8a8 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Thu, 2 Jul 2015 13:40:02 +0200
Subject: [PATCH] [ticket/13891] Handle verbosity

PHPBB3-13891
---
 phpBB/language/en/cli.php                     |  5 ++--
 .../console/command/reparser/reparse.php      | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 8c0d6bf6c3..9eca60fb68 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -85,6 +85,7 @@ $lang = array_merge($lang, array(
 
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
 
-	'CLI_REPARSER_REPARSE_REPARSING'	=> 'Reparsing %1$s (range %2$d..%3$d)',
-	'CLI_REPARSER_REPARSE_SUCCESS'		=> 'Reparsing ended with success',
+	'CLI_REPARSER_REPARSE_REPARSING'		=> 'Reparsing %1$s (range %2$d..%3$d)',
+	'CLI_REPARSER_REPARSE_REPARSING_START'	=> 'Reparsing %s...',
+	'CLI_REPARSER_REPARSE_SUCCESS'			=> 'Reparsing ended with success',
 ));
diff --git a/phpBB/phpbb/console/command/reparser/reparse.php b/phpBB/phpbb/console/command/reparser/reparse.php
index 3aac0e3e93..c261507a57 100644
--- a/phpBB/phpbb/console/command/reparser/reparse.php
+++ b/phpBB/phpbb/console/command/reparser/reparse.php
@@ -136,14 +136,28 @@ class reparse extends \phpbb\console\command\command
 		}
 
 		$this->io->section($this->user->lang('CLI_REPARSER_REPARSE_REPARSING', str_replace('text_reparser.', '', $name), $min, $max));
-		$this->io->newLine(2);
 
 		$progress = $this->io->createProgressBar($max);
-		$progress->setFormat(
-			"    %current:s%/%max:s% %bar%  %percent:3s%%\n" .
-			"        %message% %elapsed:6s%/%estimated:-6s% %memory:6s%\n");
-		$progress->setBarWidth(60);
-		$progress->setMessage('');
+		if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERBOSE)
+		{
+			$progress->setFormat('<info>[%percent:3s%%]</info> %message%');
+			$progress->setOverwrite(false);
+		}
+		elseif ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERY_VERBOSE)
+		{
+			$progress->setFormat('<info>[%current:s%/%max:s%]</info><comment>[%elapsed%/%estimated%][%memory%]</comment> %message%');
+			$progress->setOverwrite(false);
+		}
+		else
+		{
+			$this->io->newLine(2);
+			$progress->setFormat(
+				"    %current:s%/%max:s% %bar%  %percent:3s%%\n" .
+				"        %message% %elapsed:6s%/%estimated:-6s% %memory:6s%\n");
+			$progress->setBarWidth(60);
+		}
+
+		$progress->setMessage($this->user->lang('CLI_REPARSER_REPARSE_REPARSING_START', str_replace('text_reparser.', '', $name)));
 
 		if (!defined('PHP_WINDOWS_VERSION_BUILD'))
 		{