Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ParserOutput: Add default values for JSON deserialization

Browse source 
This is a forward-compatibility patch: it will eventually allow us to
slim down the serialized form of the ParserOutput by omitting
properties which are set to their default values.

Change-Id: I52ba7b1560b67347b4c08eb3a2a45ed464b8f4f7
(cherry picked from commit f54f2a98ea18d2b974728e46dd7ccd2ecf0d78fd)
This commit is contained in:
C. Scott Ananian 2025-10-05 22:20:03 -04:00 committed by jenkins-bot
parent 14f02f3e49
commit f2816a3b29
2 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/parser/CacheTime.php
View file

@ -285,11 +285,11 @@ class CacheTime implements ParserCacheMetadata, JsonDeserializable {
// Backwards compatibility
$this->recordOptions( $jsonData['UsedOptions'] ?: [] );
} else {
$this->mParseUsedOptions = $jsonData['ParseUsedOptions'] ?: [];
$this->mParseUsedOptions = $jsonData['ParseUsedOptions'] ?? [];
}
$this->mCacheExpiry = $jsonData['CacheExpiry'];
$this->mCacheTime = $jsonData['CacheTime'];
$this->mCacheRevisionId = $jsonData['CacheRevisionId'];
$this->mCacheExpiry = $jsonData['CacheExpiry'] ?? null;
$this->mCacheTime = $jsonData['CacheTime'] ?? '';
$this->mCacheRevisionId = $jsonData['CacheRevisionId'] ?? null;
}
public function __wakeup() {

73
includes/parser/ParserOutput.php
View file

@ -3072,32 +3072,35 @@ class ParserOutput extends CacheTime implements ContentMetadataCollector {
// WARNING: When changing how this class is serialized, follow the instructions
// at <https://www.mediawiki.org/wiki/Manual:Parser_cache/Serialization_compatibility>!
// (This includes changing default values when fields are missing.)
$this->mRawText = $jsonData['Text'];
$this->mLanguageLinkMap = [];
foreach ( ( $jsonData['LanguageLinks'] ?? [] ) as $l ) {
$this->addLanguageLink( $l );
}
$this->mCategories = $jsonData['Categories'];
$this->mIndicators = $jsonData['Indicators'];
$this->mTitleText = $jsonData['TitleText'];
$this->mLinks = $jsonData['Links'];
$this->mLinksSpecial = $jsonData['LinksSpecial'];
$this->mTemplates = $jsonData['Templates'];
$this->mTemplateIds = $jsonData['TemplateIds'];
$this->mImages = $jsonData['Images'];
$this->mFileSearchOptions = $jsonData['FileSearchOptions'];
$this->mExternalLinks = $jsonData['ExternalLinks'];
$this->mInterwikiLinks = $jsonData['InterwikiLinks'];
$this->mNewSection = $jsonData['NewSection'];
$this->mHideNewSection = $jsonData['HideNewSection'];
$this->mNoGallery = $jsonData['NoGallery'];
$this->mHeadItems = $jsonData['HeadItems'];
$this->mModuleSet = array_fill_keys( $jsonData['Modules'], true );
$this->mModuleStyleSet = array_fill_keys( $jsonData['ModuleStyles'], true );
$this->mJsConfigVars = $jsonData['JsConfigVars'];
$this->mWarnings = $jsonData['Warnings'];
$this->mFlags = $jsonData['Flags'];
// Default values should match the property default values.
$this->mCategories = $jsonData['Categories'] ?? [];
$this->mIndicators = $jsonData['Indicators'] ?? [];
$this->mTitleText = $jsonData['TitleText'] ?? '';
$this->mLinks = $jsonData['Links'] ?? [];
$this->mLinksSpecial = $jsonData['LinksSpecial'] ?? [];
$this->mTemplates = $jsonData['Templates'] ?? [];
$this->mTemplateIds = $jsonData['TemplateIds'] ?? [];
$this->mImages = $jsonData['Images'] ?? [];
$this->mFileSearchOptions = $jsonData['FileSearchOptions'] ?? [];
$this->mExternalLinks = $jsonData['ExternalLinks'] ?? [];
$this->mInterwikiLinks = $jsonData['InterwikiLinks'] ?? [];
$this->mNewSection = $jsonData['NewSection'] ?? false;
$this->mHideNewSection = $jsonData['HideNewSection'] ?? false;
$this->mNoGallery = $jsonData['NoGallery'] ?? false;
$this->mHeadItems = $jsonData['HeadItems'] ?? [];
$this->mModuleSet = array_fill_keys( $jsonData['Modules'] ?? [], true );
$this->mModuleStyleSet = array_fill_keys( $jsonData['ModuleStyles'] ?? [], true );
$this->mJsConfigVars = $jsonData['JsConfigVars'] ?? [];
$this->mWarnings = $jsonData['Warnings'] ?? [];
$this->mFlags = $jsonData['Flags'] ?? [];
if ( isset( $jsonData['TOCData'] ) ) {
$this->mTOCData = $jsonData['TOCData'];
// Backward-compatibility with old TOCData encoding (T327439)
@ -3116,25 +3119,25 @@ class ParserOutput extends CacheTime implements ContentMetadataCollector {
}
}
}
$this->mProperties = self::detectAndDecodeBinary( $jsonData['Properties'] );
$this->mTimestamp = $jsonData['Timestamp'];
$this->mEnableOOUI = $jsonData['EnableOOUI'];
$this->setIndexPolicy( $jsonData['IndexPolicy'] );
$this->mProperties = self::detectAndDecodeBinary( $jsonData['Properties'] ?? [] );
$this->mTimestamp = $jsonData['Timestamp'] ?? null;
$this->mEnableOOUI = $jsonData['EnableOOUI'] ?? false;
$this->setIndexPolicy( $jsonData['IndexPolicy'] ?? '' );
$this->mExtensionData = $jsonData['ExtensionData'] ?? [];
$this->mLimitReportData = $jsonData['LimitReportData'];
$this->mLimitReportJSData = $jsonData['LimitReportJSData'];
$this->mLimitReportData = $jsonData['LimitReportData'] ?? [];
$this->mLimitReportJSData = $jsonData['LimitReportJSData'] ?? [];
$this->mCacheMessage = $jsonData['CacheMessage'] ?? '';
$this->mParseStartTime = []; // invalid after reloading
$this->mTimeProfile = $jsonData['TimeProfile'] ?? [];
$this->mPreventClickjacking = $jsonData['PreventClickjacking'];
$this->mExtraScriptSrcs = $jsonData['ExtraScriptSrcs'];
$this->mExtraDefaultSrcs = $jsonData['ExtraDefaultSrcs'];
$this->mExtraStyleSrcs = $jsonData['ExtraStyleSrcs'];
$this->mSpeculativeRevId = $jsonData['SpeculativeRevId'];
$this->speculativePageIdUsed = $jsonData['SpeculativePageIdUsed'];
$this->revisionTimestampUsed = $jsonData['RevisionTimestampUsed'];
$this->revisionUsedSha1Base36 = $jsonData['RevisionUsedSha1Base36'];
$this->mWrapperDivClasses = $jsonData['WrapperDivClasses'];
$this->mPreventClickjacking = $jsonData['PreventClickjacking'] ?? false;
$this->mExtraScriptSrcs = $jsonData['ExtraScriptSrcs'] ?? [];
$this->mExtraDefaultSrcs = $jsonData['ExtraDefaultSrcs'] ?? [];
$this->mExtraStyleSrcs = $jsonData['ExtraStyleSrcs'] ?? [];
$this->mSpeculativeRevId = $jsonData['SpeculativeRevId'] ?? null;
$this->speculativePageIdUsed = $jsonData['SpeculativePageIdUsed'] ?? null;
$this->revisionTimestampUsed = $jsonData['RevisionTimestampUsed'] ?? null;
$this->revisionUsedSha1Base36 = $jsonData['RevisionUsedSha1Base36'] ?? null;
$this->mWrapperDivClasses = $jsonData['WrapperDivClasses'] ?? [];
$this->mMaxAdaptiveExpiry = $jsonData['MaxAdaptiveExpiry'] ?? INF;
}