diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:25:09 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:25:09 +0100 |
| commit | 8c9d6add2ea20a2845eb1137be1607dfd00378c6 (patch) | |
| tree | e63713beca201aebcf77faa1e827f4be59364ba2 /phpBB/phpbb/console/command/cron | |
| parent | 0cf85c047e848a75df236c4617b449498627dccc (diff) | |
| parent | 6a5b99b12b1812202843613994480cc6caf93354 (diff) | |
| download | forums-8c9d6add2ea20a2845eb1137be1607dfd00378c6.tar forums-8c9d6add2ea20a2845eb1137be1607dfd00378c6.tar.gz forums-8c9d6add2ea20a2845eb1137be1607dfd00378c6.tar.bz2 forums-8c9d6add2ea20a2845eb1137be1607dfd00378c6.tar.xz forums-8c9d6add2ea20a2845eb1137be1607dfd00378c6.zip | |
Merge pull request #4564 from VSEphpbb/ticket/14895
[ticket/14895] CLI should use SymfonyStyle
* VSEphpbb/ticket/14895:
[ticket/14895] Fix broken tests
[ticket/14895] Fix issues in CLI classes
[ticket/14895] Use SymfonyStyle in all CLI
[ticket/14895] Use SymfonyIO styling
[ticket/14895] CLI reparser:list should display proper list
Diffstat (limited to 'phpBB/phpbb/console/command/cron')
| -rw-r--r-- | phpBB/phpbb/console/command/cron/cron_list.php | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php index c515fd9e80..ea61e45235 100644 --- a/phpBB/phpbb/console/command/cron/cron_list.php +++ b/phpBB/phpbb/console/command/cron/cron_list.php @@ -14,6 +14,7 @@ namespace phpbb\console\command\cron; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Style\SymfonyStyle; class cron_list extends \phpbb\console\command\command { @@ -51,61 +52,43 @@ class cron_list extends \phpbb\console\command\command * @param InputInterface $input An InputInterface instance * @param OutputInterface $output An OutputInterface instance * - * @return null + * @return void */ protected function execute(InputInterface $input, OutputInterface $output) { + $io = new SymfonyStyle($input, $output); + $tasks = $this->cron_manager->get_tasks(); if (empty($tasks)) { - $output->writeln($this->user->lang('CRON_NO_TASKS')); + $io->error($this->user->lang('CRON_NO_TASKS')); return; } - $ready_tasks = array(); - $not_ready_tasks = array(); + $ready_tasks = $not_ready_tasks = array(); foreach ($tasks as $task) { if ($task->is_ready()) { - $ready_tasks[] = $task; + $ready_tasks[] = $task->get_name(); } else { - $not_ready_tasks[] = $task; + $not_ready_tasks[] = $task->get_name(); } } if (!empty($ready_tasks)) { - $output->writeln('<info>' . $this->user->lang('TASKS_READY') . '</info>'); - $this->print_tasks_names($ready_tasks, $output); - } - - if (!empty($ready_tasks) && !empty($not_ready_tasks)) - { - $output->writeln(''); + $io->title($this->user->lang('TASKS_READY')); + $io->listing($ready_tasks); } if (!empty($not_ready_tasks)) { - $output->writeln('<info>' . $this->user->lang('TASKS_NOT_READY') . '</info>'); - $this->print_tasks_names($not_ready_tasks, $output); - } - } - - /** - * Print a list of cron jobs - * - * @param array $tasks A list of task to display - * @param OutputInterface $output An OutputInterface instance - */ - protected function print_tasks_names(array $tasks, OutputInterface $output) - { - foreach ($tasks as $task) - { - $output->writeln($task->get_name()); + $io->title($this->user->lang('TASKS_NOT_READY')); + $io->listing($not_ready_tasks); } } } |