Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Storage: Type against ILBFactory and ILoadBalancer in storage classes"

Browse source
This commit is contained in:
jenkins-bot 2019-06-14 00:05:03 +00:00 committed by Gerrit Code Review
commit 7b3631abc8
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/Storage/BlobStoreFactory.php
View file

@ -23,7 +23,7 @@ namespace MediaWiki\Storage;
use Language;
use MediaWiki\Config\ServiceOptions;
use WANObjectCache;
use Wikimedia\Rdbms\LBFactory;
use Wikimedia\Rdbms\ILBFactory;
/**
* Service for instantiating BlobStores
@ -35,7 +35,7 @@ use Wikimedia\Rdbms\LBFactory;
class BlobStoreFactory {
/**
* @var LBFactory
* @var ILBFactory
*/
private $lbFactory;
@ -68,7 +68,7 @@ class BlobStoreFactory {
];
public function __construct(
LBFactory $lbFactory,
ILBFactory $lbFactory,
WANObjectCache $cache,
ServiceOptions $options,
Language $contLang

8
includes/Storage/DerivedPageDataUpdater.php
View file

@ -60,7 +60,7 @@ use SiteStatsUpdate;
use Title;
use User;
use Wikimedia\Assert\Assert;
use Wikimedia\Rdbms\LBFactory;
use Wikimedia\Rdbms\ILBFactory;
use WikiPage;
/**
@ -132,7 +132,7 @@ class DerivedPageDataUpdater implements IDBAccessObject {
private $messageCache;
/**
* @var LBFactory
* @var ILBFactory
*/
private $loadbalancerFactory;
@ -268,7 +268,7 @@ class DerivedPageDataUpdater implements IDBAccessObject {
* @param JobQueueGroup $jobQueueGroup
* @param MessageCache $messageCache
* @param Language $contLang
* @param LBFactory $loadbalancerFactory
* @param ILBFactory $loadbalancerFactory
*/
public function __construct(
WikiPage $wikiPage,
@ -279,7 +279,7 @@ class DerivedPageDataUpdater implements IDBAccessObject {
JobQueueGroup $jobQueueGroup,
MessageCache $messageCache,
Language $contLang,
LBFactory $loadbalancerFactory
ILBFactory $loadbalancerFactory
) {
$this->wikiPage = $wikiPage;

8
includes/Storage/PageUpdater.php
View file

@ -51,7 +51,7 @@ use Wikimedia\Assert\Assert;
use Wikimedia\Rdbms\DBConnRef;
use Wikimedia\Rdbms\DBUnexpectedError;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\Rdbms\ILoadBalancer;
use WikiPage;
/**
@ -87,7 +87,7 @@ class PageUpdater {
private $derivedDataUpdater;
/**
* @var LoadBalancer
* @var ILoadBalancer
*/
private $loadBalancer;
@ -151,7 +151,7 @@ class PageUpdater {
* @param User $user
* @param WikiPage $wikiPage
* @param DerivedPageDataUpdater $derivedDataUpdater
* @param LoadBalancer $loadBalancer
* @param ILoadBalancer $loadBalancer
* @param RevisionStore $revisionStore
* @param SlotRoleRegistry $slotRoleRegistry
*/
@ -159,7 +159,7 @@ class PageUpdater {
User $user,
WikiPage $wikiPage,
DerivedPageDataUpdater $derivedDataUpdater,
LoadBalancer $loadBalancer,
ILoadBalancer $loadBalancer,
RevisionStore $revisionStore,
SlotRoleRegistry $slotRoleRegistry
) {

10
includes/Storage/SqlBlobStore.php
View file

@ -36,7 +36,7 @@ use MWException;
use WANObjectCache;
use Wikimedia\Assert\Assert;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\Rdbms\ILoadBalancer;
/**
* Service for storing and loading Content objects.
@ -52,7 +52,7 @@ class SqlBlobStore implements IDBAccessObject, BlobStore {
const TEXT_CACHE_GROUP = 'revisiontext:10';
/**
* @var LoadBalancer
* @var ILoadBalancer
*/
private $dbLoadBalancer;
@ -92,7 +92,7 @@ class SqlBlobStore implements IDBAccessObject, BlobStore {
private $useExternalStore = false;
/**
* @param LoadBalancer $dbLoadBalancer A load balancer for acquiring database connections
* @param ILoadBalancer $dbLoadBalancer A load balancer for acquiring database connections
* @param WANObjectCache $cache A cache manager for caching blobs. This can be the local
* wiki's default instance even if $wikiId refers to a different wiki, since
* makeGlobalKey() is used to constructed a key that allows cached blobs from the
@ -102,7 +102,7 @@ class SqlBlobStore implements IDBAccessObject, BlobStore {
* @param bool|string $wikiId The ID of the target wiki database. Use false for the local wiki.
*/
public function __construct(
LoadBalancer $dbLoadBalancer,
ILoadBalancer $dbLoadBalancer,
WANObjectCache $cache,
$wikiId = false
) {
@ -186,7 +186,7 @@ class SqlBlobStore implements IDBAccessObject, BlobStore {
}
/**
* @return LoadBalancer
* @return ILoadBalancer
*/
private function getDBLoadBalancer() {
return $this->dbLoadBalancer;