wikimedia/mediawiki-extensions-CategoryTree
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree synced 2024-11-27 09:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use IConnectionProvider instead of ILoadBalancer

Browse source 
Change-Id: Id1071e0a61030c2ddd01fecebf6bf8a99c5948e0
This commit is contained in:
Fomafix 2024-09-04 13:27:15 +00:00
parent be2605a0d5
commit 58afeaf93c
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/CategoryCache.php
View file

@ -22,7 +22,7 @@ namespace MediaWiki\Extension\CategoryTree;
use MediaWiki\Category\Category; use MediaWiki\Category\Category;
use MediaWiki\Linker\LinkTarget; use MediaWiki\Linker\LinkTarget;
use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\IConnectionProvider;
use Wikimedia\Rdbms\IResultWrapper; use Wikimedia\Rdbms\IResultWrapper;
/** /**
@ -32,12 +32,12 @@ class CategoryCache {
/** @var (?Category)[] Keys are category database names, values are either a Category object or null */ /** @var (?Category)[] Keys are category database names, values are either a Category object or null */
private array $cache = []; private array $cache = [];
private ILoadBalancer $loadBalancer; private IConnectionProvider $dbProvider;
public function __construct( public function __construct(
ILoadBalancer $loadBalancer IConnectionProvider $dbProvider
) { ) {
$this->loadBalancer = $loadBalancer; $this->dbProvider = $dbProvider;
} }
/** /**
@ -78,7 +78,7 @@ class CategoryCache {
return; return;
} }
$rows = $this->loadBalancer->getConnection( ILoadBalancer::DB_REPLICA ) $rows = $this->dbProvider->getReplicaDatabase()
->newSelectQueryBuilder() ->newSelectQueryBuilder()
->select( [ 'cat_id', 'cat_title', 'cat_pages', 'cat_subcats', 'cat_files' ] ) ->select( [ 'cat_id', 'cat_title', 'cat_pages', 'cat_subcats', 'cat_files' ] )
->from( 'category' ) ->from( 'category' )

2
includes/ServiceWiring.php
View file

@ -33,7 +33,7 @@ use MediaWiki\MediaWikiServices;
return [ return [
'CategoryTree.CategoryCache' => static function ( MediaWikiServices $services ): CategoryCache { 'CategoryTree.CategoryCache' => static function ( MediaWikiServices $services ): CategoryCache {
return new CategoryCache( return new CategoryCache(
$services->getDBLoadBalancer() $services->getConnectionProvider()
); );
}, },
]; ];

4
tests/phpunit/CategoryCacheTest.php
View file

@ -24,7 +24,7 @@ use MediaWiki\Category\Category;
use MediaWiki\Extension\CategoryTree\CategoryCache; use MediaWiki\Extension\CategoryTree\CategoryCache;
use MediaWiki\Title\TitleValue; use MediaWiki\Title\TitleValue;
use MediaWikiIntegrationTestCase; use MediaWikiIntegrationTestCase;
use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\IConnectionProvider;
use Wikimedia\TestingAccessWrapper; use Wikimedia\TestingAccessWrapper;
/** /**
@ -35,7 +35,7 @@ class CategoryCacheTest extends MediaWikiIntegrationTestCase {
public function testConstruct() { public function testConstruct() {
new CategoryCache( new CategoryCache(
$this->createMock( ILoadBalancer::class ) $this->createMock( IConnectionProvider::class )
); );
$this->addToAssertionCount( 1 ); $this->addToAssertionCount( 1 );
} }