2 files changed, 71 insertions, 32 deletions
diff --git a/phpBB/phpbb/console/command/db/console_migrator_output_handler.php b/phpBB/phpbb/console/command/db/console_migrator_output_handler.php
new file mode 100644
index 0000000000..b9741a3838
--- /dev/null
+++ b/phpBB/phpbb/console/command/db/console_migrator_output_handler.php
@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\console\command\db;
+
+use phpbb\user;
+use phpbb\db\migrator_output_handler_interface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class console_migrator_output_handler implements migrator_output_handler_interface
+{
+	/**
+	 * User object.
+	 *
+	 * @var user
+	 */
+	private $user;
+
+	/**
+	 * Console output object.
+	 *
+	 * @var OutputInterface
+	 */
+	private $output;
+
+	/**
+	 * Constructor
+	 *
+	 * @param user				$user	User object
+	 * @param OutputInterface	$output	Console output object
+	 */
+	public function __construct(user $user, OutputInterface $output)
+	{
+		$this->user = $user;
+		$this->output = $output;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function write($message, $verbosity)
+	{
+		if ($verbosity <= $this->output->getVerbosity())
+		{
+			$translated_message = call_user_func_array(array($this->user, 'lang'), $message);
+
+			if ($verbosity === migrator_output_handler_interface::VERBOSITY_NORMAL)
+			{
+				$translated_message = '<info>' . $translated_message . '</info>';
+			}
+			else if ($verbosity === migrator_output_handler_interface::VERBOSITY_VERBOSE)
+			{
+				$translated_message = '<comment>' . $translated_message . '</comment>';
+			}
+
+			$this->output->writeln($translated_message);
+		}
+	}
+}
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index c760cde5b5..9d4b4a0c4d 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -53,6 +53,8 @@ class migrate extends \phpbb\console\command\command
 
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
+		$this->migrator->set_output_handler(new console_migrator_output_handler($this->user, $output));
+
 		$this->migrator->create_migrations_table();
 
 		$this->cache->purge();
@@ -61,8 +63,6 @@ class migrate extends \phpbb\console\command\command
 		$orig_version = $this->config['version'];
 		while (!$this->migrator->finished())
 		{
-			$migration_start_time = microtime(true);
-
 			try
 			{
 				$this->migrator->update();
@@ -73,36 +73,6 @@ class migrate extends \phpbb\console\command\command
 				$this->finalise_update();
 				return 1;
 			}
-
-			$migration_stop_time = microtime(true) - $migration_start_time;
-
-			$state = array_merge(
-				array(
-					'migration_schema_done' => false,
-					'migration_data_done'	=> false,
-				),
-				$this->migrator->last_run_migration['state']
-			);
-
-			if (!empty($this->migrator->last_run_migration['effectively_installed']))
-			{
-				$msg = $this->user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $this->migrator->last_run_migration['name']);
-				$output->writeln("<comment>$msg</comment>");
-			}
-			else if ($this->migrator->last_run_migration['task'] == 'process_data_step' && $state['migration_data_done'])
-			{
-				$msg = $this->user->lang('MIGRATION_DATA_DONE', $this->migrator->last_run_migration['name'], $migration_stop_time);
-				$output->writeln("<info>$msg</info>");
-			}
-			else if ($this->migrator->last_run_migration['task'] == 'process_data_step')
-			{
-				$output->writeln($this->user->lang('MIGRATION_DATA_IN_PROGRESS', $this->migrator->last_run_migration['name'], $migration_stop_time));
-			}
-			else if ($state['migration_schema_done'])
-			{
-				$msg = $this->user->lang('MIGRATION_SCHEMA_DONE', $this->migrator->last_run_migration['name'], $migration_stop_time);
-				$output->writeln("<info>$msg</info>");
-			}
 		}
 
 		if ($orig_version != $this->config['version'])