[ticket/14948] Use new namespaced classes when generating mssql schema

PHPBB3-14948
This commit is contained in:
Marc Alexander 2018-12-30 21:05:19 +01:00
parent 0e83cbe658
commit 5b7fec5c47
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -148,7 +148,7 @@ abstract class phpbb_database_test_case extends TestCase
* Create xml data set for insertion into database * Create xml data set for insertion into database
* *
* @param string $path Path to fixture XML * @param string $path Path to fixture XML
* @return PHPUnit_Extensions_Database_DataSet_DefaultDataSet|PHPUnit_Extensions_Database_DataSet_XmlDataSet * @return PHPUnit\DbUnit\DataSet\DefaultDataSet|PHPUnit\DbUnit\DataSet\XmlDataSet
*/ */
public function createXMLDataSet($path) public function createXMLDataSet($path)
{ {
@ -157,11 +157,11 @@ abstract class phpbb_database_test_case extends TestCase
// Extend XML data set on MSSQL // Extend XML data set on MSSQL
if (strpos($this->get_database_config()['dbms'], 'mssql') !== false) if (strpos($this->get_database_config()['dbms'], 'mssql') !== false)
{ {
$newXmlData = new PHPUnit_Extensions_Database_DataSet_DefaultDataSet(); $newXmlData = new PHPUnit\DbUnit\DataSet\DefaultDataSet([]);
$db = $this->new_dbal(); $db = $this->new_dbal();
foreach ($this->fixture_xml_data as $key => $value) foreach ($this->fixture_xml_data as $key => $value)
{ {
/** @var \PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData $tableMetaData */ /** @var PHPUnit\DbUnit\DataSet\DefaultTableMetaData $tableMetaData */
$tableMetaData = $value->getTableMetaData(); $tableMetaData = $value->getTableMetaData();
$columns = $tableMetaData->getColumns(); $columns = $tableMetaData->getColumns();
$primaryKeys = $tableMetaData->getPrimaryKeys(); $primaryKeys = $tableMetaData->getPrimaryKeys();
@ -203,8 +203,8 @@ abstract class phpbb_database_test_case extends TestCase
$columns[] = 'mssqlindex'; $columns[] = 'mssqlindex';
} }
$newMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData($key, $columns, $primaryKeys); $newMetaData = new PHPUnit\DbUnit\DataSet\DefaultTableMetaData($key, $columns, $primaryKeys);
$newTable = new PHPUnit_Extensions_Database_DataSet_DefaultTable($newMetaData); $newTable = new PHPUnit\DbUnit\DataSet\DefaultTable($newMetaData);
for ($i = 0; $i < $value->getRowCount(); $i++) for ($i = 0; $i < $value->getRowCount(); $i++)
{ {
$dataRow = $value->getRow($i); $dataRow = $value->getRow($i);