5 files changed, 34 insertions, 64 deletions
diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php
index b633956d01..2e6507d30f 100644
--- a/phpBB/phpbb/notification/method/base.php
+++ b/phpBB/phpbb/notification/method/base.php
@@ -7,45 +7,39 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\notification\method;
 
 /**
 * Base notifications method class
 * @package notifications
 */
-abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
+abstract class base implements \phpbb\notification\method\method_interface
 {
-	/** @var phpbb_notification_manager */
+	/** @var \phpbb\notification\manager */
 	protected $notification_manager;
 
-	/** @var phpbb_user_loader */
+	/** @var \phpbb\user_loader */
 	protected $user_loader;
 
-	/** @var phpbb_db_driver */
+	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
-	/** @var phpbb_cache_driver_interface */
+	/** @var \phpbb\cache\driver\driver_interface */
 	protected $cache;
 
-	/** @var phpbb_template */
+	/** @var \phpbb\template\template */
 	protected $template;
 
-	/** @var phpbb_extension_manager */
+	/** @var \phpbb\extension\manager */
 	protected $extension_manager;
 
-	/** @var phpbb_user */
+	/** @var \phpbb\user */
 	protected $user;
 
-	/** @var phpbb_auth */
+	/** @var \phpbb\auth\auth */
 	protected $auth;
 
-	/** @var phpbb_config */
+	/** @var \phpbb\config\config */
 	protected $config;
 
 	/** @var string */
@@ -64,17 +58,17 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/**
 	* Notification Method Base Constructor
 	* 
-	* @param phpbb_user_loader $user_loader
-	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
-	* @param phpbb_user $user
-	* @param phpbb_auth $auth
-	* @param phpbb_config $config
+	* @param \phpbb\user_loader $user_loader
+	* @param \phpbb\db\driver\driver_interface $db
+	* @param \phpbb\cache\driver\driver_interface $cache
+	* @param \phpbb\user $user
+	* @param \phpbb\auth\auth $auth
+	* @param \phpbb\config\config $config
 	* @param string $phpbb_root_path
 	* @param string $php_ext
-	* @return phpbb_notification_method_base
+	* @return \phpbb\notification\method\base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\user_loader $user_loader, \phpbb\db\driver\driver_interface $db, \phpbb\cache\driver\driver_interface $cache, $user, \phpbb\auth\auth $auth, \phpbb\config\config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
@@ -89,9 +83,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/**
 	* Set notification manager (required)
 	* 
-	* @param phpbb_notification_manager $notification_manager
+	* @param \phpbb\notification\manager $notification_manager
 	*/
-	public function set_notification_manager(phpbb_notification_manager $notification_manager)
+	public function set_notification_manager(\phpbb\notification\manager $notification_manager)
 	{
 		$this->notification_manager = $notification_manager;
 	}
@@ -99,9 +93,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/**
 	* Add a notification to the queue
 	*
-	* @param phpbb_notification_type_interface $notification
+	* @param \phpbb\notification\type\type_interface $notification
 	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification)
+	public function add_to_queue(\phpbb\notification\type\type_interface $notification)
 	{
 		$this->queue[] = $notification;
 	}
diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php
index 571b0ec656..e039fae8de 100644
--- a/phpBB/phpbb/notification/method/email.php
+++ b/phpBB/phpbb/notification/method/email.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\notification\method;
 
 /**
 * Email notification method class
@@ -21,7 +15,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_email extends phpbb_notification_method_messenger_base
+class email extends \phpbb\notification\method\messenger_base
 {
 	/**
 	* Get notification method name
diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php
index d3b756d020..bdfaf5a6fc 100644
--- a/phpBB/phpbb/notification/method/jabber.php
+++ b/phpBB/phpbb/notification/method/jabber.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\notification\method;
 
 /**
 * Jabber notification method class
@@ -21,7 +15,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base
+class jabber extends \phpbb\notification\method\messenger_base
 {
 	/**
 	* Get notification method name
diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php
index 4966aa94bc..7cb38eb59d 100644
--- a/phpBB/phpbb/notification/method/messenger_base.php
+++ b/phpBB/phpbb/notification/method/messenger_base.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\notification\method;
 
 /**
 * Abstract notification method handling email and jabber notifications
@@ -21,7 +15,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-abstract class phpbb_notification_method_messenger_base extends phpbb_notification_method_base
+abstract class messenger_base extends \phpbb\notification\method\base
 {
 	/**
 	* Notify using phpBB messenger
@@ -60,7 +54,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati
 		{
 			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
 		}
-		$messenger = new messenger();
+		$messenger = new \messenger();
 		$board_url = generate_board_url();
 
 		// Time to go through the queue and send emails
diff --git a/phpBB/phpbb/notification/method/interface.php b/phpBB/phpbb/notification/method/method_interface.php
index ef875942cc..4830d06b86 100644
--- a/phpBB/phpbb/notification/method/interface.php
+++ b/phpBB/phpbb/notification/method/method_interface.php
@@ -7,19 +7,13 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\notification\method;
 
 /**
 * Base notifications method interface
 * @package notifications
 */
-interface phpbb_notification_method_interface
+interface method_interface
 {
 	/**
 	* Get notification method name
@@ -37,9 +31,9 @@ interface phpbb_notification_method_interface
 	/**
 	* Add a notification to the queue
 	*
-	* @param phpbb_notification_type_interface $notification
+	* @param \phpbb\notification\type\type_interface $notification
 	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification);
+	public function add_to_queue(\phpbb\notification\type\type_interface $notification);
 
 	/**
 	* Parse the queue and notify the users