From 58075e25e8173ec663e4e8908d1963b1947a225b Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Thu, 16 Oct 2014 01:34:23 +0200
Subject: [ticket/13126] Extends migrator_output_handler instead of using a
 closure

PHPBB3-13126
---
 phpBB/phpbb/db/html_migrator_output_handler.php | 51 +++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 phpBB/phpbb/db/html_migrator_output_handler.php

(limited to 'phpBB/phpbb/db/html_migrator_output_handler.php')

diff --git a/phpBB/phpbb/db/html_migrator_output_handler.php b/phpBB/phpbb/db/html_migrator_output_handler.php
new file mode 100644
index 0000000000..6812498f1f
--- /dev/null
+++ b/phpBB/phpbb/db/html_migrator_output_handler.php
@@ -0,0 +1,51 @@
+<?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\db;
+
+use phpbb\user;
+
+class html_migrator_output_handler extends migrator_output_handler
+{
+	/**
+	 * User object.
+	 *
+	 * @var user
+	 */
+	private $user;
+
+	/**
+	 * Constructor
+	 *
+	 * @param user $user	User object
+	 */
+	public function __construct(user $user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * Write output using the configured closure.
+	 *
+	 * @param string|array $message The message to write or an array containing the language key and all of its parameters.
+	 * @param int $verbosity The verbosity of the message.
+	 */
+	public function write($message, $verbosity)
+	{
+		if ($verbosity <= migrator_output_handler::VERBOSITY_NORMAL)
+		{
+			$final_message = call_user_func_array(array($this->user, 'lang'), $message);
+			echo $final_message . "<br />\n";
+		}
+	}
+}
-- 
cgit v1.2.1


From 8f6fcd2744a80795139600c2a7c1f46f59b8cbfe Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 20 Oct 2014 19:38:04 +0200
Subject: [ticket/13126] Move migrator_output_handler to an interface

PHPBB3-13126
---
 phpBB/phpbb/db/html_migrator_output_handler.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/db/html_migrator_output_handler.php')

diff --git a/phpBB/phpbb/db/html_migrator_output_handler.php b/phpBB/phpbb/db/html_migrator_output_handler.php
index 6812498f1f..82b7b416e2 100644
--- a/phpBB/phpbb/db/html_migrator_output_handler.php
+++ b/phpBB/phpbb/db/html_migrator_output_handler.php
@@ -15,7 +15,7 @@ namespace phpbb\db;
 
 use phpbb\user;
 
-class html_migrator_output_handler extends migrator_output_handler
+class html_migrator_output_handler implements migrator_output_handler_interface
 {
 	/**
 	 * User object.
@@ -35,14 +35,11 @@ class html_migrator_output_handler extends migrator_output_handler
 	}
 
 	/**
-	 * Write output using the configured closure.
-	 *
-	 * @param string|array $message The message to write or an array containing the language key and all of its parameters.
-	 * @param int $verbosity The verbosity of the message.
+	 * {@inheritdoc}
 	 */
 	public function write($message, $verbosity)
 	{
-		if ($verbosity <= migrator_output_handler::VERBOSITY_NORMAL)
+		if ($verbosity <= migrator_output_handler_interface::VERBOSITY_NORMAL)
 		{
 			$final_message = call_user_func_array(array($this->user, 'lang'), $message);
 			echo $final_message . "<br />\n";
-- 
cgit v1.2.1


From faf4b03c43ecac7aa16e42433cce591512f3ef90 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 20 Oct 2014 19:42:54 +0200
Subject: [ticket/13126] Change messages verbosity levels

PHPBB3-13126
---
 phpBB/phpbb/db/html_migrator_output_handler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/db/html_migrator_output_handler.php')

diff --git a/phpBB/phpbb/db/html_migrator_output_handler.php b/phpBB/phpbb/db/html_migrator_output_handler.php
index 82b7b416e2..e37c667463 100644
--- a/phpBB/phpbb/db/html_migrator_output_handler.php
+++ b/phpBB/phpbb/db/html_migrator_output_handler.php
@@ -39,7 +39,7 @@ class html_migrator_output_handler implements migrator_output_handler_interface
 	 */
 	public function write($message, $verbosity)
 	{
-		if ($verbosity <= migrator_output_handler_interface::VERBOSITY_NORMAL)
+		if ($verbosity <= migrator_output_handler_interface::VERBOSITY_VERBOSE)
 		{
 			$final_message = call_user_func_array(array($this->user, 'lang'), $message);
 			echo $final_message . "<br />\n";
-- 
cgit v1.2.1