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

[ticket/11492] Fix issues with log object

Browse source 
PHPBB3-11492
This commit is contained in:
Joas Schilling 2013-04-11 15:59:31 +02:00
parent f920c69ad5
commit 7f527e8012
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/test_framework/phpbb_functional_test_case.php
View file

@ -318,18 +318,17 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function remove_user_group($group_name, $usernames) protected function remove_user_group($group_name, $usernames)
{ {
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container; global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx;
$config = new phpbb_config(array()); $config = new phpbb_config(array());
$config['coppa_enable'] = 0; $config['coppa_enable'] = 0;
$db = $this->get_db(); $db = $this->get_db();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->getMock('phpbb_user');
$auth = $this->getMock('phpbb_auth');
$phpbb_log = $this->getMock('phpbb_log'); $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
$phpbb_log
->expects($this->any())
->method('add')
->will($this->returnValue(true));
$cache = new phpbb_mock_null_cache; $cache = new phpbb_mock_null_cache;
$cache_driver = new phpbb_cache_driver_null(); $cache_driver = new phpbb_cache_driver_null();
@ -348,8 +347,6 @@ class phpbb_functional_test_case extends phpbb_test_case
{ {
require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
} }
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$auth = $this->getMock('Observer', array('acl_clear_prefetch'));
$sql = 'SELECT group_id $sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . " FROM ' . GROUPS_TABLE . "
@ -363,18 +360,17 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function add_user_group($group_name, $usernames) protected function add_user_group($group_name, $usernames)
{ {
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container; global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx;
$config = new phpbb_config(array()); $config = new phpbb_config(array());
$config['coppa_enable'] = 0; $config['coppa_enable'] = 0;
$db = $this->get_db(); $db = $this->get_db();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->getMock('phpbb_user');
$auth = $this->getMock('phpbb_auth');
$phpbb_log = $this->getMock('phpbb_log'); $phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
$phpbb_log
->expects($this->any())
->method('add')
->will($this->returnValue(true));
$cache = new phpbb_mock_null_cache; $cache = new phpbb_mock_null_cache;
$cache_driver = new phpbb_cache_driver_null(); $cache_driver = new phpbb_cache_driver_null();
@ -393,8 +389,6 @@ class phpbb_functional_test_case extends phpbb_test_case
{ {
require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
} }
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$auth = $this->getMock('Observer', array('acl_clear_prefetch'));
$sql = 'SELECT group_id $sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . " FROM ' . GROUPS_TABLE . "