makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13126] Move migrator_output_handler to an interface

Browse source 
PHPBB3-13126
This commit is contained in:
Tristan Darricau 2014-10-20 19:38:04 +02:00
parent 58075e25e8
commit 8f6fcd2744
4 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/console/command/db/console_migrator_output_handler.php
View file

@ -17,7 +17,7 @@ use phpbb\user;
use phpbb\db\migrator_output_handler; use phpbb\db\migrator_output_handler;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
class console_migrator_output_handler extends migrator_output_handler class console_migrator_output_handler implements migrator_output_handler_interface
{ {
/** /**
* User object. * User object.
@ -46,10 +46,7 @@ class console_migrator_output_handler extends migrator_output_handler
} }
/** /**
* Write output using the configured closure. * {@inheritdoc}
*
* @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) public function write($message, $verbosity)
{ {
@ -57,11 +54,11 @@ class console_migrator_output_handler extends migrator_output_handler
{ {
$translated_message = call_user_func_array(array($this->user, 'lang'), $message); $translated_message = call_user_func_array(array($this->user, 'lang'), $message);
if ($verbosity === \phpbb\db\migrator_output_handler::VERBOSITY_NORMAL) if ($verbosity === migrator_output_handler_interface::VERBOSITY_NORMAL)
{ {
$translated_message = '<info>' . $translated_message . '</info>'; $translated_message = '<info>' . $translated_message . '</info>';
} }
else if ($verbosity === \phpbb\db\migrator_output_handler::VERBOSITY_VERY_VERBOSE) else if ($verbosity === migrator_output_handler_interface::VERBOSITY_VERY_VERBOSE)
{ {
$translated_message = '<comment>' . $translated_message . '</comment>'; $translated_message = '<comment>' . $translated_message . '</comment>';
} }

9
phpBB/phpbb/db/html_migrator_output_handler.php
View file

@ -15,7 +15,7 @@ namespace phpbb\db;
use phpbb\user; use phpbb\user;
class html_migrator_output_handler extends migrator_output_handler class html_migrator_output_handler implements migrator_output_handler_interface
{ {
/** /**
* User object. * User object.
@ -35,14 +35,11 @@ class html_migrator_output_handler extends migrator_output_handler
} }
/** /**
* Write output using the configured closure. * {@inheritdoc}
*
* @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) 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); $final_message = call_user_func_array(array($this->user, 'lang'), $message);
echo $final_message . "<br />\n"; echo $final_message . "<br />\n";

24
phpBB/phpbb/db/migration/null_migrator_output_handler.php Normal file
View file

@ -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)
{
}
}

6
phpBB/phpbb/db/migrator_output_handler.php → phpBB/phpbb/db/migrator_output_handler_interface.php
View file

@ -13,7 +13,7 @@
namespace phpbb\db; namespace phpbb\db;
class migrator_output_handler interface migrator_output_handler_interface
{ {
const VERBOSITY_QUIET = 0; const VERBOSITY_QUIET = 0;
const VERBOSITY_NORMAL = 1; const VERBOSITY_NORMAL = 1;
@ -27,7 +27,5 @@ class migrator_output_handler
* @param string|array $message The message to write or an array containing the language key and all of its parameters. * @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. * @param int $verbosity The verbosity of the message.
*/ */
public function write($message, $verbosity) public function write($message, $verbosity);
{
}
} }