[ticket/546] Use phpbb\language\language for module language files

B3P-546
This commit is contained in:
Marc Alexander
2015-05-06 11:46:49 +02:00
parent 5cee058e69
commit 6ad980975a
13 changed files with 58 additions and 16 deletions

View File

@@ -23,7 +23,9 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
parent::setUp();
$user = new \phpbb\user('\phpbb\datetime');
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$user = new \phpbb\user($this->language, '\phpbb\datetime');
$user->data['user_id'] = 2;
$user->timezone = new \DateTimeZone('UTC');
$user->add_lang('common');

View File

@@ -39,7 +39,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
public function setUp()
{
global $cache, $db, $portal_config;
global $cache, $db, $portal_config, $phpbb_root_path, $phpEx;
parent::setUp();
@@ -95,10 +95,14 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
$phpEx
);
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$this->b3p_controller_helper = new \board3\portal\controller\helper(
new \phpbb\auth\auth(),
$this->portal_columns,
$config,
$this->language,
new \board3\portal\tests\mock\template($this),
$user,
$this->path_helper,

View File

@@ -33,7 +33,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
public function setUp()
{
global $cache, $db;
global $cache, $db, $phpbb_root_path, $phpEx;
parent::setUp();
@@ -90,10 +90,14 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
$phpEx
);
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$this->b3p_controller_helper = new \board3\portal\controller\helper(
new \phpbb\auth\auth(),
$this->portal_columns,
$config,
$this->language,
new \board3\portal\tests\mock\template($this),
$user,
$this->path_helper,