From: addshore <addshorewiki@gmail.com>
Date: Sat, 23 Dec 2017 17:16:09 +0000 (+0000)
Subject: Remove duplicate ServiceWiring definitions
X-Git-Tag: 1.31.0-rc.0~1109^2~1
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=47da9e78f5a80fde77c446d6bade2ed08746601c;p=lhc%2Fweb%2Fwiklou.git

Remove duplicate ServiceWiring definitions

Change-Id: I70b377c417ce6937e5d52d1790cf0b6f2ed33c15
---

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 575970d23f..d21bcef332 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -450,46 +450,6 @@ return [
 		return $factory;
 	},
 
-	'RevisionStore' => function ( MediaWikiServices $services ) {
-		/** @var SqlBlobStore $blobStore */
-		$blobStore = $services->getService( '_SqlBlobStore' );
-
-		$store = new RevisionStore(
-			$services->getDBLoadBalancer(),
-			$blobStore,
-			$services->getMainWANObjectCache()
-		);
-
-		$config = $services->getMainConfig();
-		$store->setContentHandlerUseDB( $config->get( 'ContentHandlerUseDB' ) );
-
-		return $store;
-	},
-
-	'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()
-		);
-
-		$config = $services->getMainConfig();
-		$store->setCompressRevisions( $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;
-	},
-
 	'ExternalStoreFactory' => function ( MediaWikiServices $services ) {
 		$config = $services->getMainConfig();