use ActorMigration;
use CommentStore;
-use MediaWiki\Logger\Spi as LoggerSpi;
+use Psr\Log\LoggerInterface;
use MediaWiki\Storage\BlobStoreFactory;
use MediaWiki\Storage\NameTableStoreFactory;
use WANObjectCache;
private $dbLoadBalancerFactory;
/** @var WANObjectCache */
private $cache;
- /** @var LoggerSpi */
- private $loggerProvider;
+ /** @var LoggerInterface */
+ private $logger;
/** @var CommentStore */
private $commentStore;
* @param CommentStore $commentStore
* @param ActorMigration $actorMigration
* @param int $migrationStage
- * @param LoggerSpi $loggerProvider
+ * @param LoggerInterface $logger
* @param bool $contentHandlerUseDB see {@link $wgContentHandlerUseDB}. Must be the same
* for all wikis in the cluster. Will go away after MCR migration.
*/
CommentStore $commentStore,
ActorMigration $actorMigration,
$migrationStage,
- LoggerSpi $loggerProvider,
+ LoggerInterface $logger,
$contentHandlerUseDB
) {
Assert::parameterType( 'integer', $migrationStage, '$migrationStage' );
$this->commentStore = $commentStore;
$this->actorMigration = $actorMigration;
$this->mcrMigrationStage = $migrationStage;
- $this->loggerProvider = $loggerProvider;
+ $this->logger = $logger;
$this->contentHandlerUseDB = $contentHandlerUseDB;
}
/**
* @since 1.32
*
- * @param bool|string $wikiId false for the current domain / wikid
+ * @param bool|string $dbDomain DB domain of the relevant wiki or false for the current one
*
- * @return RevisionStore for the given wikiId with all necessary services and a logger
+ * @return RevisionStore for the given wikiId with all necessary services
*/
- public function getRevisionStore( $wikiId = false ) {
- Assert::parameterType( 'string|boolean', $wikiId, '$wikiId' );
+ public function getRevisionStore( $dbDomain = false ) {
+ Assert::parameterType( 'string|boolean', $dbDomain, '$dbDomain' );
$store = new RevisionStore(
- $this->dbLoadBalancerFactory->getMainLB( $wikiId ),
- $this->blobStoreFactory->newSqlBlobStore( $wikiId ),
+ $this->dbLoadBalancerFactory->getMainLB( $dbDomain ),
+ // @phan-suppress-next-line PhanAccessMethodInternal
+ $this->blobStoreFactory->newSqlBlobStore( $dbDomain ),
$this->cache, // Pass local cache instance; Leave cache sharing to RevisionStore.
$this->commentStore,
- $this->nameTables->getContentModels( $wikiId ),
- $this->nameTables->getSlotRoles( $wikiId ),
+ $this->nameTables->getContentModels( $dbDomain ),
+ $this->nameTables->getSlotRoles( $dbDomain ),
$this->slotRoleRegistry,
$this->mcrMigrationStage,
$this->actorMigration,
- $wikiId
+ $dbDomain
);
- $store->setLogger( $this->loggerProvider->getLogger( 'RevisionStore' ) );
+ $store->setLogger( $this->logger );
$store->setContentHandlerUseDB( $this->contentHandlerUseDB );
return $store;