From eee735a1767f5be06e5247c0eafc80ee0f1b7fdd Mon Sep 17 00:00:00 2001 From: Thiemo Kreuz Date: Tue, 12 Feb 2019 13:01:26 +0100 Subject: [PATCH] rdbms: Use more narrow type hints in LBFactoryTest Originally I wanted to fix the broken type hint for the `Database` class. But I ended limiting the scope as much as possible and only type hint at the interfaces that contain the methods the code actually needs. Change-Id: I450a55e80612f6e676f7c803dc904b4b653426d8 --- tests/phpunit/includes/db/LBFactoryTest.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php index 58f96546cd..3d1bf59315 100644 --- a/tests/phpunit/includes/db/LBFactoryTest.php +++ b/tests/phpunit/includes/db/LBFactoryTest.php @@ -23,6 +23,9 @@ * @copyright © 2013 Wikimedia Foundation Inc. */ +use Wikimedia\Rdbms\Database; +use Wikimedia\Rdbms\IDatabase; +use Wikimedia\Rdbms\IMaintainableDatabase; use Wikimedia\Rdbms\LBFactory; use Wikimedia\Rdbms\LBFactorySimple; use Wikimedia\Rdbms\LBFactoryMulti; @@ -456,7 +459,7 @@ class LBFactoryTest extends MediaWikiTestCase { ); unset( $db ); - /** @var Database $db */ + /** @var IMaintainableDatabase $db */ $db = $lb->getConnection( DB_MASTER, [], '' ); $this->assertEquals( @@ -531,7 +534,7 @@ class LBFactoryTest extends MediaWikiTestCase { ] ); $lb = $factory->getMainLB(); - /** @var Database $db */ + /** @var IMaintainableDatabase $db */ $db = $lb->getConnection( DB_MASTER, [], '' ); $this->assertEquals( '', $db->getDomainID(), "Null domain used" ); @@ -592,7 +595,7 @@ class LBFactoryTest extends MediaWikiTestCase { ] ); $lb = $factory->getMainLB(); - /** @var Database $db */ + /** @var IDatabase $db */ $db = $lb->getConnection( DB_MASTER, [], '' ); if ( $db->getType() === 'sqlite' ) { -- 2.20.1