jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404522 )
Change subject: Don't use deprecated DatabaseMysql
......................................................................
Don't use deprecated DatabaseMysql
Bug: T120333
Change-Id: I3150bcd9aeefa154fc064bcc8078419521e6340c
---
M tests/phpunit/gateway/UserNotificationGatewayTest.php
M tests/phpunit/mapper/EventMapperTest.php
M tests/phpunit/mapper/NotificationMapperTest.php
M tests/phpunit/mapper/TargetPageMapperTest.php
4 files changed, 12 insertions(+), 8 deletions(-)
Approvals:
Seb35: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/tests/phpunit/gateway/UserNotificationGatewayTest.php
b/tests/phpunit/gateway/UserNotificationGatewayTest.php
index 82adfe7..035cd38 100644
--- a/tests/phpunit/gateway/UserNotificationGatewayTest.php
+++ b/tests/phpunit/gateway/UserNotificationGatewayTest.php
@@ -93,7 +93,8 @@
}
/**
- * 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 @@
'selectRow' => '',
'selectRowCount' => '',
];
- $db = $this->getMockBuilder( 'DatabaseMysql' )
+ $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )
diff --git a/tests/phpunit/mapper/EventMapperTest.php
b/tests/phpunit/mapper/EventMapperTest.php
index 1483ece..334280d 100644
--- a/tests/phpunit/mapper/EventMapperTest.php
+++ b/tests/phpunit/mapper/EventMapperTest.php
@@ -99,7 +99,8 @@
}
/**
- * 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 @@
'select' => '',
'selectRow' => ''
];
- $db = $this->getMockBuilder( 'DatabaseMysql' )
+ $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )
diff --git a/tests/phpunit/mapper/NotificationMapperTest.php
b/tests/phpunit/mapper/NotificationMapperTest.php
index 29c9355..024d817 100644
--- a/tests/phpunit/mapper/NotificationMapperTest.php
+++ b/tests/phpunit/mapper/NotificationMapperTest.php
@@ -216,7 +216,8 @@
}
/**
- * 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 @@
'delete' => ''
];
- $db = $this->getMockBuilder( 'DatabaseMysql' )
+ $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )
diff --git a/tests/phpunit/mapper/TargetPageMapperTest.php
b/tests/phpunit/mapper/TargetPageMapperTest.php
index 356d738..f178c61 100644
--- a/tests/phpunit/mapper/TargetPageMapperTest.php
+++ b/tests/phpunit/mapper/TargetPageMapperTest.php
@@ -69,7 +69,8 @@
}
/**
- * 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 @@
'select' => '',
'delete' => ''
];
- $db = $this->getMockBuilder( 'DatabaseMysql' )
+ $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )
--
To view, visit https://gerrit.wikimedia.org/r/404522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3150bcd9aeefa154fc064bcc8078419521e6340c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: Seb35 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
