[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Don't use deprecated DatabaseMysql

2018-01-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404541 )

Change subject: Don't use deprecated DatabaseMysql
..


Don't use deprecated DatabaseMysql

Bug: T120333
Change-Id: Ib24561d815d28ea5887a7bd5c598340e961b2f5b
---
M tests/phpunit/Data/Storage/RevisionStorageTest.php
M tests/phpunit/Repository/TreeRepositoryTest.php
M tests/phpunit/WatchedTopicItemsTest.php
3 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/Data/Storage/RevisionStorageTest.php 
b/tests/phpunit/Data/Storage/RevisionStorageTest.php
index 59c95e8..7687f7f 100644
--- a/tests/phpunit/Data/Storage/RevisionStorageTest.php
+++ b/tests/phpunit/Data/Storage/RevisionStorageTest.php
@@ -156,7 +156,7 @@
 
// A rev ID will be added to $old and $new automatically.
protected function helperToTestUpdating( $old, $new, 
$expectedUpdateValues, $isContentUpdatingAllowed ) {
-   $dbw = $this->getMockBuilder( 'DatabaseMysql' )
+   $dbw = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$factory = $this->getMockBuilder( 'Flow\DbFactory' )
@@ -389,7 +389,7 @@
}
 
protected function mockDbFactory() {
-   $dbw = $this->getMockBuilder( 'DatabaseMysql' )
+   $dbw = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
 
diff --git a/tests/phpunit/Repository/TreeRepositoryTest.php 
b/tests/phpunit/Repository/TreeRepositoryTest.php
index a4792bf..17771ea 100644
--- a/tests/phpunit/Repository/TreeRepositoryTest.php
+++ b/tests/phpunit/Repository/TreeRepositoryTest.php
@@ -5,7 +5,7 @@
 use Flow\Model\UUID;
 use Flow\Repository\TreeRepository;
 use Flow\Tests\FlowTestCase;
-use Wikimedia\Rdbms\DatabaseMysql;
+use Wikimedia\Rdbms\DatabaseMysqli;
 
 /**
  * @group Flow
@@ -46,7 +46,7 @@
}
 
protected function mockDb( $dbResult ) {
-   $db = $this->getMockBuilder( DatabaseMysql::class )
+   $db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )
diff --git a/tests/phpunit/WatchedTopicItemsTest.php 
b/tests/phpunit/WatchedTopicItemsTest.php
index e55c496..1453fc2 100644
--- a/tests/phpunit/WatchedTopicItemsTest.php
+++ b/tests/phpunit/WatchedTopicItemsTest.php
@@ -5,7 +5,7 @@
 use Flow\Model\UUID;
 use Flow\WatchedTopicItems;
 use User;
-use Wikimedia\Rdbms\DatabaseMysql;
+use Wikimedia\Rdbms\DatabaseMysqli;
 
 /**
  * @group Flow
@@ -72,7 +72,7 @@
}
 
protected function mockDb( $dbResult ) {
-   $db = $this->getMockBuilder( DatabaseMysql::class )
+   $db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )

-- 
To view, visit https://gerrit.wikimedia.org/r/404541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib24561d815d28ea5887a7bd5c598340e961b2f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Don't use deprecated DatabaseMysql

2018-01-16 Thread Seb35 (Code Review) 
Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404541 )

Change subject: Don't use deprecated DatabaseMysql
..

Don't use deprecated DatabaseMysql

Bug: T120333
Change-Id: Ib24561d815d28ea5887a7bd5c598340e961b2f5b
---
M tests/phpunit/Data/Storage/RevisionStorageTest.php
M tests/phpunit/Repository/TreeRepositoryTest.php
M tests/phpunit/WatchedTopicItemsTest.php
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/41/404541/1

diff --git a/tests/phpunit/Data/Storage/RevisionStorageTest.php 
b/tests/phpunit/Data/Storage/RevisionStorageTest.php
index 59c95e8..7687f7f 100644
--- a/tests/phpunit/Data/Storage/RevisionStorageTest.php
+++ b/tests/phpunit/Data/Storage/RevisionStorageTest.php
@@ -156,7 +156,7 @@
 
// A rev ID will be added to $old and $new automatically.
protected function helperToTestUpdating( $old, $new, 
$expectedUpdateValues, $isContentUpdatingAllowed ) {
-   $dbw = $this->getMockBuilder( 'DatabaseMysql' )
+   $dbw = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$factory = $this->getMockBuilder( 'Flow\DbFactory' )
@@ -389,7 +389,7 @@
}
 
protected function mockDbFactory() {
-   $dbw = $this->getMockBuilder( 'DatabaseMysql' )
+   $dbw = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
 
diff --git a/tests/phpunit/Repository/TreeRepositoryTest.php 
b/tests/phpunit/Repository/TreeRepositoryTest.php
index a4792bf..17771ea 100644
--- a/tests/phpunit/Repository/TreeRepositoryTest.php
+++ b/tests/phpunit/Repository/TreeRepositoryTest.php
@@ -5,7 +5,7 @@
 use Flow\Model\UUID;
 use Flow\Repository\TreeRepository;
 use Flow\Tests\FlowTestCase;
-use Wikimedia\Rdbms\DatabaseMysql;
+use Wikimedia\Rdbms\DatabaseMysqli;
 
 /**
  * @group Flow
@@ -46,7 +46,7 @@
}
 
protected function mockDb( $dbResult ) {
-   $db = $this->getMockBuilder( DatabaseMysql::class )
+   $db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )
diff --git a/tests/phpunit/WatchedTopicItemsTest.php 
b/tests/phpunit/WatchedTopicItemsTest.php
index e55c496..1453fc2 100644
--- a/tests/phpunit/WatchedTopicItemsTest.php
+++ b/tests/phpunit/WatchedTopicItemsTest.php
@@ -5,7 +5,7 @@
 use Flow\Model\UUID;
 use Flow\WatchedTopicItems;
 use User;
-use Wikimedia\Rdbms\DatabaseMysql;
+use Wikimedia\Rdbms\DatabaseMysqli;
 
 /**
  * @group Flow
@@ -72,7 +72,7 @@
}
 
protected function mockDb( $dbResult ) {
-   $db = $this->getMockBuilder( DatabaseMysql::class )
+   $db = $this->getMockBuilder( DatabaseMysqli::class )
->disableOriginalConstructor()
->getMock();
$db->expects( $this->any() )

-- 
To view, visit https://gerrit.wikimedia.org/r/404541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib24561d815d28ea5887a7bd5c598340e961b2f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Seb35 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits