Merge "Refactor edit stashing into a PageEditStash service"

diff --combined includes/ServiceWiring.php
index a500c45,a3a73e4..40e9f87
--- 1/includes/ServiceWiring.php
--- 2/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@@ -62,6 -62,7 +62,7 @@@ use MediaWiki\Storage\BlobStore
  use MediaWiki\Storage\BlobStoreFactory;
  use MediaWiki\Storage\NameTableStoreFactory;
  use MediaWiki\Storage\SqlBlobStore;
+ use MediaWiki\Storage\PageEditStash;
  
  return [
        'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
@@@ -350,6 -351,20 +351,20 @@@
                );
        },
  
+       'PageEditStash' => function ( MediaWikiServices $services ) : PageEditStash {
+               $config = $services->getMainConfig();
+ 
+               return new PageEditStash(
+                       ObjectCache::getLocalClusterInstance(),
+                       $services->getDBLoadBalancer(),
+                       LoggerFactory::getInstance( 'StashEdit' ),
+                       $services->getStatsdDataFactory(),
+                       defined( 'MEDIAWIKI_JOB_RUNNER' ) || $config->get( 'CommandLineMode' )
+                               ? PageEditStash::INITIATOR_JOB_OR_CLI
+                               : PageEditStash::INITIATOR_USER
+               );
+       },
+ 
        'Parser' => function ( MediaWikiServices $services ) : Parser {
                return $services->getParserFactory()->create();
        },
@@@ -443,17 -458,8 +458,17 @@@
                        $config,
                        LoggerFactory::getInstance( 'resourceloader' )
                );
 +
                $rl->addSource( $config->get( 'ResourceLoaderSources' ) );
 +
 +              // Core modules, then extension/skin modules
                $rl->register( include "$IP/resources/Resources.php" );
 +              $rl->register( $config->get( 'ResourceModules' ) );
 +              Hooks::run( 'ResourceLoaderRegisterModules', [ &$rl ] );
 +
 +              if ( $config->get( 'EnableJavaScriptTest' ) === true ) {
 +                      $rl->registerTestModules();
 +              }
  
                return $rl;
        },