makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11103] Remove global $db usage in test

Browse source 
PHPBB3-11103
This commit is contained in:
Nathaniel Guse 2012-12-26 11:05:12 -06:00
parent 30356efab9
commit 148463d586
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/notification/notification.php
View file

@ -20,7 +20,7 @@ class phpbb_notification_test extends phpbb_database_test_case
{ {
parent::setUp(); parent::setUp();
global $phpbb_root_path, $db, $phpEx; global $phpbb_root_path, $phpEx;
if (!function_exists('set_var')) if (!function_exists('set_var'))
{ {
@ -29,7 +29,7 @@ class phpbb_notification_test extends phpbb_database_test_case
include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx); include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx);
$db = $this->db = $this->new_dbal(); $this->db = $this->new_dbal();
$this->config = new phpbb_config(array( $this->config = new phpbb_config(array(
'allow_privmsg' => true, 'allow_privmsg' => true,
'allow_bookmarks' => true, 'allow_bookmarks' => true,
@ -125,10 +125,8 @@ class phpbb_notification_test extends phpbb_database_test_case
public function test_notifications() public function test_notifications()
{ {
global $db;
// Used to test post notifications later // Used to test post notifications later
$db->sql_query('INSERT INTO ' . TOPICS_WATCH_TABLE . ' ' . $db->sql_build_array('INSERT', array( $this->db->sql_query('INSERT INTO ' . TOPICS_WATCH_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
'topic_id' => 2, 'topic_id' => 2,
'notify_status' => NOTIFY_YES, 'notify_status' => NOTIFY_YES,
'user_id' => 0, 'user_id' => 0,
@ -171,7 +169,7 @@ class phpbb_notification_test extends phpbb_database_test_case
'forum_name' => 'Your first forum', 'forum_name' => 'Your first forum',
)); ));
$db->sql_query('INSERT INTO ' . BOOKMARKS_TABLE . ' ' . $db->sql_build_array('INSERT', array( $this->db->sql_query('INSERT INTO ' . BOOKMARKS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
'topic_id' => 2, 'topic_id' => 2,
'user_id' => 0, 'user_id' => 0,
))); )));