X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=79e5b848f7b95691c8c4e51e3efaa2bc4cc7723c;hb=bee9f4db96b4aec51feeddb8ccdca353c034f12f;hp=d21bcef332436ab91b73c1e8d1bc8920652a6c23;hpb=1801936f877aac0728bf654a4b2b7508506a672e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d21bcef332..79e5b848f7 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -37,11 +37,14 @@
  *      MediaWiki code base.
  */
 
+use MediaWiki\Auth\AuthManager;
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Linker\LinkRendererFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Preferences\DefaultPreferencesFactory;
 use MediaWiki\Shell\CommandFactory;
+use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\RevisionStore;
 use MediaWiki\Storage\SqlBlobStore;
 
@@ -163,6 +166,11 @@ return [
 			$services->getReadOnlyMode()
 		);
 		$store->setStatsdDataFactory( $services->getStatsdDataFactory() );
+
+		if ( $services->getMainConfig()->get( 'ReadOnlyWatchedItemStore' ) ) {
+			$store = new NoWriteWatchedItemStore( $store );
+		}
+
 		return $store;
 	},
 
@@ -474,28 +482,30 @@ return [
 		return $store;
 	},
 
+	'BlobStoreFactory' => function ( MediaWikiServices $services ) {
+		global $wgContLang;
+		return new BlobStoreFactory(
+			$services->getDBLoadBalancer(),
+			$services->getMainWANObjectCache(),
+			$services->getMainConfig(),
+			$wgContLang
+		);
+	},
+
 	'BlobStore' => function ( MediaWikiServices $services ) {
 		return $services->getService( '_SqlBlobStore' );
 	},
 
 	'_SqlBlobStore' => function ( MediaWikiServices $services ) {
-		global $wgContLang; // TODO: manage $wgContLang as a service
-
-		$store = new SqlBlobStore(
-			$services->getDBLoadBalancer(),
-			$services->getMainWANObjectCache()
-		);
+		return $services->getBlobStoreFactory()->newSqlBlobStore();
+	},
 
+	'PreferencesFactory' => function ( MediaWikiServices $services ) {
+		global $wgContLang;
+		$authManager = AuthManager::singleton();
+		$linkRenderer = $services->getLinkRendererFactory()->create();
 		$config = $services->getMainConfig();
-		$store->setCompressBlobs( $config->get( 'CompressRevisions' ) );
-		$store->setCacheExpiry( $config->get( 'RevisionCacheExpiry' ) );
-		$store->setUseExternalStore( $config->get( 'DefaultExternalStore' ) !== false );
-
-		if ( $config->get( 'LegacyEncoding' ) ) {
-			$store->setLegacyEncoding( $config->get( 'LegacyEncoding' ), $wgContLang );
-		}
-
-		return $store;
+		return new DefaultPreferencesFactory( $config, $wgContLang, $authManager, $linkRenderer );
 	},
 
 	///////////////////////////////////////////////////////////////////////////