Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/functions/fetch_news_test.php
View File

@@ -22,7 +22,9 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
global $auth, $cache, $phpbb_container, $phpbb_dispatcher, $template, $user, $phpbb_root_path, $phpEx;
$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');

6
tests/unit/functions/functions_test.php
View File

@@ -20,11 +20,13 @@ class phpbb_unit_functions_functions_test extends \board3\portal\tests\testframe
public function setUp()
{
global $cache, $user;
global $cache, $user, $phpbb_root_path;
parent::setUp();
$user = $this->getMock('\phpbb\user', array('optionget'), array('\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 = $this->getMock('\phpbb\user', array('optionget'), array($this->language, '\phpbb\datetime'));
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'sql_exists'));
$cache->expects($this->any())
->method('obtain_word_list')

6
tests/unit/functions/get_user_groups_test.php
View File

@@ -18,11 +18,13 @@ class phpbb_unit_functions_get_user_groups_test extends \board3\portal\tests\tes
public function setUp()
{
global $cache, $user;
global $cache, $user, $phpbb_root_path;
parent::setUp();
$user = $this->getMock('\phpbb\user', array('optionget'), array('\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 = $this->getMock('\phpbb\user', array('optionget'), array($this->language, '\phpbb\datetime'));
$cache = $this->getMock('\phpbb\cache\cache', array('get', 'put', 'sql_exists'));
$cache->expects($this->any())
->method('get')

6
tests/unit/functions/version_check_test.php
View File

@@ -42,10 +42,14 @@ class phpbb_functions_version_check_test extends \board3\portal\tests\testframew
protected function get_version_helper($version)
{
global $phpbb_root_path;
$this->config->set('board3_portal_version', $version);
$this->template = new \board3\portal\tests\mock\template($this);
$version_helper = new \phpbb\version_helper($this->cache, $this->config, new \phpbb\file_downloader(), 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);
$version_helper = new \phpbb\version_helper($this->cache, $this->config, new \phpbb\file_downloader(), new \phpbb\user($this->language, '\phpbb\datetime'));
$this->version_check = new \board3\portal\includes\version_check($this->version_data, $this->config, $version_helper, $this->template, $this->user);
}