Merge "Introduce RevisionStoreFactory & Tests"

diff --combined includes/ServiceWiring.php
index 09e7bd5,c33dc94..671544e
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -47,8 -47,7 +47,7 @@@ use MediaWiki\Preferences\DefaultPrefer
  use MediaWiki\Shell\CommandFactory;
  use MediaWiki\Storage\BlobStoreFactory;
  use MediaWiki\Storage\NameTableStore;
- use MediaWiki\Storage\RevisionStore;
- use MediaWiki\Storage\SqlBlobStore;
+ use MediaWiki\Storage\RevisionStoreFactory;
  use Wikimedia\ObjectFactory;
  
  return [
@@@ -136,7 -135,7 +135,7 @@@
                $config = $services->getMainConfig();
                $wiki = $config->get( 'DBname' );
                return new BufferingStatsdDataFactory(
 -                      rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ) ) . '.' . $wiki
 +                      rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . '.' . $wiki
                );
        },
  
@@@ -474,25 -473,22 +473,22 @@@
        },
  
        'RevisionStore' => function ( MediaWikiServices $services ) {
-               /** @var SqlBlobStore $blobStore */
-               $blobStore = $services->getService( '_SqlBlobStore' );
+               return $services->getRevisionStoreFactory()->getRevisionStore();
+       },
  
-               $store = new RevisionStore(
-                       $services->getDBLoadBalancer(),
-                       $blobStore,
+       'RevisionStoreFactory' => function ( MediaWikiServices $services ) {
+               $config = $services->getMainConfig();
+               $store = new RevisionStoreFactory(
+                       $services->getDBLoadBalancerFactory(),
+                       $services->getBlobStoreFactory(),
                        $services->getMainWANObjectCache(),
                        $services->getCommentStore(),
-                       $services->getContentModelStore(),
-                       $services->getSlotRoleStore(),
-                       $services->getMainConfig()->get( 'MultiContentRevisionSchemaMigrationStage' ),
-                       $services->getActorMigration()
+                       $services->getActorMigration(),
+                       $config->get( 'MultiContentRevisionSchemaMigrationStage' ),
+                       LoggerFactory::getProvider(),
+                       $config->get( 'ContentHandlerUseDB' )
                );
  
-               $store->setLogger( LoggerFactory::getInstance( 'RevisionStore' ) );
- 
-               $config = $services->getMainConfig();
-               $store->setContentHandlerUseDB( $config->get( 'ContentHandlerUseDB' ) );
- 
                return $store;
        },