X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FServiceWiring.php;h=4cd3d851740f793253fd88acc22378ddbf91775f;hp=740377c027733beaf97b4609245e9a8c8b74a75e;hb=3bbda79f1f09649bc4d036f2810117df46166f9c;hpb=02dc5d8685bf9ceccdbcdba75ed3a4c920da0e80

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 740377c027..4cd3d85174 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -77,9 +77,7 @@ use Wikimedia\ObjectFactory;
 
 return [
 	'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
-		return new ActorMigration(
-			$services->getMainConfig()->get( 'ActorTableSchemaMigrationStage' )
-		);
+		return new ActorMigration( SCHEMA_COMPAT_NEW );
 	},
 
 	'BadFileLookup' => function ( MediaWikiServices $services ) : BadFileLookup {
@@ -109,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' )
 		);
 	},
 
@@ -547,7 +543,8 @@ return [
 			$services->getContentLanguage(),
 			AuthManager::singleton(),
 			$services->getLinkRendererFactory()->create(),
-			$services->getNamespaceInfo()
+			$services->getNamespaceInfo(),
+			$services->getPermissionManager()
 		);
 		$factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
 
@@ -636,7 +633,7 @@ return [
 			$services->getCommentStore(),
 			$services->getActorMigration(),
 			$config->get( 'MultiContentRevisionSchemaMigrationStage' ),
-			LoggerFactory::getProvider(),
+			LoggerFactory::getInstance( 'RevisionStore' ),
 			$config->get( 'ContentHandlerUseDB' )
 		);
 
@@ -734,7 +731,8 @@ return [
 		return new SpecialPageFactory(
 			new ServiceOptions(
 				SpecialPageFactory::$constructorOptions, $services->getMainConfig() ),
-			$services->getContentLanguage()
+			$services->getContentLanguage(),
+			$services->getObjectFactory()
 		);
 	},