aboutsummaryrefslogtreecommitdiffstats
path: root/tests/notification
diff options
context:
space:
mode:
Diffstat (limited to 'tests/notification')
-rw-r--r--tests/notification/base.php12
-rw-r--r--tests/notification/convert_test.php6
-rw-r--r--tests/notification/ext/test/notification/type/test.php4
-rw-r--r--tests/notification/group_request_test.php6
-rw-r--r--tests/notification/manager_helper.php6
-rw-r--r--tests/notification/submit_post_base.php22
6 files changed, 29 insertions, 27 deletions
diff --git a/tests/notification/base.php b/tests/notification/base.php
index 8de162a1fb..549545f01b 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -46,17 +46,17 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
global $db, $config, $user, $auth, $cache, $phpbb_container;
$db = $this->db = $this->new_dbal();
- $config = $this->config = new phpbb_config(array(
+ $config = $this->config = new \phpbb\config\config(array(
'allow_privmsg' => true,
'allow_bookmarks' => true,
'allow_topic_notify' => true,
'allow_forum_notify' => true,
));
- $user = $this->user = new phpbb_user();
- $this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
+ $user = $this->user = new \phpbb\user();
+ $this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
$auth = $this->auth = new phpbb_mock_notifications_auth();
- $cache = $this->cache = new phpbb_cache_service(
- new phpbb_cache_driver_null(),
+ $cache = $this->cache = new \phpbb\cache\service(
+ new \phpbb\cache\driver\null(),
$this->config,
$this->db,
$phpbb_root_path,
@@ -87,7 +87,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
$types = array();
foreach ($this->get_notification_types() as $type)
{
- $class = $this->build_type('phpbb_notification_type_' . $type);
+ $class = $this->build_type('phpbb\notification\type\\' . $type);
$types[$type] = $class;
$this->container->set('notification.type.' . $type, $class);
diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php
index c038020385..ed1fa9b1bf 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\data\v310\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..cdb921ca3b 100644
--- a/tests/notification/ext/test/notification/type/test.php
+++ b/tests/notification/ext/test/notification/type/test.php
@@ -7,6 +7,8 @@
*
*/
+namespace phpbb\notification\type;
+
/**
* @ignore
*/
@@ -15,7 +17,7 @@ if (!defined('IN_PHPBB'))
exit;
}
-class phpbb_notification_type_test extends phpbb_notification_type_base
+class test extends \phpbb\notification\type\base
{
public function get_type()
{
diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php
index 368e4ae973..b812fff8f8 100644
--- a/tests/notification/group_request_test.php
+++ b/tests/notification/group_request_test.php
@@ -37,17 +37,17 @@ class phpbb_notification_group_request_test extends phpbb_tests_notification_bas
set_config(false, false, false, $this->config);
- $this->container->set('groupposition.legend', new phpbb_groupposition_legend(
+ $this->container->set('groupposition.legend', new \phpbb\groupposition\legend(
$this->db,
$this->user
));
- $this->container->set('groupposition.teampage', new phpbb_groupposition_teampage(
+ $this->container->set('groupposition.teampage', new \phpbb\groupposition\teampage(
$this->db,
$this->user,
$this->cache->get_driver()
));
$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
- $phpbb_log = new phpbb_log_null();
+ $phpbb_log = new \phpbb\log\null();
// Now on to the actual test
diff --git a/tests/notification/manager_helper.php b/tests/notification/manager_helper.php
index 7a794f922f..731dd00b7a 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)
{
@@ -40,7 +40,7 @@ class phpbb_notification_manager_helper extends phpbb_notification_manager
*/
public function get_item_type_class($item_type, $data = array())
{
- $item_type = 'phpbb_notification_type_' . $item_type;
+ $item_type = 'phpbb\notification\type\\' . $item_type;
$item = new $item_type($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table);
@@ -56,7 +56,7 @@ class phpbb_notification_manager_helper extends phpbb_notification_manager
*/
public function get_method_class($method_name)
{
- $method_name = 'phpbb_notification_method_' . $method_name;
+ $method_name = 'phpbb\notification\method\\' . $method_name;
$method = new $method_name($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table);
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index 4e564ce23c..8597c626a4 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,21 +91,21 @@ 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');
$notification_types_array = array();
foreach ($notification_types as $type)
{
- $class_name = 'phpbb_notification_type_' . $type;
+ $class_name = '\phpbb\notification\type\\' . $type;
$class = new $class_name(
$user_loader, $db, $cache->get_driver(), $user, $auth, $config,
$phpbb_root_path, $phpEx,
@@ -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);
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-04 14:14:21 +0000