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

[ticket/715] Resolve issues with portal and tests on PHP 8.0

Browse Source 
B3P-715
This commit is contained in:
Marc Alexander
2021-09-04 11:09:52 +02:00
parent 9eb415b79c
commit ed54e3ef0c
30 changed files with 233 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
));
$this->template = new \board3\portal\tests\mock\template($this);
$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->language = new \board3\portal\tests\mock\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__) . '/../../../../../../';
@@ -48,9 +48,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
$this->language_file_loader->set_extension_manager($phpbb_extension_manager);
$this->php_ext = 'php';
$this->portal_columns = new \board3\portal\portal\columns();
$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 \board3\portal\tests\mock\user($this->language, '\phpbb\datetime');
$user = $this->user;
$this->modules = array(
'\board3\portal\modules\link_us' => new \board3\portal\modules\link_us($this->config, new \board3\portal\tests\mock\template($this), $user),
);
@@ -149,11 +147,9 @@ class helper_test extends \board3\portal\tests\testframework\test_case
{
global $phpbb_root_path;
$this->assertNull($this->controller_helper->load_module_language($this->modules['\board3\portal\modules\link_us']));
$this->controller_helper->load_module_language($this->modules['\board3\portal\modules\link_us']);
$this->assertFalse(isset($this->user->lang['PORTAL_LEADERS_EXT']));
$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 \board3\portal\tests\mock\user($this->language, '\phpbb\datetime');
$user = new \phpbb\user($this->language, '\phpbb\datetime');
$module = $this->getMockBuilder('\board3\portal\modules\link_us')
->setMethods(['get_language'])
->setConstructorArgs([$this->config, new \board3\portal\tests\mock\template($this), $user])
@@ -164,8 +160,8 @@ class helper_test extends \board3\portal\tests\testframework\test_case
'vendor' => 'board3/portal',
'file' => 'modules/portal_leaders_module',
));
$this->assertNull($this->controller_helper->load_module_language($module));
$this->assertNotEmpty($this->user->lang('ACP_PORTAL_LEADERS'));
$this->controller_helper->load_module_language($module);
$this->assertNotEmpty($this->language->lang('ACP_PORTAL_LEADERS'));
}
public function data_assign_module_vars()
@@ -176,16 +172,21 @@ class helper_test extends \board3\portal\tests\testframework\test_case
'module_id' => 1,
'module_image_width' => 16,
'module_image_height' => 16,
'module_image_src' => '',
'module_name' => 'foo',
), array(
'template' => 'foobar.html',
'title' => 'foo',
'code' => 'bar',
'image_src' => '',
)),
array(array(
'module_column' => 1,
'module_id' => 1,
'module_image_width' => 16,
'module_image_height' => 16,
'module_image_src' => '',
'module_name' => 'foo',
), 'foobar.html'),
);
}

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

@@ -44,8 +44,12 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
$cache = new \phpbb\cache\driver\dummy();
$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 \board3\portal\tests\mock\user($this->language, '\phpbb\datetime');
$this->language = new \board3\portal\tests\mock\language($this->language_file_loader);
$this->language->set([
'S_PORTAL_ALL' => 'S_PORTAL_ALL',
]);
$user = new \phpbb\user($this->language, '\phpbb\datetime');
$user->style['style_path'] = 'prosilver';
$config_table = $table_prefix . 'portal_config';
$modules_table = $table_prefix . 'portal_modules';
@@ -103,15 +107,35 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
$this->template->assert_same(true, 'S_PORTAL_ALL');
$this->template->delete_var('S_PORTAL_ALL');
$this->assertNull($this->controller_main->handle(array('left' => 1)));
$this->template->assert_same(null, 'S_PORTAL_ALL');
$this->template->assert_not_exist('S_PORTAL_ALL');
}
public function test_is_enabled_side_column()
{
$this->assertFalse($this->controller_main->get_module_template(array(), new \board3\portal\modules\clock($this->config, $this->template)));
$this->assertFalse($this->controller_main->get_module_template(
[
'module_column' => 1,
'module_id' => 1,
'module_image_width' => 16,
'module_image_height' => 16,
'module_image_src' => '',
'module_name' => 'foo',
],
new \board3\portal\modules\clock($this->config, $this->template)
));
$this->assertNull($this->controller_main->handle(array('left' => 1)));
$this->template->assert_same(true, 'S_PORTAL_ALL');
$this->config['board3_left_column'] = false;
$this->assertSame('clock_side.html', $this->controller_main->get_module_template(array('module_column' => 1), new \board3\portal\modules\clock($this->config, $this->template)));
$this->assertSame('clock_side.html', $this->controller_main->get_module_template(
[
'module_column' => 1,
'module_id' => 1,
'module_image_width' => 16,
'module_image_height' => 16,
'module_image_src' => '',
'module_name' => 'foo',
],
new \board3\portal\modules\clock($this->config, $this->template)
));
}
}