1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-21 16:01:40 +02:00

Merge branch '3.3.x'

This commit is contained in:
Máté Bartus
2021-01-03 00:11:11 +01:00
46 changed files with 206 additions and 110 deletions

View File

@@ -92,7 +92,7 @@ class report
* @param int $id ID of the entity to report
* @param string $mode
* @return \Symfony\Component\HttpFoundation\Response a Symfony response object
* @throws \phpbb\exception\http_exception when $mode or $id is invalid for some reason
* @throws http_exception when $mode or $id is invalid for some reason
*/
public function handle($id, $mode)
{

View File

@@ -13,7 +13,7 @@
namespace phpbb\report\exception;
use \phpbb\exception\runtime_exception;
use phpbb\exception\runtime_exception;
class factory_invalid_argument_exception extends runtime_exception
{

View File

@@ -13,7 +13,7 @@
namespace phpbb\report\exception;
use \phpbb\exception\runtime_exception;
use phpbb\exception\runtime_exception;
class invalid_report_exception extends runtime_exception
{

View File

@@ -37,7 +37,7 @@ class handler_factory
*
* @param string $type
* @return \phpbb\report\report_handler_interface
* @throws \phpbb\report\exception\factory_invalid_argument_exception if $type is not valid
* @throws factory_invalid_argument_exception if $type is not valid
*/
public function get_instance($type)
{

View File

@@ -55,7 +55,7 @@ abstract class report_handler implements report_handler_interface
*
* @param \phpbb\db\driver\driver_interface $db
* @param \phpbb\event\dispatcher_interface $dispatcher
* @param \phpbb\config\db $config
* @param \phpbb\config\config $config
* @param \phpbb\auth\auth $auth
* @param \phpbb\user $user
* @param \phpbb\notification\manager $notification

View File

@@ -22,7 +22,7 @@ class report_handler_pm extends report_handler
{
/**
* {@inheritdoc}
* @throws \phpbb\report\exception\pm_reporting_disabled_exception when PM reporting is disabled on the board
* @throws pm_reporting_disabled_exception when PM reporting is disabled on the board
*/
public function add_report($id, $reason_id, $report_text, $user_notify)
{
@@ -92,7 +92,7 @@ class report_handler_pm extends report_handler
/**
* {@inheritdoc}
* @throws \phpbb\report\exception\pm_reporting_disabled_exception when PM reporting is disabled on the board
* @throws pm_reporting_disabled_exception when PM reporting is disabled on the board
*/
public function validate_report_request($id)
{

View File

@@ -28,7 +28,7 @@ class report_handler_post extends report_handler
/**
* {@inheritdoc}
* @throws \phpbb\report\exception\report_permission_denied_exception when the user does not have permission to report the post
* @throws report_permission_denied_exception when the user does not have permission to report the post
*/
public function add_report($id, $reason_id, $report_text, $user_notify)
{
@@ -89,7 +89,7 @@ class report_handler_post extends report_handler
/**
* {@inheritdoc}
* @throws \phpbb\report\exception\report_permission_denied_exception when the user does not have permission to report the post
* @throws report_permission_denied_exception when the user does not have permission to report the post
*/
public function validate_report_request($id)
{