Merge "Revision: Inject Logger instead of LoggerSpi"

diff --combined includes/ServiceWiring.php
index eb26776,6e9adcd..4cd3d85
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -107,12 -107,14 +107,12 @@@ return 
        },
  
        'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
 -              $context = RequestContext::getMain();
                return new BlockManager(
                        new ServiceOptions(
                                BlockManager::$constructorOptions, $services->getMainConfig()
                        ),
 -                      $context->getUser(),
 -                      $context->getRequest(),
 -                      $services->getPermissionManager()
 +                      $services->getPermissionManager(),
 +                      LoggerFactory::getInstance( 'BlockManager' )
                );
        },
  
@@@ -543,8 -545,7 +543,8 @@@
                        $services->getContentLanguage(),
                        AuthManager::singleton(),
                        $services->getLinkRendererFactory()->create(),
 -                      $services->getNamespaceInfo()
 +                      $services->getNamespaceInfo(),
 +                      $services->getPermissionManager()
                );
                $factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
  
@@@ -633,7 -634,7 +633,7 @@@
                        $services->getCommentStore(),
                        $services->getActorMigration(),
                        $config->get( 'MultiContentRevisionSchemaMigrationStage' ),
-                       LoggerFactory::getProvider(),
+                       LoggerFactory::getInstance( 'RevisionStore' ),
                        $config->get( 'ContentHandlerUseDB' )
                );