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;
}
*
* @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( $dbDomain = false ) {
Assert::parameterType( 'string|boolean', $dbDomain, '$dbDomain' );
$dbDomain
);
- $store->setLogger( $this->loggerProvider->getLogger( 'RevisionStore' ) );
+ $store->setLogger( $this->logger );
$store->setContentHandlerUseDB( $this->contentHandlerUseDB );
return $store;
$services->getCommentStore(),
$services->getActorMigration(),
$config->get( 'MultiContentRevisionSchemaMigrationStage' ),
- LoggerFactory::getProvider(),
+ LoggerFactory::getInstance( 'RevisionStore' ),
$config->get( 'ContentHandlerUseDB' )
);
use ActorMigration;
use CommentStore;
-use MediaWiki\Logger\Spi as LoggerSpi;
use MediaWiki\Revision\RevisionStore;
use MediaWiki\Revision\RevisionStoreFactory;
use MediaWiki\Revision\SlotRoleRegistry;
$this->getMockCommentStore(),
ActorMigration::newMigration(),
MIGRATION_OLD,
- $this->getMockLoggerSpi(),
+ new NullLogger(),
true
);
$this->assertTrue( true );
$cache = $this->getHashWANObjectCache();
$commentStore = $this->getMockCommentStore();
$actorMigration = ActorMigration::newMigration();
- $loggerProvider = $this->getMockLoggerSpi();
+ $logger = new NullLogger();
$factory = new RevisionStoreFactory(
$lbFactory,
$commentStore,
$actorMigration,
$mcrMigrationStage,
- $loggerProvider,
+ $logger,
$contentHandlerUseDb
);
return new WANObjectCache( [ 'cache' => new \HashBagOStuff() ] );
}
- /**
- * @return \PHPUnit_Framework_MockObject_MockObject|LoggerSpi
- */
- private function getMockLoggerSpi() {
- $mock = $this->getMock( LoggerSpi::class );
-
- $mock->method( 'getLogger' )
- ->willReturn( new NullLogger() );
-
- return $mock;
- }
-
}