[ticket/15328] Use type_interface

PHPBB3-15328
This commit is contained in:
kasimi 2017-09-07 13:30:39 +02:00
parent ec2d983ab1
commit edd1ce7443
3 changed files with 15 additions and 9 deletions

View file

@ -13,6 +13,8 @@
namespace phpbb\notification\method;
use phpbb\notification\type\type_interface;
/**
* Email notification method class
* This class handles sending emails for notifications
@ -57,11 +59,11 @@ class email extends \phpbb\notification\method\messenger_base
* Is this method available for the user?
* This is checked on the notifications options
*
* @param \phpbb\notification\type\type_interface $notification_type An optional instance of a notification type. If provided, this
* method additionally checks if the type provides an email template.
* @param type_interface $notification_type An optional instance of a notification type. If provided, this
* method additionally checks if the type provides an email template.
* @return bool
*/
public function is_available(\phpbb\notification\type\type_interface $notification_type = null)
public function is_available(type_interface $notification_type = null)
{
return parent::is_available($notification_type) && $this->config['email_enable'] && $this->user->data['user_email'];
}

View file

@ -13,6 +13,8 @@
namespace phpbb\notification\method;
use phpbb\notification\type\type_interface;
/**
* Jabber notification method class
* This class handles sending Jabber messages for notifications
@ -57,11 +59,11 @@ class jabber extends \phpbb\notification\method\messenger_base
* Is this method available for the user?
* This is checked on the notifications options
*
* @param \phpbb\notification\type\type_interface $notification_type An optional instance of a notification type. If provided, this
* method additionally checks if the type provides an email template.
* @param type_interface $notification_type An optional instance of a notification type. If provided, this
* method additionally checks if the type provides an email template.
* @return bool
*/
public function is_available(\phpbb\notification\type\type_interface $notification_type = null)
public function is_available(type_interface $notification_type = null)
{
return parent::is_available($notification_type) && $this->global_available() && $this->user->data['user_jabber'];
}

View file

@ -13,6 +13,8 @@
namespace phpbb\notification\method;
use phpbb\notification\type\type_interface;
/**
* Abstract notification method handling email and jabber notifications
* using the phpBB messenger.
@ -46,11 +48,11 @@ abstract class messenger_base extends \phpbb\notification\method\base
* Is this method available for the user?
* This is checked on the notifications options
*
* @param \phpbb\notification\type\type_interface $notification_type An optional instance of a notification type. This method returns false
* only if the type is provided and if it doesn't provide an email template.
* @param type_interface $notification_type An optional instance of a notification type. This method returns false
* only if the type is provided and if it doesn't provide an email template.
* @return bool
*/
public function is_available(\phpbb\notification\type\type_interface $notification_type = null)
public function is_available(type_interface $notification_type = null)
{
return $notification_type === null || $notification_type->get_email_template() !== false;
}