Merge "Don't use deprecated DatabaseMysql"

This commit is contained in:
jenkins-bot 2018-01-17 18:28:21 +00:00 committed by Gerrit Code Review
commit ef7dfb357d
4 changed files with 12 additions and 8 deletions

View file

@ -93,7 +93,8 @@ class EchoUserNotificationGatewayTest extends MediaWikiTestCase {
}
/**
* Mock object of DatabaseMysql ( \Wikimedia\Rdbms\IDatabase )
* Returns a mock database object
* @return \Wikimedia\Rdbms\IDatabase
*/
protected function mockDb( array $dbResult = [] ) {
$dbResult += [
@ -102,7 +103,7 @@ class EchoUserNotificationGatewayTest extends MediaWikiTestCase {
'selectRow' => '',
'selectRowCount' => '',
];
$db = $this->getMockBuilder( 'DatabaseMysql' )
$db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )

View file

@ -99,7 +99,8 @@ class EchoEventMapperTest extends MediaWikiTestCase {
}
/**
* Mock object of DatabaseMysql ( \Wikimedia\Rdbms\IDatabase )
* Returns a mock database object
* @return \Wikimedia\Rdbms\IDatabase
*/
protected function mockDb( array $dbResult ) {
$dbResult += [
@ -108,7 +109,7 @@ class EchoEventMapperTest extends MediaWikiTestCase {
'select' => '',
'selectRow' => ''
];
$db = $this->getMockBuilder( 'DatabaseMysql' )
$db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )

View file

@ -216,7 +216,8 @@ class EchoNotificationMapperTest extends MediaWikiTestCase {
}
/**
* Mock object of DatabaseMysql ( \Wikimedia\Rdbms\IDatabase )
* Returns a mock database object
* @return \Wikimedia\Rdbms\IDatabase
*/
protected function mockDb( array $dbResult ) {
$dbResult += [
@ -226,7 +227,7 @@ class EchoNotificationMapperTest extends MediaWikiTestCase {
'delete' => ''
];
$db = $this->getMockBuilder( 'DatabaseMysql' )
$db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )

View file

@ -69,7 +69,8 @@ class EchoTargetPageMapperTest extends MediaWikiTestCase {
}
/**
* Mock object of DatabaseMysql ( \Wikimedia\Rdbms\IDatabase )
* Returns a mock database object
* @return \Wikimedia\Rdbms\IDatabase
*/
protected function mockDb( array $dbResult ) {
$dbResult += [
@ -78,7 +79,7 @@ class EchoTargetPageMapperTest extends MediaWikiTestCase {
'select' => '',
'delete' => ''
];
$db = $this->getMockBuilder( 'DatabaseMysql' )
$db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )