From 58d7302b495783edd6e0826c100ffa93acb0693d Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Mon, 2 Jun 2014 12:17:37 +0200
Subject: [ticket/12602] Add files to print the cron list and test files.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 80 ++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 phpBB/phpbb/console/command/cron/cron_list.php

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
new file mode 100644
index 0000000000..0018d9542d
--- /dev/null
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -0,0 +1,80 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+namespace phpbb\console\command\cron;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class cron_list extends \phpbb\console\command\command
+{
+	/** @var \phpbb\cron\manager */
+	protected $cron_manager;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	public function __construct(\phpbb\cron\manager $cron_manager, \phpbb\user $user)
+	{
+		$this->cron_manager = $cron_manager;
+		$this->user = $user;
+		parent::__construct();
+	}
+
+	protected function configure()
+	{
+		$this
+			->setName('cron:list')
+			->setDescription($this->user->lang('CLI_DESCR_CRON_LIST'))
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$tasks = $this->cron_manager->get_tasks();
+
+		if (empty($tasks))
+		{
+			$output->writeln($this->user->lang('NO_TASK'));
+			return;
+		}
+
+		$ready_tasks = array();
+		$not_ready_tasks = array();
+		foreach ($tasks as $task)
+		{
+			if ($task->is_ready())
+			{
+				$ready_tasks[] = $task;
+			}
+			else
+			{
+				$not_ready_tasks[] = $task;
+			}
+		}
+
+		if (!empty($ready_tasks))
+		{
+			$output->writeln('<info>' . $this->user->lang('TASKS_READY') . '</info>');
+			foreach ($ready_tasks as $task)
+			{
+				$output->writeln($task->get_name());
+			}
+			$output->writeln('');
+		}
+
+		if (!empty($not_ready_tasks))
+		{
+			$output->writeln('<info>' . $this->user->lang('TASKS_NOT_READY') . '</info>');
+			foreach ($not_ready_tasks as $task)
+			{
+				$output->writeln($task->get_name());
+			}
+		}
+	}
+}
-- 
cgit v1.2.1


From dc7be4f273f68e85aa218a6731e4cb691c4691e0 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Mon, 2 Jun 2014 15:58:02 +0200
Subject: [ticket/12602] Correction of the output message for the cron list

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index 0018d9542d..beedc3c932 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -30,7 +30,7 @@ class cron_list extends \phpbb\console\command\command
 	{
 		$this
 			->setName('cron:list')
-			->setDescription($this->user->lang('CLI_DESCR_CRON_LIST'))
+			->setDescription($this->user->lang('CLI_DESCRIPTION_CRON_LIST'))
 		;
 	}
 
-- 
cgit v1.2.1


From 760aa9d402aa300349b18ba785fa7ccc4b5fccf5 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Tue, 3 Jun 2014 10:42:50 +0200
Subject: [ticket/12602] Changes to respect coding style and to factorize code.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index beedc3c932..f95cb6fb03 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -61,20 +61,26 @@ class cron_list extends \phpbb\console\command\command
 		if (!empty($ready_tasks))
 		{
 			$output->writeln('<info>' . $this->user->lang('TASKS_READY') . '</info>');
-			foreach ($ready_tasks as $task)
-			{
-				$output->writeln($task->get_name());
-			}
+			$this->print_tasks_names($ready_tasks, $output);
+		}
+
+		if (!empty($ready_tasks) && !empty($not_ready_tasks))
+		{
 			$output->writeln('');
 		}
 
 		if (!empty($not_ready_tasks))
 		{
 			$output->writeln('<info>' . $this->user->lang('TASKS_NOT_READY') . '</info>');
-			foreach ($not_ready_tasks as $task)
-			{
-				$output->writeln($task->get_name());
-			}
+			$this->print_tasks_names($not_ready_tasks, $output);
+		}
+	}
+
+	public function print_tasks_names ($tasks, $output)
+	{
+		foreach ($tasks as $task)
+		{
+			$output->writeln($task->get_name());
 		}
 	}
 }
-- 
cgit v1.2.1


From 721a1d0bc49fce52a8e438946a58ba0ca6db2f28 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Tue, 3 Jun 2014 10:50:00 +0200
Subject: [ticket/12602] Headers updated.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index f95cb6fb03..c933bc6d69 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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\console\command\cron;
-- 
cgit v1.2.1


From 5aca27e8cfc0f9387bc62756c8f296e2cec823a3 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Tue, 3 Jun 2014 10:54:28 +0200
Subject: [ticket/12602] Fix coding style mistakes.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index c933bc6d69..c6677db1f5 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -88,3 +88,4 @@ class cron_list extends \phpbb\console\command\command
 		}
 	}
 }
+
-- 
cgit v1.2.1


From 7c22d653e92af46375a6547be7e9b2527bc3d385 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Wed, 4 Jun 2014 15:50:09 +0200
Subject: [ticket/12602] Coding style correction.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index c6677db1f5..c933bc6d69 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -88,4 +88,3 @@ class cron_list extends \phpbb\console\command\command
 		}
 	}
 }
-
-- 
cgit v1.2.1


From 442e12828b827239806e84dcd77641cfc5daca57 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Wed, 4 Jun 2014 21:56:55 +0200
Subject: [ticket/12602] Fix spaces issues.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index c933bc6d69..9d9a3bdef7 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -80,7 +80,7 @@ class cron_list extends \phpbb\console\command\command
 		}
 	}
 
-	public function print_tasks_names ($tasks, $output)
+	public function print_tasks_names($tasks, $output)
 	{
 		foreach ($tasks as $task)
 		{
-- 
cgit v1.2.1


From c6999481e7ebd4c24127161ad2b51d8c3e15dc05 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Thu, 5 Jun 2014 15:11:15 +0200
Subject: [ticket/12602] Add types, change description of cron:list.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index 9d9a3bdef7..1c32e6e306 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -80,7 +80,7 @@ class cron_list extends \phpbb\console\command\command
 		}
 	}
 
-	public function print_tasks_names($tasks, $output)
+	protected function print_tasks_names(array $tasks, OutputInterface $output)
 	{
 		foreach ($tasks as $task)
 		{
-- 
cgit v1.2.1


From 8f0a04f318a5cf11595eae9f52118bfef7f3d98c Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Fri, 6 Jun 2014 10:21:00 +0200
Subject: [ticket/12602] Fix language var mistakes.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index 1c32e6e306..cc51a57f4b 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -44,7 +44,7 @@ class cron_list extends \phpbb\console\command\command
 
 		if (empty($tasks))
 		{
-			$output->writeln($this->user->lang('NO_TASK'));
+			$output->writeln($this->user->lang('CRON_NO_RUNNABLE_TASK'));
 			return;
 		}
 
-- 
cgit v1.2.1


From 347de7f060095cc43c2a5b5575924997ac8d3dbf Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Fri, 6 Jun 2014 14:55:37 +0200
Subject: [ticket/12602] Rectify language keys.

PHPBB3-12602
---
 phpBB/phpbb/console/command/cron/cron_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/console')

diff --git a/phpBB/phpbb/console/command/cron/cron_list.php b/phpBB/phpbb/console/command/cron/cron_list.php
index cc51a57f4b..9db6a23947 100644
--- a/phpBB/phpbb/console/command/cron/cron_list.php
+++ b/phpBB/phpbb/console/command/cron/cron_list.php
@@ -44,7 +44,7 @@ class cron_list extends \phpbb\console\command\command
 
 		if (empty($tasks))
 		{
-			$output->writeln($this->user->lang('CRON_NO_RUNNABLE_TASK'));
+			$output->writeln($this->user->lang('CRON_NO_TASKS'));
 			return;
 		}
 
-- 
cgit v1.2.1