makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12597] Fix various problems

Browse source 
Actually fix the return status of command cron:run-all
Fix some doc block coding style issue
Fix missing and obsolete file headers
Delete a useless constructor method

PHPBB3-12597
This commit is contained in:
LEZY Thomas 2014-05-28 18:28:46 +02:00
parent 18875894ec
commit 61ad42790f
3 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/phpbb/console/command/cron/run_all.php
View file

@ -1,11 +1,16 @@
<?php <?php
/** /**
* *
* @package phpBB3 * This file is part of the phpBB Forum Software package.
* @copyright (c) 2014 phpBB Group *
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * @copyright (c) phpBB Limited
* @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; namespace phpbb\console\command\cron;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -54,16 +59,17 @@ class run_all extends \phpbb\console\command\command
/** /**
* Executes the function. * Executes the function.
*
* Tries to acquire the cron lock, then runs all ready cron tasks. * 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 * If the cron lock can not be obtained, an error message is printed
* and the exit status is set to 1. * and the exit status is set to 1.
* If the verbose option is specified, each start of a task is printed. * If the verbose option is specified, each start of a task is printed.
Otherwise there is no output. * Otherwise there is no output.
* *
* @param InputInterface $input The input stream, unused here * @param InputInterface $input The input stream, unused here
* @param OutputInterface $output The output stream, used for printig verbose-mode * @param OutputInterface $output The output stream, used for printig verbose-mode
* and error information. * and error information.
* @return boolean 0 if all is ok, 1 if a lock error occured * @return int 0 if all is ok, 1 if a lock error occured
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
@ -81,10 +87,13 @@ class run_all extends \phpbb\console\command\command
$task->run(); $task->run();
} }
$this->lock_db->release(); $this->lock_db->release();
return 0;
} }
else else
{ {
$output->writeln('<error>' . $this->user->lang('CRON_LOCK_ERROR') . '</error>'); $output->writeln('<error>' . $this->user->lang('CRON_LOCK_ERROR') . '</error>');
return 1;
} }
} }
} }

10
tests/console/cron/run_all_test.php
View file

@ -1,9 +1,13 @@
<?php <?php
/** /**
* *
* @package testing * This file is part of the phpBB Forum Software package.
* @copyright (c) 2014 phpBB Group *
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * @copyright (c) phpBB Limited
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
* *
*/ */

18
tests/console/cron/tasks/simple.php
View file

@ -1,13 +1,19 @@
<?php <?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
class phpbb_cron_task_simple extends \phpbb\cron\task\base class phpbb_cron_task_simple extends \phpbb\cron\task\base
{ {
public $executed; public $executed = false;
public function __construct()
{
$this->executed = false;
}
public function get_name() public function get_name()
{ {