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

Merge "Produce HTML for invalid JSON"

Browse source
This commit is contained in:
jenkins-bot 2022-11-03 16:42:31 +00:00 committed by Gerrit Code Review
commit 81434f95f5
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/content/JsonContentHandler.php
View file

@ -129,8 +129,14 @@ class JsonContentHandler extends CodeContentHandler {
'@phan-var JsonContent $content';
// FIXME: WikiPage::doUserEditContent generates parser output before validation.
// As such, native data may be invalid (though output is discarded later in that case).
if ( $cpoParams->getGenerateHtml() && $content->isValid() ) {
$parserOutput->setText( $content->rootValueTable( $content->getData()->getValue() ) );
if ( $cpoParams->getGenerateHtml() ) {
if ( $content->isValid() ) {
$parserOutput->setText( $content->rootValueTable( $content->getData()->getValue() ) );
} else {
$error = wfMessage( 'invalid-json-data' )->parse();
$parserOutput->setText( $error );
}
$parserOutput->addModuleStyles( [ 'mediawiki.content.json' ] );
} else {
$parserOutput->setText( null );

10
tests/phpunit/includes/content/JsonContentHandlerIntegrationTest.php
View file

@ -48,6 +48,10 @@ class JsonContentHandlerIntegrationTest extends MediaWikiLangTestCase {
'<script>alert("evil!")</script>"' .
'</td></tr></tbody></table>',
],
[
'{ broken JSON ]',
'Invalid JSON: $1',
],
];
}
@ -56,7 +60,11 @@ class JsonContentHandlerIntegrationTest extends MediaWikiLangTestCase {
* @covers JsonContentHandler::fillParserOutput
*/
public function testFillParserOutput( $data, $expected ) {
$content = new JsonContent( FormatJson::encode( $data ) );
if ( !is_string( $data ) ) {
$data = FormatJson::encode( $data );
}
$content = new JsonContent( $data );
$contentRenderer = $this->getServiceContainer()->getContentRenderer();
$parserOutput = $contentRenderer->getParserOutput(
$content,