aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/notification
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-16 01:12:03 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-16 01:12:03 +0200
commitf27be59cf1bc97ac9da6bc7f963b1e0c44ee248b (patch)
tree20e82f52d2e6ffb5b5f3717849e823e56a1f5468 /phpBB/phpbb/notification
parentad11925c7730e4f3c6b1cffe46c6ba531f04f4d9 (diff)
parentf4ef1ab6bd4b18ea002ec1d5bf733d4f6b357e57 (diff)
downloadforums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar
forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar.gz
forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar.bz2
forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.tar.xz
forums-f27be59cf1bc97ac9da6bc7f963b1e0c44ee248b.zip
Merge pull request #2600 from Nicofuma/ticket/12715
[ticket/12715] Fix mistakes in the doc blocks * Nicofuma/ticket/12715: (30 commits) [ticket/12715] Add missing new line in the notification manager [ticket/12715] Cleanup comments in \phpbb\symfony_request [ticket/12715] Cleanup comments in \phpbb\permissions [ticket/12715] Cleanup comments in \phpbb\path_helper [ticket/12715] Cleanup comments in \phpbb\pagination [ticket/12715] Cleanup comments in \phpbb\datetime [ticket/12715] Cleanup comments in \phpbb\content_visibility [ticket/12715] Cleanup comments in \phpbb\tree\* [ticket/12715] Cleanup comments in \phpbb\template\* [ticket/12715] Cleanup comments in \phpbb\plupload\* [ticket/12715] Cleanup comments in \phpbb\profilefields\* [ticket/12715] Cleanup comments in \phpbb\passwords\* [ticket/12715] Cleanup comments in \phpbb\notification\* [ticket/12715] Cleanup comments in \phpbb\mimetype\* [ticket/12715] Cleanup comments in \phpbb\message\* [ticket/12715] Cleanup comments in \phpbb\log\* [ticket/12715] Cleanup comments in \phpbb\lock\* [ticket/12715] Cleanup comments in \phpbb\groupposition\* [ticket/12715] Cleanup comments in \phpbb\feed\* [ticket/12715] Cleanup comments in \phpbb\extension\* ...
Diffstat (limited to 'phpBB/phpbb/notification')
-rw-r--r--phpBB/phpbb/notification/manager.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index b787b624f6..74ef980445 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -13,6 +13,8 @@
namespace phpbb\notification;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
/**
* Notifications service class
*/
@@ -24,7 +26,7 @@ class manager
/** @var array */
protected $notification_methods;
- /** @var ContainerBuilder */
+ /** @var ContainerInterface */
protected $phpbb_container;
/** @var \phpbb\user_loader */
@@ -62,7 +64,7 @@ class manager
*
* @param array $notification_types
* @param array $notification_methods
- * @param ContainerBuilder $phpbb_container
+ * @param ContainerInterface $phpbb_container
* @param \phpbb\user_loader $user_loader
* @param \phpbb\config\config $config
* @param \phpbb\db\driver\driver_interface $db
@@ -74,7 +76,7 @@ class manager
* @param string $user_notifications_table
* @return \phpbb\notification\manager
*/
- public function __construct($notification_types, $notification_methods, $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+ public function __construct($notification_types, $notification_methods, ContainerInterface $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
{
$this->notification_types = $notification_types;
$this->notification_methods = $notification_methods;
@@ -886,6 +888,7 @@ class manager
*
* @param string $notification_type_name The name
* @return int the notification_type_id
+ * @throws \phpbb\notification\exception
*/
public function get_notification_type_id($notification_type_name)
{