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

10
tests/unit/controller/helper_test.php
View File

@@ -9,6 +9,8 @@
namespace board3\portal\controller;
require_once(__DIR__ . '/../../../includes/functions.php');
class helper_test extends \board3\portal\tests\testframework\test_case
{
protected $controller_helper;
@@ -19,7 +21,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
public function setUp()
{
global $cache, $phpbb_extension_manager;
global $cache, $phpbb_extension_manager, $phpbb_root_path;
parent::setUp();
@@ -33,10 +35,13 @@ class helper_test extends \board3\portal\tests\testframework\test_case
'board3_enable' => true,
));
$this->template = new \board3\portal\tests\mock\template($this);
$this->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);
$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
$this->user->data['group_id'] = 2;
$this->phpbb_root_path = dirname(__FILE__) . '/../../../../../../';
$phpbb_extension_manager = new \phpbb_mock_extension_manager($this->phpbb_root_path, array('board3/portal'));
$this->language_file_loader->set_extension_manager($phpbb_extension_manager);
$this->php_ext = 'php';
$this->portal_columns = new \board3\portal\portal\columns();
$this->modules = array(
@@ -61,6 +66,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
$this->auth,
$this->portal_columns,
$this->config,
$this->language,
$this->template,
$this->user,
$this->path_helper,

3
tests/unit/controller/main_test.php
View File

@@ -59,11 +59,14 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
->method('acl_get')
->with($this->anything())
->will($this->returnValue(true));
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$controller_helper = new \board3\portal\controller\helper(
$auth,
$portal_columns,
$this->config,
$this->language,
$this->template,
$user,
$path_helper,