mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

[ticket/16741] Test fixes

Browse Source 
PHPBB3-16741
This commit is contained in:
Tristan Darricau
2021-11-09 02:49:56 +01:00
parent 6ce708539b
commit b266ebbcef
17 changed files with 154 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/test_framework/phpbb_database_test_case.php
View File

@@ -31,6 +31,11 @@ abstract class phpbb_database_test_case extends TestCase
protected static $phpunit_version;
/**
* @var \Doctrine\DBAL\Connection[]
*/
private $db_connections_doctrine;
public function __construct($name = NULL, array $data = [], $dataName = '')
{
parent::__construct($name, $data, $dataName);
@@ -58,6 +63,7 @@ abstract class phpbb_database_test_case extends TestCase
}
$this->db_connections = [];
$this->db_connections_doctrine = [];
}
/**
@@ -92,8 +98,9 @@ abstract class phpbb_database_test_case extends TestCase
global $table_prefix;
$db = new \phpbb\db\driver\sqlite3();
$doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file());
$factory = new \phpbb\db\tools\factory();
$db_tools = $factory->get($db, true);
$db_tools = $factory->get($doctrine, true);
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix, self::get_core_tables());
file_put_contents(self::$schema_file, json_encode($schema_generator->get_schema()));
@@ -126,6 +133,14 @@ abstract class phpbb_database_test_case extends TestCase
$db->sql_close();
}
}
if (!empty($this->db_connections_doctrine))
{
foreach ($this->db_connections_doctrine as $db)
{
$db->close();
}
}
}
protected function setUp(): void
@@ -277,7 +292,7 @@ abstract class phpbb_database_test_case extends TestCase
if (!self::$already_connected)
{
$manager->load_schema($this->new_dbal());
$manager->load_schema($this->new_dbal(), $this->new_doctrine_dbal());
self::$already_connected = true;
}
@@ -296,6 +311,16 @@ abstract class phpbb_database_test_case extends TestCase
return $db;
}
public function new_doctrine_dbal(): \Doctrine\DBAL\Connection
{
$config = $this->get_database_config();
$db = \phpbb\db\doctrine\connection_factory::get_connection_from_params($config['dbms'], $config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
$this->db_connections_doctrine[] = $db;
return $db;
}
public function assertSqlResultEquals($expected, $sql, $message = '')
{
$db = $this->new_dbal();