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

[ticket/10714] Fix missing parameter and global phpbb_log in unit tests

Browse source 
PHPBB3-10714
This commit is contained in:
Joas Schilling 2013-01-22 22:40:53 +01:00
parent d2e395b41f
commit e8fd8b9a4b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/functions_container.php
View file

@ -57,6 +57,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext); $container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
$container->setParameter('core.root_path', $phpbb_root_path); $container->setParameter('core.root_path', $phpbb_root_path);
$container->setParameter('core.adm_relative_path', 'adm/');
$container->setParameter('core.php_ext', $php_ext); $container->setParameter('core.php_ext', $php_ext);
$container->setParameter('core.table_prefix', ''); $container->setParameter('core.table_prefix', '');

3
tests/functions_user/group_user_attributes_test.php
View file

@ -125,7 +125,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
*/ */
public function test_group_user_attributes($description, $user_id, $group_id, $group_row, $expected) public function test_group_user_attributes($description, $user_id, $group_id, $group_row, $expected)
{ {
global $auth, $cache, $db, $phpbb_dispatcher, $user, $phpbb_container; global $auth, $cache, $db, $phpbb_dispatcher, $user, $phpbb_container, $phpbb_log, $phpbb_root_path, $phpEx;
$user->ip = ''; $user->ip = '';
$cache = new phpbb_mock_cache; $cache = new phpbb_mock_cache;
@ -141,6 +141,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes
->method('get') ->method('get')
->with('cache.driver') ->with('cache.driver')
->will($this->returnValue($cache_driver)); ->will($this->returnValue($cache_driver));
$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
group_user_attributes('default', $group_id, array($user_id), false, 'group_name', $group_row); group_user_attributes('default', $group_id, array($user_id), false, 'group_name', $group_row);