wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-23 18:28:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topic "split-render-id"

Browse source 
* changes:
  Remove use of deprecated HtmlInputTransformHelper::init() method
  Remove use of deprecated HtmlOutputRendererHelper::init() method
This commit is contained in:
Divec 2024-07-02 18:26:30 +00:00 committed by Gerrit Code Review
parent 1ac180346c 6bb86cbaaf
commit e2934f2ebb
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
includes/DirectParsoidClient.php
View file

@ -52,8 +52,6 @@ class DirectParsoidClient implements ParsoidClient {
bool $stash = false,
string $flavor = self::FLAVOR_DEFAULT
): HtmlOutputRendererHelper {
$helper = $this->helperFactory->newHtmlOutputRendererHelper();
// TODO: remove this once we no longer need a User object for rate limiting (T310476).
if ( $this->performer instanceof User ) {
$user = $this->performer;
@ -61,7 +59,7 @@ class DirectParsoidClient implements ParsoidClient {
$user = User::newFromIdentity( $this->performer->getUser() );
}
$helper->init( $page, [], $user, $revision );
$helper = $this->helperFactory->newHtmlOutputRendererHelper( $page, [], $user, $revision );
// Ensure we get a compatible version, not just the default
$helper->setOutputProfileVersion( self::PARSOID_VERSION );
@ -89,8 +87,6 @@ class DirectParsoidClient implements ParsoidClient {
string $etag = null,
Bcp47Code $pageLanguage = null
): HtmlInputTransformHelper {
$helper = $this->helperFactory->newHtmlInputTransformHelper();
// Fake REST body
$body = [
'html' => [
@ -98,17 +94,24 @@ class DirectParsoidClient implements ParsoidClient {
]
];
$metrics = MediaWikiServices::getInstance()->getParsoidSiteConfig()->metrics();
if ( $metrics ) {
$helper->setMetrics( $metrics );
}
if ( $oldid || $etag ) {
$body['original']['revid'] = $oldid;
$body['original']['renderid'] = $etag;
}
$helper->init( $page, $body, [], null, $pageLanguage );
$helper = $this->helperFactory->newHtmlInputTransformHelper(
/* envOptions: */ [],
$page,
$body,
/* parameters: */ [],
/* originalRevision: */ null,
$pageLanguage
);
$metrics = MediaWikiServices::getInstance()->getParsoidSiteConfig()->metrics();
if ( $metrics ) {
$helper->setMetrics( $metrics );
}
return $helper;
}