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

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/13952] Fix docblocks
  [ticket/13952] Inject dispatcher dependency to the tidy search cron task
This commit is contained in:
Andreas Fischer 2015-06-22 00:45:42 +02:00
commit 8213f24b35
2 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/default/container/services_cron.yml
View file

@ -120,6 +120,7 @@ services:
- @config - @config
- @dbal.conn - @dbal.conn
- @user - @user
- @dispatcher
calls: calls:
- [set_name, [cron.task.core.tidy_search]] - [set_name, [cron.task.core.tidy_search]]
tags: tags:

51
phpBB/phpbb/cron/task/core/tidy_search.php
View file

@ -20,24 +20,60 @@ namespace phpbb\cron\task\core;
*/ */
class tidy_search extends \phpbb\cron\task\base class tidy_search extends \phpbb\cron\task\base
{ {
/**
* phpBB root path
* @var string
*/
protected $phpbb_root_path; protected $phpbb_root_path;
/**
* PHP file extension
* @var string
*/
protected $php_ext; protected $php_ext;
/**
* Auth object
* @var \phpbb\auth\auth
*/
protected $auth; protected $auth;
/**
* Config object
* @var \phpbb\config\config
*/
protected $config; protected $config;
/**
* Database object
* @var \phpbb\db\driver\driver_interface
*/
protected $db; protected $db;
/**
* User object
* @var \phpbb\user
*/
protected $user; protected $user;
/**
* Event dispatcher object
* @var \phpbb\event\dispatcher_interface
*/
protected $phpbb_dispatcher;
/** /**
* Constructor. * Constructor.
* *
* @param string $phpbb_root_path The root path * @param string $phpbb_root_path The phpBB root path
* @param string $php_ext The PHP file extension * @param string $php_ext The PHP file extension
* @param \phpbb\auth\auth $auth The auth * @param \phpbb\auth\auth $auth The auth object
* @param \phpbb\config\config $config The config * @param \phpbb\config\config $config The config object
* @param \phpbb\db\driver\driver_interface $db The db connection * @param \phpbb\db\driver\driver_interface $db The database object
* @param \phpbb\user $user The user * @param \phpbb\user $user The user object
* @param \phpbb\event\dispatcher_interface $phpbb_dispatcher The event dispatcher object
*/ */
public function __construct($phpbb_root_path, $php_ext, \phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user) public function __construct($phpbb_root_path, $php_ext, \phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\event\dispatcher_interface $phpbb_dispatcher)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
@ -45,6 +81,7 @@ class tidy_search extends \phpbb\cron\task\base
$this->config = $config; $this->config = $config;
$this->db = $db; $this->db = $db;
$this->user = $user; $this->user = $user;
$this->phpbb_dispatcher = $phpbb_dispatcher;
} }
/** /**
@ -58,7 +95,7 @@ class tidy_search extends \phpbb\cron\task\base
// We do some additional checks in the module to ensure it can actually be utilised // We do some additional checks in the module to ensure it can actually be utilised
$error = false; $error = false;
$search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user); $search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user, $this->phpbb_dispatcher);
if (!$error) if (!$error)
{ {