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 ++----
 .../db/migration/null_migrator_output_handler.php  | 24 ++++++++++++++++
 phpBB/phpbb/db/migrator_output_handler.php         | 33 ----------------------
 .../phpbb/db/migrator_output_handler_interface.php | 31 ++++++++++++++++++++
 4 files changed, 58 insertions(+), 39 deletions(-)
 create mode 100644 phpBB/phpbb/db/migration/null_migrator_output_handler.php
 delete mode 100644 phpBB/phpbb/db/migrator_output_handler.php
 create mode 100644 phpBB/phpbb/db/migrator_output_handler_interface.php

(limited to 'phpBB/phpbb/db')

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";
diff --git a/phpBB/phpbb/db/migration/null_migrator_output_handler.php b/phpBB/phpbb/db/migration/null_migrator_output_handler.php
new file mode 100644
index 0000000000..bb3aabed45
--- /dev/null
+++ b/phpBB/phpbb/db/migration/null_migrator_output_handler.php
@@ -0,0 +1,24 @@
+<?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;
+
+class null_migrator_output_handler
+{
+	/**
+	 * {@inheritdoc}
+	 */
+	public function write($message, $verbosity)
+	{
+	}
+}
diff --git a/phpBB/phpbb/db/migrator_output_handler.php b/phpBB/phpbb/db/migrator_output_handler.php
deleted file mode 100644
index 14d5b7890a..0000000000
--- a/phpBB/phpbb/db/migrator_output_handler.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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;
-
-class migrator_output_handler
-{
-	const VERBOSITY_QUIET        = 0;
-	const VERBOSITY_NORMAL       = 1;
-	const VERBOSITY_VERBOSE      = 2;
-	const VERBOSITY_VERY_VERBOSE = 3;
-	const VERBOSITY_DEBUG        = 4;
-
-	/**
-	 * 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)
-	{
-	}
-}
diff --git a/phpBB/phpbb/db/migrator_output_handler_interface.php b/phpBB/phpbb/db/migrator_output_handler_interface.php
new file mode 100644
index 0000000000..a923af99f6
--- /dev/null
+++ b/phpBB/phpbb/db/migrator_output_handler_interface.php
@@ -0,0 +1,31 @@
+<?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;
+
+interface migrator_output_handler_interface
+{
+	const VERBOSITY_QUIET        = 0;
+	const VERBOSITY_NORMAL       = 1;
+	const VERBOSITY_VERBOSE      = 2;
+	const VERBOSITY_VERY_VERBOSE = 3;
+	const VERBOSITY_DEBUG        = 4;
+
+	/**
+	 * 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);
+}
-- 
cgit v1.2.1