diff --git a/docs/config-schema.yaml b/docs/config-schema.yaml index c1b4c0b98b3..feae6f71487 100644 --- a/docs/config-schema.yaml +++ b/docs/config-schema.yaml @@ -2383,13 +2383,13 @@ config-schema: ParsoidCacheConfig: type: object default: - StashBackend: null + StashType: null StashDuration: 86400 CacheThresholdTime: 0.0 description: |- Configuration for the caching related to parsoid output. The configuration contains the following keys: - - StashBackend: The name of the object store to be used by the ParsoidOutputStash service, + - StashType: The type of object store to be used by the ParsoidOutputStash service, which stores the base state of HTML based edits. Valid options are the keys of {@link $wgObjectCaches}, e.g. CACHE_* constants. Per default, the value of the MainStash setting will be used. diff --git a/includes/MainConfigSchema.php b/includes/MainConfigSchema.php index d58e62bc548..147e5152443 100644 --- a/includes/MainConfigSchema.php +++ b/includes/MainConfigSchema.php @@ -3737,7 +3737,7 @@ class MainConfigSchema { * Configuration for the caching related to parsoid output. The configuration contains the * following keys: * - * - StashBackend: The name of the object store to be used by the ParsoidOutputStash service, + * - StashType: The type of object store to be used by the ParsoidOutputStash service, * which stores the base state of HTML based edits. * Valid options are the keys of {@link $wgObjectCaches}, e.g. CACHE_* constants. * Per default, the value of the MainStash setting will be used. @@ -3761,7 +3761,7 @@ class MainConfigSchema { public const ParsoidCacheConfig = [ 'type' => 'object', 'default' => [ - 'StashBackend' => null, + 'StashType' => null, 'StashDuration' => 24 * 60 * 60, 'CacheThresholdTime' => 0.0 ] diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index ffe7802acc2..ca841f02026 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -1327,8 +1327,8 @@ return [ // TODO: Determine storage requirements and config options for stashing parsoid // output for VE edits (T309016). $config = $services->getMainConfig()->get( MainConfigNames::ParsoidCacheConfig ); - $backend = $config['StashBackend'] - ? ObjectCache::getInstance( $config['StashBackend'] ) + $backend = $config['StashType'] + ? ObjectCache::getInstance( $config['StashType'] ) : $services->getMainObjectStash(); return new SimpleParsoidOutputStash( $backend, $config['StashDuration'] ); diff --git a/includes/config-schema.php b/includes/config-schema.php index 5fe8ad05a92..5df1deda95b 100644 --- a/includes/config-schema.php +++ b/includes/config-schema.php @@ -504,7 +504,7 @@ return [ 'EnableWANCacheReaper' => false, 'MainStash' => 'db-replicated', 'ParsoidCacheConfig' => [ - 'StashBackend' => null, + 'StashType' => null, 'StashDuration' => 86400, 'CacheThresholdTime' => 0.0, ],