X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=b30726415e1c604e0ac14cd08f38875daa60ea6a;hb=f05953f948dc0c707c988b99e82e9c9632294d6a;hp=0b4ce4aa3a688f279709e870cf8a4cb1cebaa8ea;hpb=7b62a1fa50546ba2c02890b27c9279cc47f19d86;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 0b4ce4aa3a..b30726415e 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -39,10 +39,12 @@
 
 use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use MediaWiki\Auth\AuthManager;
+use MediaWiki\BadFileLookup;
 use MediaWiki\Block\BlockManager;
 use MediaWiki\Block\BlockRestrictionStore;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Interwiki\InterwikiLookup;
@@ -68,6 +70,7 @@ use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\NameTableStoreFactory;
 use MediaWiki\Storage\SqlBlobStore;
 use MediaWiki\Storage\PageEditStash;
+use Wikimedia\ObjectFactory;
 
 return [
 	'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
@@ -76,6 +79,17 @@ return [
 		);
 	},
 
+	'BadFileLookup' => function ( MediaWikiServices $services ) : BadFileLookup {
+		return new BadFileLookup(
+			function () {
+				return wfMessage( 'bad_image_list' )->inContentLanguage()->plain();
+			},
+			$services->getLocalServerObjectCache(),
+			$services->getRepoGroup(),
+			$services->getTitleParser()
+		);
+	},
+
 	'BlobStore' => function ( MediaWikiServices $services ) : BlobStore {
 		return $services->getService( '_SqlBlobStore' );
 	},
@@ -98,7 +112,8 @@ return [
 				BlockManager::$constructorOptions, $services->getMainConfig()
 			),
 			$context->getUser(),
-			$context->getRequest()
+			$context->getRequest(),
+			$services->getPermissionManager()
 		);
 	},
 
@@ -417,6 +432,10 @@ return [
 		);
 	},
 
+	'ObjectFactory' => function ( MediaWikiServices $services ) : ObjectFactory {
+		return new ObjectFactory( $services );
+	},
+
 	'OldRevisionImporter' => function ( MediaWikiServices $services ) : OldRevisionImporter {
 		return new ImportableOldRevisionImporter(
 			true,
@@ -496,17 +515,12 @@ return [
 	},
 
 	'PermissionManager' => function ( MediaWikiServices $services ) : PermissionManager {
-		$config = $services->getMainConfig();
 		return new PermissionManager(
+			new ServiceOptions(
+				PermissionManager::$constructorOptions, $services->getMainConfig()
+			),
 			$services->getSpecialPageFactory(),
 			$services->getRevisionLookup(),
-			$config->get( 'WhitelistRead' ),
-			$config->get( 'WhitelistReadRegexp' ),
-			$config->get( 'EmailConfirmToEdit' ),
-			$config->get( 'BlockDisablesLogin' ),
-			$config->get( 'GroupPermissions' ),
-			$config->get( 'RevokePermissions' ),
-			$config->get( 'AvailableRights' ),
 			$services->getNamespaceInfo()
 		);
 	},
@@ -715,6 +729,10 @@ return [
 		);
 	},
 
+	'TempFSFileFactory' => function ( MediaWikiServices $services ) : TempFSFileFactory {
+		return new TempFSFileFactory( $services->getMainConfig()->get( 'TmpDirectory' ) );
+	},
+
 	'TitleFormatter' => function ( MediaWikiServices $services ) : TitleFormatter {
 		return $services->getService( '_MediaWikiTitleCodec' );
 	},