diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-06-30 18:54:46 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-08 01:28:10 +0200 |
| commit | 8bfd29e86dac675919d3572aac3ba5891d9d844e (patch) | |
| tree | fb5f005b93c516c9bed532bb36f70706174c38b6 /phpBB/phpbb/install/helper/iohandler/cli_iohandler.php | |
| parent | 10f6716566fce9d9c38f3dd99419595b2a1cba4c (diff) | |
| download | forums-8bfd29e86dac675919d3572aac3ba5891d9d844e.tar forums-8bfd29e86dac675919d3572aac3ba5891d9d844e.tar.gz forums-8bfd29e86dac675919d3572aac3ba5891d9d844e.tar.bz2 forums-8bfd29e86dac675919d3572aac3ba5891d9d844e.tar.xz forums-8bfd29e86dac675919d3572aac3ba5891d9d844e.zip | |
[ticket/13740] Clean up CLI CS
PHPBB3-13740
Diffstat (limited to 'phpBB/phpbb/install/helper/iohandler/cli_iohandler.php')
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/cli_iohandler.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php index f711abe431..f9c19f6d85 100644 --- a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php @@ -14,7 +14,6 @@ namespace phpbb\install\helper\iohandler; use phpbb\install\exception\installer_exception; -use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\OutputStyle; @@ -39,7 +38,7 @@ class cli_iohandler extends iohandler_base protected $input_values = array(); /** - * @var ProgressBar + * @var \Symfony\Component\Console\Helper\ProgressBar */ protected $progress_bar; @@ -66,7 +65,6 @@ class cli_iohandler extends iohandler_base $result = $this->input_values[$name]; } - if ($multibyte) { return utf8_normalize_nfc($result); @@ -160,7 +158,8 @@ class cli_iohandler extends iohandler_base { if ($this->output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL) { - $this->output->writeln(sprintf('[%3d/%-3d] ---- %s', $this->current_task_progress, $this->task_progress_count, $this->translate_message($log_title, $log_description)['title'])); + $message = $this->translate_message($log_title, $log_description); + $this->output->writeln(sprintf('[%3d/%-3d] ---- %s', $this->current_task_progress, $this->task_progress_count, $message['title'])); } } @@ -193,11 +192,13 @@ class cli_iohandler extends iohandler_base " %message%\n"); $this->progress_bar->setBarWidth(60); - if (!defined('PHP_WINDOWS_VERSION_BUILD')) { + if (!defined('PHP_WINDOWS_VERSION_BUILD')) + { $this->progress_bar->setEmptyBarCharacter('░'); // light shade character \u2591 $this->progress_bar->setProgressCharacter(''); $this->progress_bar->setBarCharacter('▓'); // dark shade character \u2593 } + $this->progress_bar->setMessage(''); $this->io->newLine(2); $this->progress_bar->start(); |