3 files changed, 9 insertions, 16 deletions
diff --git a/phpBB/phpbb/console/command/cron/run_all.php b/phpBB/phpbb/console/command/cron/run_all.php
index e2d235395b..b398e46ab9 100644
--- a/phpBB/phpbb/console/command/cron/run_all.php
+++ b/phpBB/phpbb/console/command/cron/run_all.php
@@ -53,12 +53,15 @@ class run_all extends \phpbb\console\command\command
 	}
 
 	/**
-	* Executes the function. Each cron tasks is executed.
-	* If option "--verbose" is not seted, there will be no output in case of
-	* successful execution.
+	* Executes the function.
+	* Tries to acquire the cron lock, then runs all ready cron tasks.
+	* If the cron lock can not be obtained, an error message is printed
+	*							and the exit status is set to 1.
+	*If the verbose option is specified, each start of a task is printed.
+								Otherwise there is no output.
 	*
-	* @param InputInterface input The input stream, unused here
-	* @param OutputInterface output The output stream, used for printig verbose-mode
+	* @param InputInterface $input The input stream, unused here
+	* @param OutputInterface $output The output stream, used for printig verbose-mode
 	*							and error information.
 	* @return boolean 0 if all is ok, 1 if a lock error occured
 	*/
diff --git a/tests/console/cron/run_all_test.php b/tests/console/cron/run_all_test.php
index b85d5eb901..5306d27094 100644
--- a/tests/console/cron/run_all_test.php
+++ b/tests/console/cron/run_all_test.php
@@ -31,7 +31,6 @@ class phpbb_console_command_cron_run_all_test extends phpbb_database_test_case
 	public function setUp()
 	{
 		global $db, $config, $phpbb_root_path, $pathEx;
-		global $cron_num_exec;
 
 		$db = $this->db = $this->new_dbal();
 		$config = $this->config = new \phpbb\config\config(array('cron_lock' => '0'));
@@ -47,15 +46,11 @@ class phpbb_console_command_cron_run_all_test extends phpbb_database_test_case
 		);
 		$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $pathEx);
 
-		$cron_num_exec = 0;
-
 		$this->assertSame('0', $config['cron_lock']);
 	}
 
 	public function test_normal_use()
 	{
-		global $cron_num_exec;
-
 		$command_tester = $this->get_command_tester();
 		$command_tester->execute(array('command' => $this->command_name));
 
@@ -65,8 +60,6 @@ class phpbb_console_command_cron_run_all_test extends phpbb_database_test_case
 
 	public function test_verbose_mode()
 	{
-		global $cron_num_exec;
-
 		$command_tester = $this->get_command_tester();
 		$command_tester->execute(array('command' => $this->command_name, '--verbose' => true));
 
@@ -76,8 +69,6 @@ class phpbb_console_command_cron_run_all_test extends phpbb_database_test_case
 
 	public function test_error_lock()
 	{
-		global $cron_num_exec;
-
 		$this->lock->acquire();
 		$command_tester = $this->get_command_tester();
 		$command_tester->execute(array('command' => $this->command_name));
diff --git a/tests/console/cron/tasks/simple.php b/tests/console/cron/tasks/simple.php
index 15194caaf7..b1fd41f34e 100644
--- a/tests/console/cron/tasks/simple.php
+++ b/tests/console/cron/tasks/simple.php
@@ -6,8 +6,7 @@ class phpbb_cron_task_simple extends \phpbb\cron\task\base
 
 	public function __construct()
 	{
-		$executed = false;
-		parent::__construct();
+		$this->executed = false;
 	}
 
 	public function get_name()