mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2020-05-17 21:38:09 +02:00
parent a37f82bb9d 4eda5218d5
commit ce97122c6d
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/profilefields/manager_test.php
View File

@@ -39,22 +39,28 @@ class manager_test extends phpbb_database_test_case
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/manager.xml');
}
public function setUp()
public function setUp(): void
{
parent::setUp();
global $phpbb_root_path, $phpEx, $table_prefix;
$this->db = $this->new_dbal();
$this->db_tools = $this->getMock('\phpbb\db\tools\tools', [], [$this->db]);
$this->db_tools = $this->getMockBuilder('\phpbb\db\tools\tools')
->setConstructorArgs([$this->db])
->getMock();
$this->config_text = new \phpbb\config\db_text($this->db, $table_prefix . 'config_text');
$this->table_prefix = $table_prefix;
$container = new phpbb_mock_container_builder();
$dispatcher = new phpbb_mock_event_dispatcher();
$request = $this->getMock('\phpbb\request\request');
$template = $this->getMock('\phpbb\template\template');
$request = $this->getMockBuilder('\phpbb\request\request')
->disableOriginalConstructor()
->getMock();
$template = $this->getMockBuilder('\phpbb\template\template')
->disableOriginalConstructor()
->getMock();
$auth = new \phpbb\auth\auth();
$language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
@@ -161,7 +167,7 @@ class manager_test extends phpbb_database_test_case
WHERE ' . $this->db->sql_in_set('field_id', $field_ids);
$this->assertSqlResultEquals([], $sql, 'All profile fields lang should be removed');
$sql = 'SELECT field_id, field_order
$sql = 'SELECT field_id, field_order
FROM ' . $this->table_prefix . 'profile_fields
ORDER BY field_id ASC';
$this->assertSqlResultEquals([