diff options
author | 2016-08-03 13:42:36 -0400 | |
---|---|---|
committer | 2016-08-03 13:42:36 -0400 | |
commit | 8a9cf32b1d6c87367dbfe67d5e567e23fc7a5e66 (patch) | |
tree | de9be088893994fa32de55d2cbe7408cd6238d63 /phpBB/phpbb/report | |
parent | Merge branch '3.1.x' into 3.2.x (diff) | |
download | phpbb-8a9cf32b1d6c87367dbfe67d5e567e23fc7a5e66.tar.gz phpbb-8a9cf32b1d6c87367dbfe67d5e567e23fc7a5e66.tar.bz2 phpbb-8a9cf32b1d6c87367dbfe67d5e567e23fc7a5e66.zip |
[ticket/14729] Make reports take config base class
Make the report controller and helper classes accept the more generic
phpbb/config/config base class in their constructors, instead of the
specific database implementation phpbb/config/db.
PHPBB3-14729
Diffstat (limited to 'phpBB/phpbb/report')
-rw-r--r-- | phpBB/phpbb/report/controller/report.php | 4 | ||||
-rw-r--r-- | phpBB/phpbb/report/report_handler.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/report/controller/report.php b/phpBB/phpbb/report/controller/report.php index f703d1cc60..e1c14afde0 100644 --- a/phpBB/phpbb/report/controller/report.php +++ b/phpBB/phpbb/report/controller/report.php @@ -19,7 +19,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse; class report { /** - * @var \phpbb\config\db + * @var \phpbb\config\config */ protected $config; @@ -68,7 +68,7 @@ class report */ protected $report_reason_provider; - public function __construct(\phpbb\config\db $config, \phpbb\user $user, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\request\request_interface $request, \phpbb\captcha\factory $captcha_factory, \phpbb\report\handler_factory $report_factory, \phpbb\report\report_reason_list_provider $ui_provider, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\request\request_interface $request, \phpbb\captcha\factory $captcha_factory, \phpbb\report\handler_factory $report_factory, \phpbb\report\report_reason_list_provider $ui_provider, $phpbb_root_path, $php_ext) { $this->config = $config; $this->user = $user; diff --git a/phpBB/phpbb/report/report_handler.php b/phpBB/phpbb/report/report_handler.php index 126a206dbf..854318c559 100644 --- a/phpBB/phpbb/report/report_handler.php +++ b/phpBB/phpbb/report/report_handler.php @@ -26,7 +26,7 @@ abstract class report_handler implements report_handler_interface protected $dispatcher; /** - * @var \phpbb\config\db + * @var \phpbb\config\config */ protected $config; @@ -60,7 +60,7 @@ abstract class report_handler implements report_handler_interface * @param \phpbb\user $user * @param \phpbb\notification\manager $notification */ - public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\config\db $config, \phpbb\auth\auth $auth, \phpbb\user $user, \phpbb\notification\manager $notification) + public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\config\config $config, \phpbb\auth\auth $auth, \phpbb\user $user, \phpbb\notification\manager $notification) { $this->db = $db; $this->dispatcher = $dispatcher; |