diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-25 11:55:15 -0700 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-25 11:55:15 -0700 |
| commit | 84434630065c2491cfa5e65a69b8b22d6844b6f4 (patch) | |
| tree | 88eb67f07f2b139e4b3a9e811fee27c1800aa3e3 /phpBB/phpbb | |
| parent | b27b9a6984f2ed3a9a186133657d30b4cca883c0 (diff) | |
| download | forums-84434630065c2491cfa5e65a69b8b22d6844b6f4.tar forums-84434630065c2491cfa5e65a69b8b22d6844b6f4.tar.gz forums-84434630065c2491cfa5e65a69b8b22d6844b6f4.tar.bz2 forums-84434630065c2491cfa5e65a69b8b22d6844b6f4.tar.xz forums-84434630065c2491cfa5e65a69b8b22d6844b6f4.zip | |
[ticket/13211] Also use log wrapper output handler for console migrations
PHPBB3-13211
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/console/command/db/migrate.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/db/log_wrapper_migrator_output_handler.php | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php index 15349e1230..76550a8429 100644 --- a/phpBB/phpbb/console/command/db/migrate.php +++ b/phpBB/phpbb/console/command/db/migrate.php @@ -32,13 +32,17 @@ class migrate extends \phpbb\console\command\command /** @var \phpbb\log\log */ protected $log; - function __construct(\phpbb\user $user, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log) + /** @var string phpBB root path */ + protected $phpbb_root_path; + + function __construct(\phpbb\user $user, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log, $phpbb_root_path) { $this->migrator = $migrator; $this->extension_manager = $extension_manager; $this->config = $config; $this->cache = $cache; $this->log = $log; + $this->phpbb_root_path = $phpbb_root_path; parent::__construct($user); $this->user->add_lang(array('common', 'install', 'migrator')); } @@ -53,7 +57,7 @@ class migrate extends \phpbb\console\command\command protected function execute(InputInterface $input, OutputInterface $output) { - $this->migrator->set_output_handler(new \phpbb\db\console_migrator_output_handler($this->user, $output)); + $this->migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($this->user, new \phpbb\db\console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log')); $this->migrator->create_migrations_table(); diff --git a/phpBB/phpbb/db/log_wrapper_migrator_output_handler.php b/phpBB/phpbb/db/log_wrapper_migrator_output_handler.php index e81dfd7a62..94c293dc45 100644 --- a/phpBB/phpbb/db/log_wrapper_migrator_output_handler.php +++ b/phpBB/phpbb/db/log_wrapper_migrator_output_handler.php @@ -25,11 +25,11 @@ class log_wrapper_migrator_output_handler implements migrator_output_handler_int protected $user; /** - * HTML migrator output handler + * A migrator output handler * - * @var html_migrator_output_handler + * @var migrator_output_handler_interface */ - protected $html_migrator; + protected $migrator; /** * Log file handle @@ -41,13 +41,13 @@ class log_wrapper_migrator_output_handler implements migrator_output_handler_int * Constructor * * @param user $user User object - * @param html_migrator_output_handler $html_migrator HTML migrator output handler + * @param migrator_output_handler_interface $migrator Migrator output handler * @param string $log_file File to log to */ - public function __construct(user $user, html_migrator_output_handler $html_migrator, $log_file) + public function __construct(user $user, migrator_output_handler_interface $migrator, $log_file) { $this->user = $user; - $this->html_migrator = $html_migrator; + $this->migrator = $migrator; $this->file_open($log_file); } @@ -73,7 +73,7 @@ class log_wrapper_migrator_output_handler implements migrator_output_handler_int */ public function write($message, $verbosity) { - $this->html_migrator->write($message, $verbosity); + $this->migrator->write($message, $verbosity); if ($this->file_handle !== false) { |