X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fphpunit%2Fincludes%2Fdb%2FLBFactoryTest.php;h=106a13bc773a6e9bb2c139804eea74658602a2c2;hb=a3cd158d8433e41cbeb299f0e268dfef363b2afd;hp=02c25e7b0d91da17a6862ca8f2e47f51ab1ed4d9;hpb=751bac3786c561225f121b607189ccd865416e1b;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php index 02c25e7b0d..106a13bc77 100644 --- a/tests/phpunit/includes/db/LBFactoryTest.php +++ b/tests/phpunit/includes/db/LBFactoryTest.php @@ -23,7 +23,6 @@ * @copyright © 2013 Wikimedia Foundation Inc. */ -use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\IMaintainableDatabase; use Wikimedia\Rdbms\LBFactory; @@ -31,7 +30,6 @@ use Wikimedia\Rdbms\LBFactorySimple; use Wikimedia\Rdbms\LBFactoryMulti; use Wikimedia\Rdbms\LoadBalancer; use Wikimedia\Rdbms\ChronologyProtector; -use Wikimedia\Rdbms\DatabaseMysqli; use Wikimedia\Rdbms\MySQLMasterPos; use Wikimedia\Rdbms\DatabaseDomain; @@ -48,7 +46,7 @@ class LBFactoryTest extends MediaWikiTestCase { * @dataProvider getLBFactoryClassProvider */ public function testGetLBFactoryClass( $expected, $deprecated ) { - $mockDB = $this->getMockBuilder( DatabaseMysqli::class ) + $mockDB = $this->getMockBuilder( IDatabase::class ) ->disableOriginalConstructor() ->getMock(); @@ -292,7 +290,7 @@ class LBFactoryTest extends MediaWikiTestCase { $m2Pos = new MySQLMasterPos( 'db1064-bin.002400/794074907', $now ); // Master DB 1 - $mockDB1 = $this->getMockBuilder( DatabaseMysqli::class ) + $mockDB1 = $this->getMockBuilder( IDatabase::class ) ->disableOriginalConstructor() ->getMock(); $mockDB1->method( 'writesOrCallbacksPending' )->willReturn( true ); @@ -317,7 +315,7 @@ class LBFactoryTest extends MediaWikiTestCase { $lb1->method( 'getMasterPos' )->willReturn( $m1Pos ); $lb1->method( 'getServerName' )->with( 0 )->willReturn( 'master1' ); // Master DB 2 - $mockDB2 = $this->getMockBuilder( DatabaseMysqli::class ) + $mockDB2 = $this->getMockBuilder( IDatabase::class ) ->disableOriginalConstructor() ->getMock(); $mockDB2->method( 'writesOrCallbacksPending' )->willReturn( true ); @@ -348,7 +346,8 @@ class LBFactoryTest extends MediaWikiTestCase { [ 'ip' => '127.0.0.1', 'agent' => "Totally-Not-FireFox" - ] + ], + null ); $mockDB1->expects( $this->exactly( 1 ) )->method( 'writesOrCallbacksPending' ); @@ -730,7 +729,7 @@ class LBFactoryTest extends MediaWikiTestCase { $factory->destroy(); } - private function quoteTable( Database $db, $table ) { + private function quoteTable( IDatabase $db, $table ) { if ( $db->getType() === 'sqlite' ) { return $table; } else {