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

15
tests/unit/portal/fetch_posts_test.php
View File

@@ -22,14 +22,17 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
public function setUp(): void
{
global $auth, $cache, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $template, $user;
global $auth, $cache, $config, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $template, $user;
parent::setUp();
$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->data = [
'user_id' => 2,
'user_options' => 0,
];
$user->timezone = new \DateTimeZone('UTC');
$user->add_lang('common');
$user->add_lang('../../ext/board3/portal/language/en/portal');
@@ -54,10 +57,16 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
->with($this->anything())
->will($this->returnArgument(2));
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_content.php');
$this->config = new \phpbb\config\config(array('allow_attachments' => 1));
$this->config = new \phpbb\config\config([
'allow_attachments' => 1,
'allow_smilies' => 1,
]);
$config = $this->config;
$auth = new \phpbb\auth\auth();
$userdata = array(
'user_id' => 2,
'user_permissions' => '',
'user_type' => USER_NORMAL,
);
$auth->acl($userdata);
// Pretend to allow downloads

25
tests/unit/portal/modules_manager_confirm_box_test.php
View File

@@ -44,8 +44,9 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
parent::setUp();
$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->add_lang_ext('board3/portal', 'portal_acp');
$user = new \phpbb\user($this->language, '\phpbb\datetime');
$request =new \phpbb_mock_request();
$this->request = $request;
$this->user = $user;
@@ -60,7 +61,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
$this->portal_helper = new \board3\portal\includes\helper(array(
new \board3\portal\modules\clock($config, null),
new \board3\portal\modules\birthday_list($config, null, $this->db, $user),
new \board3\portal\modules\welcome($config, new \phpbb_mock_request, $this->db, $user, $this->phpbb_root_path, $this->phpEx),
new \board3\portal\modules\welcome($config, new \phpbb_mock_request, $this->db, $user, $phpbb_root_path, $phpEx),
new \board3\portal\modules\donation($config, $this->request, null, $user, $modules_helper),
));
@@ -122,7 +123,15 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
// Build confirm box first
$this->modules_manager->set_u_action('adm/index.php?i=15&mode=foobar')->set_acp_class('foo\bar');
self::$confirm = false;
$this->assertNull($this->modules_manager->reset_module(15, 'barfoo', 6, array()));
$module_data = [
'module_column' => 1,
'module_id' => 6,
'module_image_width' => 16,
'module_image_height' => 16,
'module_image_src' => '',
'module_name' => 'foo',
];
$this->assertNull($this->modules_manager->reset_module(15, 'barfoo', 6, $module_data));
$this->assertEquals('<input type="hidden" name="i" value="15" />
<input type="hidden" name="mode" value="barfoo" />
<input type="hidden" name="module_reset" value="1" />
@@ -132,13 +141,13 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
// Actually reset module
phpbb_acp_move_module_test::$override_trigger_error = true;
self::$confirm = true;
$this->assertNull($this->modules_manager->reset_module(15, 'barfoo', 6, array()));
$this->assertNull($this->modules_manager->reset_module(15, 'barfoo', 6, $module_data));
$this->assertEquals(array(
'seconds' => 3,
'link' => 'adm/index.php?i=-foo-bar&amp;mode=config&amp;module_id=6',
), self::$meta_refresh);
$this->assertEquals(phpbb_acp_move_module_test::$error_type, E_USER_NOTICE);
$this->assertEquals(phpbb_acp_move_module_test::$error, 'adm/index.php?i=15&amp;mode=foobar&amp;module_id=6');
$this->assertEquals(E_USER_NOTICE, phpbb_acp_move_module_test::$error_type);
$this->assertEquals($this->language->lang('MODULE_RESET_SUCCESS') . 'adm/index.php?i=15&amp;mode=foobar&amp;module_id=6', phpbb_acp_move_module_test::$error);
phpbb_acp_move_module_test::$override_trigger_error = false;
}
@@ -182,7 +191,7 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
modules_manager_confirm_box_test::$confirm = true;
$this->assertNull($this->modules_manager->module_delete(6, 'foobar', 'module_delete', 6));
$this->assertEquals(E_USER_NOTICE, phpbb_acp_move_module_test::$error_type);
$this->assertEquals('adm/index.php?i=15&amp;mode=foobar', phpbb_acp_move_module_test::$error);
$this->assertEquals($this->language->lang('SUCCESS_DELETE'). 'adm/index.php?i=15&amp;mode=foobar', phpbb_acp_move_module_test::$error);
phpbb_acp_move_module_test::$override_trigger_error = false;
}
}

15
tests/unit/portal/modules_manager_test.php
View File

@@ -37,10 +37,9 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
parent::setUp();
$language = $this->getMockBuilder('\phpbb\language\language')
->disableOriginalConstructor()
->getMock();
$user = new \board3\portal\tests\mock\user($language, '\phpbb\datetime');
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \board3\portal\tests\mock\language($this->language_file_loader);
$user = new \phpbb\user($this->language, '\phpbb\datetime');
$request =new \phpbb_mock_request();
$config = new \phpbb\config\config(array());
@@ -48,12 +47,12 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
$controller_helper->add_route('board3_portal_controller', 'portal');
$modules_helper = new \board3\portal\includes\modules_helper($auth, $config, $controller_helper, $this->request);
$modules_helper = new \board3\portal\includes\modules_helper($auth, $config, $controller_helper, $request);
$portal_helper = new \board3\portal\includes\helper(array(
new \board3\portal\modules\clock($config, null),
new \board3\portal\modules\birthday_list($config, null, $this->db, $user),
new \board3\portal\modules\welcome($config, new \phpbb_mock_request, $this->db, $user, $this->phpbb_root_path, $this->phpEx),
new \board3\portal\modules\welcome($config, new \phpbb_mock_request, $this->db, $user, $phpbb_root_path, $phpEx),
new \board3\portal\modules\donation($config, $request, null, $user, $modules_helper),
));
@@ -84,7 +83,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
->with($this->anything())
->will($this->returnArgument(2));
$db = $this->db;
$user->set(array(
$this->language->set(array(
'UNABLE_TO_MOVE' => 'UNABLE_TO_MOVE',
'UNABLE_TO_MOVE_ROW' => 'UNABLE_TO_MOVE_ROW',
));
@@ -112,7 +111,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
new \board3\portal\tests\mock\template($this),
$user,
$this->path_helper,
$this->portal_helper,
$portal_helper,
$phpbb_root_path,
$phpEx
);