4 files changed, 38 insertions, 41 deletions
diff --git a/phpBB/phpbb/console/command/db/list_command.php b/phpBB/phpbb/console/command/db/list_command.php
index 708107b592..77f26dd786 100644
--- a/phpBB/phpbb/console/command/db/list_command.php
+++ b/phpBB/phpbb/console/command/db/list_command.php
@@ -15,6 +15,7 @@ namespace phpbb\console\command\db;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 class list_command extends \phpbb\console\command\db\migration_command
 {
@@ -34,6 +35,8 @@ class list_command extends \phpbb\console\command\db\migration_command
 
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
+		$io = new SymfonyStyle($input, $output);
+
 		$show_installed = !$input->getOption('available');
 		$installed = $available = array();
 
@@ -51,23 +54,28 @@ class list_command extends \phpbb\console\command\db\migration_command
 
 		if ($show_installed)
 		{
-			$output->writeln('<info>' . $this->user->lang('CLI_MIGRATIONS_INSTALLED') . $this->user->lang('COLON') . '</info>');
-			$output->writeln($installed);
+			$io->section($this->user->lang('CLI_MIGRATIONS_INSTALLED'));
 
-			if (empty($installed))
+			if (!empty($installed))
 			{
-				$output->writeln($this->user->lang('CLI_MIGRATIONS_EMPTY'));
+				$io->listing($installed);
+			}
+			else
+			{
+				$io->text($this->user->lang('CLI_MIGRATIONS_EMPTY'));
+				$io->newLine();
 			}
-
-			$output->writeln('');
 		}
 
-		$output->writeln('<info>' . $this->user->lang('CLI_MIGRATIONS_AVAILABLE') . $this->user->lang('COLON') . '</info>');
-		$output->writeln($available);
-
-		if (empty($available))
+		$io->section($this->user->lang('CLI_MIGRATIONS_AVAILABLE'));
+		if (!empty($available))
+		{
+			$io->listing($available);
+		}
+		else
 		{
-			$output->writeln($this->user->lang('CLI_MIGRATIONS_EMPTY'));
+			$io->text($this->user->lang('CLI_MIGRATIONS_EMPTY'));
+			$io->newLine();
 		}
 	}
 }
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index ae4211f7be..4270e2d703 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -15,6 +15,7 @@ namespace phpbb\console\command\db;
 use phpbb\db\output_handler\log_wrapper_migrator_output_handler;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 class migrate extends \phpbb\console\command\db\migration_command
 {
@@ -30,26 +31,28 @@ class migrate extends \phpbb\console\command\db\migration_command
 	/** @var \phpbb\language\language */
 	protected $language;
 
-	function __construct(\phpbb\user $user, \phpbb\language\language $language, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path)
+	public function __construct(\phpbb\user $user, \phpbb\language\language $language, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path)
 	{
 		$this->language = $language;
 		$this->log = $log;
 		$this->filesystem = $filesystem;
 		$this->phpbb_root_path = $phpbb_root_path;
 		parent::__construct($user, $migrator, $extension_manager, $config, $cache);
-		$this->user->add_lang(array('common', 'install', 'migrator'));
+		$this->language->add_lang(array('common', 'install', 'migrator'));
 	}
 
 	protected function configure()
 	{
 		$this
 			->setName('db:migrate')
-			->setDescription($this->user->lang('CLI_DESCRIPTION_DB_MIGRATE'))
+			->setDescription($this->language->lang('CLI_DESCRIPTION_DB_MIGRATE'))
 		;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
+		$io = new SymfonyStyle($input, $output);
+
 		$this->migrator->set_output_handler(new log_wrapper_migrator_output_handler($this->language, new console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log', $this->filesystem));
 
 		$this->migrator->create_migrations_table();
@@ -66,7 +69,7 @@ class migrate extends \phpbb\console\command\db\migration_command
 			}
 			catch (\phpbb\db\migration\exception $e)
 			{
-				$output->writeln('<error>' . $e->getLocalisedMessage($this->user) . '</error>');
+				$io->error($e->getLocalisedMessage($this->user));
 				$this->finalise_update();
 				return 1;
 			}
@@ -78,6 +81,6 @@ class migrate extends \phpbb\console\command\db\migration_command
 		}
 
 		$this->finalise_update();
-		$output->writeln($this->user->lang['DATABASE_UPDATE_COMPLETE']);
+		$io->success($this->language->lang('INLINE_UPDATE_SUCCESSFUL'));
 	}
 }
diff --git a/phpBB/phpbb/console/command/db/migration_command.php b/phpBB/phpbb/console/command/db/migration_command.php
index b951560588..851f404fab 100644
--- a/phpBB/phpbb/console/command/db/migration_command.php
+++ b/phpBB/phpbb/console/command/db/migration_command.php
@@ -26,7 +26,7 @@ abstract class migration_command extends \phpbb\console\command\command
 	/** @var \phpbb\cache\service */
 	protected $cache;
 
-	function __construct(\phpbb\user $user, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache)
+	public function __construct(\phpbb\user $user, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache)
 	{
 		$this->migrator = $migrator;
 		$this->extension_manager = $extension_manager;
diff --git a/phpBB/phpbb/console/command/db/revert.php b/phpBB/phpbb/console/command/db/revert.php
index 3fa2e17515..3c79d8c554 100644
--- a/phpBB/phpbb/console/command/db/revert.php
+++ b/phpBB/phpbb/console/command/db/revert.php
@@ -16,42 +16,27 @@ use phpbb\db\output_handler\log_wrapper_migrator_output_handler;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
-class revert extends \phpbb\console\command\db\migration_command
+class revert extends \phpbb\console\command\db\migrate
 {
-	/** @var string phpBB root path */
-	protected $phpbb_root_path;
-
-	/** @var  \phpbb\filesystem\filesystem_interface */
-	protected $filesystem;
-
-	/** @var \phpbb\language\language */
-	protected $language;
-
-	function __construct(\phpbb\user $user, \phpbb\language\language $language, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path)
-	{
-		$this->filesystem = $filesystem;
-		$this->language = $language;
-		$this->phpbb_root_path = $phpbb_root_path;
-		parent::__construct($user, $migrator, $extension_manager, $config, $cache);
-		$this->user->add_lang(array('common', 'migrator'));
-	}
-
 	protected function configure()
 	{
 		$this
 			->setName('db:revert')
-			->setDescription($this->user->lang('CLI_DESCRIPTION_DB_REVERT'))
+			->setDescription($this->language->lang('CLI_DESCRIPTION_DB_REVERT'))
 			->addArgument(
 				'name',
 				InputArgument::REQUIRED,
-				$this->user->lang('CLI_MIGRATION_NAME')
+				$this->language->lang('CLI_MIGRATION_NAME')
 			)
 		;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
+		$io = new SymfonyStyle($input, $output);
+
 		$name = str_replace('/', '\\', $input->getArgument('name'));
 
 		$this->migrator->set_output_handler(new log_wrapper_migrator_output_handler($this->language, new console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log', $this->filesystem));
@@ -60,12 +45,12 @@ class revert extends \phpbb\console\command\db\migration_command
 
 		if (!in_array($name, $this->load_migrations()))
 		{
-			$output->writeln('<error>' . $this->user->lang('MIGRATION_NOT_VALID', $name) . '</error>');
+			$io->error($this->language->lang('MIGRATION_NOT_VALID', $name));
 			return 1;
 		}
 		else if ($this->migrator->migration_state($name) === false)
 		{
-			$output->writeln('<error>' . $this->user->lang('MIGRATION_NOT_INSTALLED', $name) . '</error>');
+			$io->error($this->language->lang('MIGRATION_NOT_INSTALLED', $name));
 			return 1;
 		}
 
@@ -78,11 +63,12 @@ class revert extends \phpbb\console\command\db\migration_command
 		}
 		catch (\phpbb\db\migration\exception $e)
 		{
-			$output->writeln('<error>' . $e->getLocalisedMessage($this->user) . '</error>');
+			$io->error($e->getLocalisedMessage($this->user));
 			$this->finalise_update();
 			return 1;
 		}
 
 		$this->finalise_update();
+		$io->success($this->language->lang('INLINE_UPDATE_SUCCESSFUL'));
 	}
 }