Merge "Specify htmlspecialchars() flags"

Author: jenkins-bot

lib/includes/Formatters/WikibaseValueFormatterBuilders.php

@@ -211,7 +211,9 @@ private function isHtmlFormat( $format ) {
 	private function escapeValueFormatter( $format, ValueFormatter $formatter ) {
 		switch ( $this->snakFormat->getBaseFormat( $format ) ) {
 			case SnakFormatter::FORMAT_HTML:
-				return new EscapingValueFormatter( $formatter, 'htmlspecialchars' );
+				return new EscapingValueFormatter( $formatter, static function ( string $string ): string {
+					return htmlspecialchars( $string, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5 );
+				} );
 			case SnakFormatter::FORMAT_WIKI:
 				return new EscapingValueFormatter( $formatter, 'wfEscapeWikiText' );
 			default:

lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php

@@ -451,14 +451,14 @@ public function provideNewFormatter() {
 				SnakFormatter::FORMAT_HTML_VERBOSE,
 				$this->newFormatterOptions( 'de' ),
 				new GlobeCoordinateValue( new LatLongValue( -55.755786, 37.25633 ), 0.25 ),
-				'@^<div><kartographer-html/><div class="wikibase-kartographer-caption">55°45\'S, 37°15\'E</div></div>$@'
+				'@^<div><kartographer-html/><div class="wikibase-kartographer-caption">55°45&apos;S, 37°15&apos;E</div></div>$@'
 			],
 			'coordinate kartographer preview html' => [
 				'GlobeCoordinate',
 				SnakFormatter::FORMAT_HTML_VERBOSE_PREVIEW,
 				$this->newFormatterOptions( 'de' ),
 				new GlobeCoordinateValue( new LatLongValue( -55.755786, 37.25633 ), 0.25 ),
-				'@^<div><kartographer-preview-html/><div class="wikibase-kartographer-caption">55°45\'S, 37°15\'E</div></div>$@'
+				'@^<div><kartographer-preview-html/><div class="wikibase-kartographer-caption">55°45&apos;S, 37°15&apos;E</div></div>$@'
 			],
 
 			// Quantity