[ticket/11700] Move all recent code to namespaces

PHPBB3-11700

5 files changed, 20 insertions, 20 deletions

diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php
index c038020385..e0449cef89 100644
--- a/tests/notification/convert_test.php
+++ b/tests/notification/convert_test.php
@@ -25,10 +25,10 @@ class phpbb_notification_convert_test extends phpbb_database_test_case
 
 		$this->db = $this->new_dbal();
 
-		$this->migration = new phpbb_db_migration_data_310_notification_options_reconvert(
-			new phpbb_config(array()),
+		$this->migration = new \phpbb\db\migration\data0\notification_options_reconvert(
+			new \phpbb\config\config(array()),
 			$this->db,
-			new phpbb_db_tools($this->db),
+			new \phpbb\db\tools($this->db),
 			$phpbb_root_path,
 			$phpEx,
 			'phpbb_'
diff --git a/tests/notification/ext/test/notification/type/test.php b/tests/notification/ext/test/notification/type/test.php
index 0d0c584e0d..629954efce 100644
--- a/tests/notification/ext/test/notification/type/test.php
+++ b/tests/notification/ext/test/notification/type/test.php
@@ -15,7 +15,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-class phpbb_notification_type_test extends phpbb_notification_type_base
+class phpbb_notification_type_test extends \phpbb\notification\type\base
 {
 	public function get_type()
 	{
diff --git a/tests/notification/manager_helper.php b/tests/notification/manager_helper.php
index 7a794f922f..95caa7c0ba 100644
--- a/tests/notification/manager_helper.php
+++ b/tests/notification/manager_helper.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Notifications service class
 * @package notifications
 */
-class phpbb_notification_manager_helper extends phpbb_notification_manager
+class phpbb_notification_manager_helper extends \phpbb\notification\manager
 {
 	public function set_var($name, $value)
 	{
diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php
index 8f7eb3b8a8..1e2ce13956 100644
--- a/tests/notification/notification_test.php
+++ b/tests/notification/notification_test.php
@@ -27,17 +27,17 @@ class phpbb_notification_test extends phpbb_database_test_case
 		include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx);
 
 		$this->db = $this->new_dbal();
-		$this->config = new phpbb_config(array(
+		$this->config = new \phpbb\config\config(array(
 			'allow_privmsg'			=> true,
 			'allow_bookmarks'		=> true,
 			'allow_topic_notify'	=> true,
 			'allow_forum_notify'	=> true,
 		));
-		$this->user = new phpbb_user();
-		$this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
+		$this->user = new \phpbb\user();
+		$this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 		$this->auth = new phpbb_mock_notifications_auth();
-		$this->cache = new phpbb_cache_service(
-			new phpbb_cache_driver_null(),
+		$this->cache = new \phpbb\cache\service(
+			new \phpbb\cache\driver\null(),
 			$this->config,
 			$this->db,
 			$phpbb_root_path,
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index 4e564ce23c..09cd7b4213 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -53,7 +53,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 		$db = $this->db;
 
 		// Auth
-		$auth = $this->getMock('phpbb_auth');
+		$auth = $this->getMock('\phpbb\auth\auth');
 		$auth->expects($this->any())
 			->method('acl_get')
 			->with($this->stringContains('_'),
@@ -65,12 +65,12 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 			)));
 
 		// Config
-		$config = new phpbb_config(array('num_topics' => 1,'num_posts' => 1,));
+		$config = new \phpbb\config\config(array('num_topics' => 1,'num_posts' => 1,));
 		set_config(null, null, null, $config);
 		set_config_count(null, null, null, $config);
 
-		$cache = new phpbb_cache_service(
-			new phpbb_cache_driver_null(),
+		$cache = new \phpbb\cache\service(
+			new \phpbb\cache\driver\null(),
 			$config,
 			$db,
 			$phpbb_root_path,
@@ -81,7 +81,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 
 		// User
-		$user = $this->getMock('phpbb_user');
+		$user = $this->getMock('\phpbb\user');
 		$user->ip = '';
 		$user->data = array(
 			'user_id'		=> 2,
@@ -91,14 +91,14 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 		);
 
 		// Request
-		$type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface');
-		$request = $this->getMock('phpbb_request');
+		$type_cast_helper = $this->getMock('\phpbb\request\type_cast_helper_interface');
+		$request = $this->getMock('\phpbb\request\request');
 
 		// Container
 		$phpbb_container = new phpbb_mock_container_builder();
-		$phpbb_container->set('content.visibility', new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
+		$phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
 
-		$user_loader = new phpbb_user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE);
 
 		// Notification Types
 		$notification_types = array('quote', 'bookmark', 'post', 'post_in_queue', 'topic', 'approve_topic', 'approve_post');
@@ -117,7 +117,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 		}
 
 		// Notification Manager
-		$phpbb_notifications = new phpbb_notification_manager($notification_types_array, array(),
+		$phpbb_notifications = new \phpbb\notification\manager($notification_types_array, array(),
 			$phpbb_container, $user_loader, $db, $cache, $user,
 			$phpbb_root_path, $phpEx,
 			NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE);