diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 30b8250764e..a2a73fd43d4 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4927,11 +4927,12 @@ $wgAllowImageTag = false; $wgTidyConfig = []; /** - * Emit using the new media structure described at, + * Enable legacy media HTML structure in the output from the Parser. The one + * that replaces it is described at, * https://www.mediawiki.org/wiki/Parsing/Media_structure * @since 1.36 */ -$wgUseNewMediaStructure = false; +$wgParserEnableLegacyMediaDOM = true; /** * Allow raw, unchecked HTML in "..." sections. diff --git a/includes/Linker.php b/includes/Linker.php index 79c7232ba06..00be6c204c5 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -331,13 +331,24 @@ class Linker { $frameParams['class'] = ''; } + $services = MediaWikiServices::getInstance(); + $enableLegacyMediaDOM = $services->getMainConfig()->get( 'ParserEnableLegacyMediaDOM' ); + + $classes = []; + if ( !isset( $handlerParams['width'] ) ) { + $classes[] = 'mw-default-size'; + } + $prefix = $postfix = ''; - if ( $frameParams['align'] == 'center' ) { - $prefix = '
'; - $postfix = '
'; - $frameParams['align'] = 'none'; + if ( $enableLegacyMediaDOM ) { + if ( $frameParams['align'] == 'center' ) { + $prefix = '
'; + $postfix = '
'; + $frameParams['align'] = 'none'; + } } + if ( $file && !isset( $handlerParams['width'] ) ) { if ( isset( $handlerParams['height'] ) && $file->isVectorized() ) { // If its a vector image, and user only specifies height @@ -385,20 +396,38 @@ class Linker { if ( isset( $frameParams['thumbnail'] ) || isset( $frameParams['manualthumb'] ) || isset( $frameParams['framed'] ) ) { - # Create a thumbnail. Alignment depends on the writing direction of - # the page content language (right-aligned for LTR languages, - # left-aligned for RTL languages) - # If a thumbnail width has not been provided, it is set - # to the default user option as specified in Language*.php - if ( $frameParams['align'] == '' ) { - $frameParams['align'] = $parser->getTargetLanguage()->alignEnd(); + if ( $enableLegacyMediaDOM ) { + // This is no longer needed in our new media output, since the + // default styling in content.media.less takes care of it; + // see T269704. + + # Create a thumbnail. Alignment depends on the writing direction of + # the page content language (right-aligned for LTR languages, + # left-aligned for RTL languages) + # If a thumbnail width has not been provided, it is set + # to the default user option as specified in Language*.php + if ( $frameParams['align'] == '' ) { + $frameParams['align'] = $parser->getTargetLanguage()->alignEnd(); + } } return $prefix . - self::makeThumbLink2( $title, $file, $frameParams, $handlerParams, $time, $query ) . + self::makeThumbLink2( $title, $file, $frameParams, $handlerParams, $time, $query, $classes ) . $postfix; } + switch ( $file ? $file->getMediaType() : '' ) { + case 'AUDIO': + $rdfaType = 'mw:Audio'; + break; + case 'VIDEO': + $rdfaType = 'mw:Video'; + break; + default: + $rdfaType = 'mw:Image'; + } + if ( $file && isset( $frameParams['frameless'] ) ) { + $rdfaType .= '/Frameless'; $srcWidth = $file->getWidth( $page ); # For "frameless" option: do not present an image bigger than the # source (for bitmap-style images). This is the same behavior as the @@ -416,29 +445,79 @@ class Linker { } if ( !$thumb ) { - $s = self::makeBrokenImageLinkObj( $title, $frameParams['title'], '', '', '', $time == true ); + $rdfaType = 'mw:Error ' . $rdfaType; + $label = ''; + if ( $enableLegacyMediaDOM ) { + // This is the information for tooltips for inline images which + // Parsoid stores in data-mw. See T273014 + $label = $frameParams['title']; + } + $s = self::makeBrokenImageLinkObj( + $title, $label, '', '', '', $time == true, $handlerParams + ); } else { self::processResponsiveImages( $file, $thumb, $handlerParams ); $params = [ 'alt' => $frameParams['alt'], 'title' => $frameParams['title'], - 'valign' => $frameParams['valign'] ?? false, - 'img-class' => $frameParams['class'] ]; - if ( isset( $frameParams['border'] ) ) { - $params['img-class'] .= ( $params['img-class'] !== '' ? ' ' : '' ) . 'thumbborder'; + ]; + if ( $enableLegacyMediaDOM ) { + $params += [ + 'valign' => $frameParams['valign'] ?? false, + 'img-class' => $frameParams['class'], + ]; + if ( isset( $frameParams['border'] ) ) { + $params['img-class'] .= ( $params['img-class'] !== '' ? ' ' : '' ) . 'thumbborder'; + } } $params = self::getImageLinkMTOParams( $frameParams, $query, $parser ) + $params; - $s = $thumb->toHtml( $params ); } - if ( $frameParams['align'] != '' ) { - $s = Html::rawElement( - 'div', - [ 'class' => 'float' . $frameParams['align'] ], - $s - ); + + if ( $enableLegacyMediaDOM ) { + if ( $frameParams['align'] != '' ) { + $s = Html::rawElement( + 'div', + [ 'class' => 'float' . $frameParams['align'] ], + $s + ); + } + return str_replace( "\n", ' ', $prefix . $s . $postfix ); } - return str_replace( "\n", ' ', $prefix . $s . $postfix ); + + $wrapper = 'span'; + $caption = ''; + + if ( $frameParams['align'] != '' ) { + $wrapper = 'figure'; + // Possible values: mw-halign-left mw-halign-center mw-halign-right mw-halign-none + $classes[] = "mw-halign-{$frameParams['align']}"; + $caption = Html::rawElement( + 'figcaption', [], $frameParams['caption'] ?? '' + ); + } elseif ( isset( $frameParams['valign'] ) ) { + // Possible values: mw-valign-middle mw-valign-baseline mw-valign-sub + // mw-valign-super mw-valign-top mw-valign-text-top mw-valign-bottom + // mw-valign-text-bottom + $classes[] = "mw-valign-{$frameParams['valign']}"; + } + + if ( isset( $frameParams['border'] ) ) { + $classes[] = 'mw-image-border'; + } + + if ( isset( $frameParams['class'] ) ) { + $classes[] = $frameParams['class']; + } + + $attribs = [ + 'class' => $classes, + 'typeof' => $rdfaType, + ]; + + $s = Html::rawElement( $wrapper, $attribs, $s . $caption ); + + return str_replace( "\n", ' ', $s ); } /** @@ -483,14 +562,15 @@ class Linker { * @param File|bool $file File object or false if it doesn't exist * @param string $label * @param string $alt - * @param string $align + * @param string|null $align * @param array $params * @param bool $framed * @param string $manualthumb * @return string */ - public static function makeThumbLinkObj( LinkTarget $title, $file, $label = '', $alt = '', - $align = 'right', $params = [], $framed = false, $manualthumb = "" + public static function makeThumbLinkObj( + LinkTarget $title, $file, $label = '', $alt = '', $align = null, + $params = [], $framed = false, $manualthumb = "" ) { $frameParams = [ 'alt' => $alt, @@ -503,7 +583,10 @@ class Linker { if ( $manualthumb ) { $frameParams['manualthumb'] = $manualthumb; } - return self::makeThumbLink2( $title, $file, $frameParams, $params ); + $classes = [ 'mw-default-size' ]; + return self::makeThumbLink2( + $title, $file, $frameParams, $params, false, '', $classes + ); } /** @@ -513,16 +596,24 @@ class Linker { * @param array $handlerParams * @param bool $time * @param string $query + * @param string[] $classes @since 1.36 * @return string */ - public static function makeThumbLink2( LinkTarget $title, $file, $frameParams = [], - $handlerParams = [], $time = false, $query = "" + public static function makeThumbLink2( + LinkTarget $title, $file, $frameParams = [], $handlerParams = [], + $time = false, $query = "", array $classes = [] ) { $exists = $file && $file->exists(); + $services = MediaWikiServices::getInstance(); + $enableLegacyMediaDOM = $services->getMainConfig()->get( 'ParserEnableLegacyMediaDOM' ); + $page = $handlerParams['page'] ?? false; if ( !isset( $frameParams['align'] ) ) { - $frameParams['align'] = 'right'; + $frameParams['align'] = ''; + if ( $enableLegacyMediaDOM ) { + $frameParams['align'] = 'right'; + } } if ( !isset( $frameParams['alt'] ) ) { $frameParams['alt'] = ''; @@ -538,9 +629,11 @@ class Linker { // Reduce width for upright images when parameter 'upright' is used $handlerParams['width'] = isset( $frameParams['upright'] ) ? 130 : 180; } + $thumb = false; $noscale = false; $manualthumb = false; + $rdfaType = null; if ( !$exists ) { $outerWidth = $handlerParams['width'] + 2; @@ -549,7 +642,7 @@ class Linker { # Use manually specified thumbnail $manual_title = Title::makeTitleSafe( NS_FILE, $frameParams['manualthumb'] ); if ( $manual_title ) { - $manual_img = MediaWikiServices::getInstance()->getRepoGroup() + $manual_img = $services->getRepoGroup() ->findFile( $manual_title ); if ( $manual_img ) { $thumb = $manual_img->getUnscaledThumb( $handlerParams ); @@ -562,6 +655,7 @@ class Linker { // Use image dimensions, don't scale $thumb = $file->getUnscaledThumb( $handlerParams ); $noscale = true; + $rdfaType = '/Frame'; } else { # Do not present an image bigger than the source, for bitmap-style images # This is a hack to maintain compatibility with arbitrary pre-1.10 behavior @@ -579,13 +673,15 @@ class Linker { } } - # ThumbnailImage::toHtml() already adds page= onto the end of DjVu URLs - # So we don't need to pass it here in $query. However, the URL for the - # zoom icon still needs it, so we make a unique query for it. See T16771 $url = Title::newFromLinkTarget( $title )->getLocalURL( $query ); - if ( $page ) { + + if ( $enableLegacyMediaDOM && $page ) { + # ThumbnailImage::toHtml() already adds page= onto the end of DjVu URLs + # So we don't need to pass it here in $query. However, the URL for the + # zoom icon still needs it, so we make a unique query for it. See T16771 $url = wfAppendQuery( $url, [ 'page' => $page ] ); } + if ( $manualthumb && !isset( $frameParams['link-title'] ) && !isset( $frameParams['link-url'] ) @@ -593,13 +689,35 @@ class Linker { $frameParams['link-url'] = $url; } - $s = "
" - . "
"; + if ( $frameParams['align'] != '' ) { + // Possible values: mw-halign-left mw-halign-center mw-halign-right mw-halign-none + $classes[] = "mw-halign-{$frameParams['align']}"; + } + + if ( isset( $frameParams['class'] ) ) { + $classes[] = $frameParams['class']; + } + + $s = ''; + + if ( $enableLegacyMediaDOM ) { + $s .= "
" + . "
"; + } if ( !$exists ) { - $s .= self::makeBrokenImageLinkObj( $title, $frameParams['title'], '', '', '', $time == true ); + $label = ''; + if ( $enableLegacyMediaDOM ) { + // This is the information for tooltips for inline images which + // Parsoid stores in data-mw. See T273014 + $label = $frameParams['title']; + } + $s .= self::makeBrokenImageLinkObj( + $title, $label, '', '', '', $time == true, $handlerParams + ); $zoomIcon = ''; } elseif ( !$thumb ) { + // FIXME(T169975): Add "mw:Error"? $s .= wfMessage( 'thumbnail_error', '' )->escaped(); $zoomIcon = ''; } else { @@ -609,10 +727,14 @@ class Linker { $params = [ 'alt' => $frameParams['alt'], 'title' => $frameParams['title'], - 'img-class' => ( isset( $frameParams['class'] ) && $frameParams['class'] !== '' - ? $frameParams['class'] . ' ' - : '' ) . 'thumbimage' ]; + if ( $enableLegacyMediaDOM ) { + $params += [ + 'img-class' => ( isset( $frameParams['class'] ) && $frameParams['class'] !== '' + ? $frameParams['class'] . ' ' + : '' ) . 'thumbimage' + ]; + } $params = self::getImageLinkMTOParams( $frameParams, $query ) + $params; $s .= $thumb->toHtml( $params ); if ( isset( $frameParams['framed'] ) ) { @@ -626,7 +748,40 @@ class Linker { "" ) ); } } - $s .= '
' . $zoomIcon . $frameParams['caption'] . "
"; + + if ( $enableLegacyMediaDOM ) { + $s .= '
' . $zoomIcon . $frameParams['caption'] . "
"; + return str_replace( "\n", ' ', $s ); + } + + $s .= Html::rawElement( + 'figcaption', [], $frameParams['caption'] ?? '' + ); + + $rdfaType = $rdfaType ?: '/Thumb'; + + switch ( $file ? $file->getMediaType() : '' ) { + case 'AUDIO': + $rdfaType = 'mw:Audio' . $rdfaType; + break; + case 'VIDEO': + $rdfaType = 'mw:Video' . $rdfaType; + break; + default: + $rdfaType = 'mw:Image' . $rdfaType; + } + + if ( !$exists ) { + $rdfaType = 'mw:Error ' . $rdfaType; + } + + $attribs = [ + 'class' => $classes, + 'typeof' => $rdfaType, + ]; + + $s = Html::rawElement( 'figure', $attribs, $s ); + return str_replace( "\n", ' ', $s ); } @@ -671,10 +826,12 @@ class Linker { * @param string $unused1 Unused parameter kept for b/c * @param string $unused2 Unused parameter kept for b/c * @param bool $time A file of a certain timestamp was requested + * @param array $handlerParams @since 1.36 * @return string */ - public static function makeBrokenImageLinkObj( $title, $label = '', - $query = '', $unused1 = '', $unused2 = '', $time = false + public static function makeBrokenImageLinkObj( + $title, $label = '', $query = '', $unused1 = '', $unused2 = '', + $time = false, array $handlerParams = [] ) { if ( !$title instanceof LinkTarget ) { wfWarn( __METHOD__ . ': Requires $title to be a LinkTarget object.' ); @@ -687,8 +844,19 @@ class Linker { if ( $label == '' ) { $label = $title->getPrefixedText(); } - $html = htmlspecialchars( $label ); - $repoGroup = MediaWikiServices::getInstance()->getRepoGroup(); + + $html = Html::element( 'span', [ + // These data attributes are used to dynamically size the span, see T273013 + 'data-width' => $handlerParams['width'] ?? null, + 'data-height' => $handlerParams['height'] ?? null, + ], $label ); + + $services = MediaWikiServices::getInstance(); + if ( $services->getMainConfig()->get( 'ParserEnableLegacyMediaDOM' ) ) { + $html = htmlspecialchars( $label ); + } + + $repoGroup = $services->getRepoGroup(); $currentExists = $time && $repoGroup->findFile( $title ) !== false; diff --git a/includes/gallery/TraditionalImageGallery.php b/includes/gallery/TraditionalImageGallery.php index cf141be149e..e94da0fda69 100644 --- a/includes/gallery/TraditionalImageGallery.php +++ b/includes/gallery/TraditionalImageGallery.php @@ -79,6 +79,8 @@ class TraditionalImageGallery extends ImageGalleryBase { } $lang = $this->getRenderLang(); + $enableLegacyMediaDOM = $this->getConfig()->get( 'ParserEnableLegacyMediaDOM' ); + # Output each image... foreach ( $this->mImages as [ $nt, $text, $alt, $link, $handlerOpts, $loading ] ) { // "text" means "caption" here @@ -155,16 +157,39 @@ class TraditionalImageGallery extends ImageGalleryBase { Linker::processResponsiveImages( $img, $thumb, $transformOptions ); - # Set both fixed width and min-height. - $thumbhtml = "\n\t\t\t" - . '
' + switch ( $img->getMediaType() ) { + case 'AUDIO': + $rdfaType = 'mw:Audio'; + break; + case 'VIDEO': + $rdfaType = 'mw:Video'; + break; + default: + $rdfaType = 'mw:Image'; + } + + $thumbhtml = $thumb->toHtml( $imageParameters ); + + if ( !$enableLegacyMediaDOM ) { + $thumbhtml = Html::rawElement( + 'span', [ 'typeof' => $rdfaType ], $thumbhtml + ); + } + + $thumbhtml = Html::rawElement( 'div', [ # Auto-margin centering for block-level elements. Needed # now that we have video handlers since they may emit block- # level elements as opposed to simple tags. ref # http://css-discuss.incutio.com/?page=CenteringBlockElement - . '
' - . $thumb->toHtml( $imageParameters ) . '
'; + 'style' => "margin:{$vpad}px auto;", + ], $thumbhtml ); + + # Set both fixed width and min-height. + $width = $this->getThumbDivWidth( $thumb->getWidth() ); + $thumbhtml = "\n\t\t\t" . Html::rawElement( 'div', [ + 'class' => 'thumb', + 'style' => "width: {$width}px;", + ], $thumbhtml ); // Call parser transform hook /** @var MediaHandler $handler */ diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php index 943148b68bd..32422bdd836 100644 --- a/includes/media/MediaTransformOutput.php +++ b/includes/media/MediaTransformOutput.php @@ -232,6 +232,7 @@ abstract class MediaTransformOutput { /** * Wrap some XHTML text in an anchor tag with the given attributes + * or, fallback to a span in the absence thereof. * * @param array $linkAttribs * @param string $contents @@ -241,7 +242,12 @@ abstract class MediaTransformOutput { if ( $linkAttribs ) { return Xml::tags( 'a', $linkAttribs, $contents ); } else { - return $contents; + global $wgParserEnableLegacyMediaDOM; + if ( $wgParserEnableLegacyMediaDOM ) { + return $contents; + } else { + return Xml::tags( 'span', null, $contents ); + } } } @@ -269,8 +275,13 @@ abstract class MediaTransformOutput { $attribs = [ 'href' => $this->file->getTitle()->getLocalURL( $query ), - 'class' => 'image', ]; + + global $wgParserEnableLegacyMediaDOM; + if ( $wgParserEnableLegacyMediaDOM ) { + $attribs['class'] = 'image'; + } + if ( $title ) { $attribs['title'] = $title; } diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index e4502bbd09a..e8bef2b2c05 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -5213,6 +5213,9 @@ class Parser { foreach ( $handlerParamMap as $magic => $paramName ) { $paramMap[$magic] = [ 'handler', $paramName ]; } + } else { + // Parse the size for non-existent files. See T273013 + $paramMap[ 'img_width' ] = [ 'handler', 'width' ]; } $this->mImageParams[$handlerClass] = $paramMap; $this->mImageParamsMagicArray[$handlerClass] = @@ -5295,16 +5298,23 @@ class Parser { # Special case; width and height come in one variable together if ( $type === 'handler' && $paramName === 'width' ) { $parsedWidthParam = self::parseWidthParam( $value ); + // Parsoid applies data-(width|height) attributes to broken + // media spans, for client use. See T273013 + $validateFunc = static function ( $name, $value ) use ( $handler ) { + return $handler + ? $handler->validateParam( $name, $value ) + : $value > 0; + }; if ( isset( $parsedWidthParam['width'] ) ) { $width = $parsedWidthParam['width']; - if ( $handler->validateParam( 'width', $width ) ) { + if ( $validateFunc( 'width', $width ) ) { $params[$type]['width'] = $width; $validated = true; } } if ( isset( $parsedWidthParam['height'] ) ) { $height = $parsedWidthParam['height']; - if ( $handler->validateParam( 'height', $height ) ) { + if ( $validateFunc( 'height', $height ) ) { $params[$type]['height'] = $height; $validated = true; } diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php index 1c4cbdeee9d..b660c0497a6 100644 --- a/includes/resourceloader/ResourceLoaderSkinModule.php +++ b/includes/resourceloader/ResourceLoaderSkinModule.php @@ -62,7 +62,7 @@ class ResourceLoaderSkinModule extends ResourceLoaderLessVarFileModule { * * "content-media": * Styles for thumbnails and floated elements. - * Will add styles for the new media structure on wikis where $wgUseNewMediaStructure is enabled. + * Will add styles for the new media structure on wikis where $wgParserEnableLegacyMediaDOM is disabled. * See https://www.mediawiki.org/wiki/Parsing/Media_structure * * "content-links": @@ -339,7 +339,7 @@ class ResourceLoaderSkinModule extends ResourceLoaderLessVarFileModule { ); } } - if ( $feature === 'content-media' && $this->getConfig()->get( 'UseNewMediaStructure' ) ) { + if ( $feature === 'content-media' && !$this->getConfig()->get( 'ParserEnableLegacyMediaDOM' ) ) { $featureFilePaths['screen'][] = new ResourceLoaderFilePath( 'resources/src/mediawiki.skinning/content.media.less', $defaultLocalBasePath, diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php index 1338a734a25..8c88771c2d0 100644 --- a/tests/parser/ParserTestRunner.php +++ b/tests/parser/ParserTestRunner.php @@ -59,6 +59,7 @@ class ParserTestRunner { 'pfeqParserTests.txt', 'extraParserTests.txt', 'legacyMediaParserTests.txt', + 'mediaParserTests.txt', ]; /** diff --git a/tests/parser/mediaParserTests.txt b/tests/parser/mediaParserTests.txt new file mode 100644 index 00000000000..cde00e549ed --- /dev/null +++ b/tests/parser/mediaParserTests.txt @@ -0,0 +1,3797 @@ +!! Version 2 + +!! article +Main Page +!! text +blah blah +!! endarticle + +!! article +Foo''s bar''s +!! text +Article titles can contain single quotes! +!! endarticle + +!! article +Template:1x +!! text +{{{1}}} +!! endarticle + +!! article +Template:image_attribs +!! text + +[[File:foobar.jpg|right|Caption text]] +!! endarticle + +!! article +Template:paramtest +!! text +This is a test template with parameter {{{param}}} +!! endarticle + +!! article +Template:test +!! text +This is a test template +!! endarticle + +### +### Images +### +### For Parsoid-specific tests, see +### https://www.mediawiki.org/wiki/Specs/HTML#Images + +!! test +Simple image +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Serialize simple image with figure-inline wrapper +!! options +parsoid=html2wt +!! html/parsoid +

+!! wikitext +[[File:Foobar.jpg]] +!! end + +!! test +Simple image (using File: namespace, now canonical) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Right-aligned image +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right]] +!! html/php +
Foobar.jpg
+!! html/parsoid +
+!! end + +!! test +Image with caption +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right|Caption text]] +!! html/php +
Caption text
Caption text
+!! html/parsoid +
Caption text
+!! end + +!! test +Image with caption, T55312 #1 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right|Caption page stuff]] +!! html/php +
Caption page stuff
Caption page stuff
+!! html/parsoid +
Caption page stuff
+!! end + +!! test +Image with caption, T55312 #2 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right|Caption page=]] +!! html/php +
Caption page=
Caption page=
+!! html/parsoid +
Caption page=
+!! end + +!! test +Image with caption, T55312 #3 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right|Caption page=stuff]] +!! html/php +
Caption page=stuff
Caption page=stuff
+!! html/parsoid +
Caption page=stuff
+!! end + +!! test +Image caption with pipe entity +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|one | two]] +[[File:Foobar.jpg|thumb|one ''two'' | three]] +!! html/php +
one | two
+
one two | three
+!! html/parsoid +
one | two
+
one two | three
+!! end + +!! test +Allow empty links in image captions (T62753) +!! options +thumbsize=220 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|Caption [[Link1]] +[[]] +[[Link2]] +]] +!! html/php +
Caption Link1 [[]] Link2
+!! html/parsoid +
Caption Link1 +[[]] +Link2 +
+!! end + +!! test +Titles in unlinked images (T23454) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=|stuff]] +!! html/php +

stuff +

+!! html/parsoid +

+!! end + +!! test +Link with empty target +!! wikitext +[[]] +!! html +

[[]] +

+!! end + +!! test +Image with link trail +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +Linktrails should not work for images: [[File:Foobar.jpg]]s +!! html/php +

Linktrails should not work for images: Foobar.jpgs +

+!! html/parsoid +

Linktrails should not work for images: s

+!! end + +!! test +Image with empty attribute +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right||Caption text]] +!! html/php +
Caption text
Caption text
+!! html/parsoid +
Caption text
+!! end + +!! test +1. Block image with individual attributes from templates +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|{{1x|137px}}|This is a caption]] +!! html/php +
This is a caption
+!! html/parsoid +
This is a caption
+!! end + +!! test +2. Block Image with individual attributes from templates +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|{{1x|thumb}}|{{1x|137px}}|This is a caption]] +!! html/php +
This is a caption
+!! html/parsoid +
This is a caption
+!! end + +!! test +3. Inline image with individual attributes from templates +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|{{1x|50px}}]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +## Parsoid does not provide editing support for images where templates produce multiple image attributes. +## To signal this, we add a 'mw:Placeholder' type to such images. This could change in the future. +!! test +Image with multiple attributes from the same template +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|{{image_attribs}}]] +!! html/php +
Caption text
Caption text
+!! html/parsoid +
Caption text
+!! end + +!! test +Image with link tails +!! options +thumbsize=220 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +123[[File:Foobar.jpg]]456 +123[[File:Foobar.jpg|right]]456 +123[[File:Foobar.jpg|thumb]]456 +!! html/php+untidy +

123Foobar.jpg456 +

+123
Foobar.jpg
456 +123
Foobar.jpg
456 +!! html/php+tidy +

123Foobar.jpg456 +

+123

Foobar.jpg

456 +123

Foobar.jpg

456

+!! html/parsoid +

123456

+

123

456 +123

+

456

+!! end + +!! test +Image with multiple captions -- only last one is accepted +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|right|Caption1 - ignored|[[Caption2]] - ignored|Caption3 - accepted]] +!! html/php +
Caption3 - accepted
Caption3 - accepted
+!! html/parsoid +
Caption3 - accepted
+!! end + +!! test +Image with multiple widths -- use last +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|200px|300px|caption]] +!! html/php +

caption +

+!! html/parsoid +

+!! end + +!! test +Image with multiple alignments -- use first (T50664) +!! options +thumbsize=220 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|left|right|center|caption]] + +[[File:Foobar.jpg|middle|text-top|caption]] +!! html/php +
caption
+

caption +

+!! html/parsoid +
caption
+

+!! end + +!! test +Image with width attribute at different positions +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|200px|right|Caption]] +[[File:Foobar.jpg|right|200px|Caption]] +[[File:Foobar.jpg|right|Caption|200px]] +!! html/php +
Caption
Caption
+
Caption
Caption
+
Caption
Caption
+!! html/parsoid +
Caption
+
Caption
+
Caption
+!! end + +# a sad bit of backward-compatibility +!! test +Image with size specified with pxpx (T15500, T53628) +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|20pxpx]] +[[File:Foobar.jpg|200x20pxpx]] +!! html/php +

Foobar.jpg +Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Image with link parameter, wiki target +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=Main Page]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +# parsoid T51293 (part 1) +!! test +Image with link parameter, URL target +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=http://example.com/]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +# parsoid T51293 (part 2) +!! test +Image with link parameter, protocol-less URL target +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=//example.com/]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Escaping non-block captions (T107435) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["[typeof~='mw:Image']", "attr", "data-mw", "{\"caption\": \"|\"}"] + ] +} +!! wikitext +[[Image:Foobar.jpg|caption]] +!! wikitext/edited +[[Image:Foobar.jpg||]] +!! end + +# wgExternalLinkTarget not supported by Parsoid +!! test +Image with link parameter, wgExternalLinkTarget +!! wikitext +[[Image:foobar.jpg|link=http://example.com/]] +!! config +wgExternalLinkTarget='foobar' +wgParserEnableLegacyMediaDOM=false +!! html/php +

Foobar.jpg +

+!! end + +!! test +Image with link parameter, wgNoFollowLinks set to false +!! wikitext +[[Image:foobar.jpg|link=http://example.com/]] +!! config +wgNoFollowLinks=false +wgParserEnableLegacyMediaDOM=false +!! html/php +

Foobar.jpg +

+!! end + +!! test +Image with link parameter, wgNoFollowDomainExceptions +!! wikitext +[[Image:foobar.jpg|link=http://example.com/]] +!! config +wgNoFollowDomainExceptions='example.com' +wgParserEnableLegacyMediaDOM=false +!! html/php +

Foobar.jpg +

+!! end + +# wgExternalLinkTarget not supported by Parsoid +!! test +Image with link parameter, wgExternalLinkTarget, unnamed parameter +!! wikitext +[[Image:foobar.jpg|link=http://example.com/|Title]] +!! config +wgExternalLinkTarget='foobar' +wgParserEnableLegacyMediaDOM=false +!! html/php +

Title +

+!! end + +!! test +Image with empty link parameter +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Image with link parameter (wiki target) and unnamed parameter +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=Main_Page|Title]] +!! html/php +

Title +

+!! html/parsoid +

+!! end + +!! test +Image with link parameter (URL target) and unnamed parameter +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=http://example.com/|Title]] +!! html/php +

Title +

+!! html/parsoid +

+!! end + +!! test +Thumbnail image with link parameter +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|link=http://example.com/|Title]] +!! html/php +
Title
+!! html/parsoid +
Title
+!! end + +!! test +Manually-specified thumbnail image +!! options +thumbsize=220 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumbnail=Thumb.png|Title]] +!! html/php +
Title
+!! html/parsoid +
Title
+!! end + +!! test +Manually-specified thumbnail image (backwards compat) +!! options +thumbsize=220 +parsoid=html2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumbnail=Thumb.png|Title]] +!! html/php +
Title
+!! html/parsoid +
Title
+!! end + +!! test +Manually-specified thumbnail image with explicit link to wiki page +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb=Thumb.png|link=Main_Page|Title]] +!! html/php +
Title
+!! html/parsoid +
Title
+!! end + +!! test +Manually-specified thumbnail image with explicit link to url +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb=Thumb.png|link=http://example.com|Title]] +!! html/php +
Title
+!! html/parsoid +
Title
+!! end + +!! test +Manually-specified thumbnail image with explicit no link +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb=Thumb.png|link=|Title]] +!! html/php +
Title
+!! html/parsoid +
Title
+!! end + +!! test +Manually-specified thumbnail image with explicit link and alt text +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb=Thumb.png|link=Main_Page|alt=alttext|Title]] +!! html/php +
alttext
Title
+!! html/parsoid +
alttext
Title
+!! end + +!! test +Image with frame and link +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frame|left|This is a test image [[Main Page]]]] +!! html/php +
This is a test image Main Page
+!! html/parsoid +
This is a test image Main Page
+!! end + +!! test +Image with frame and link and explicit alt +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]|alt=Altitude]] +!! html/php +
Altitude
This is a test image Main Page
+!! html/parsoid +
Altitude
This is a test image Main Page
+!! end + +!! test +Image with wiki markup in implicit alt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:Foobar.jpg|testing '''bold''' in alt]] + +[[Image:Foobar.jpg|alt=testing '''bold''' in alt]] +!! html/php +

testing bold in alt +

testing bold in alt +

+!! html/parsoid +

+ +

testing bold in alt

+!! end + +!! test +Alt image option should handle most kinds of wikitext without barfing +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:Foobar.jpg|thumb|This is the image caption|alt=This is a [[link]] and a {{1x|''bold template''}}.]] +!! html/php +
This is a link and a bold template.
This is the image caption
+!! html/parsoid +
This is a link and a bold template.
This is the image caption
+!! end + +!! test +Ampersand in alt attribute (T206940) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|alt=&]] + + + +File:Foobar.jpg|alt=& + +!! html/php+tidy +

& +

+ +!! html/parsoid +

&

+ + + +!! end + +## FIXME: The inconsistency in the gallery extension on the php side is T49646 +# Parsoid test is only wt2html because it inserts around the +# alt text when serializing (which is fine). +!! test +Link with encoded pipe in alt option +!! config +wgParserEnableLegacyMediaDOM=false +!! options +parsoid=wt2html +!! wikitext +[[File:Foobar.jpg|alt=http://testing.123?4=5|6|caption]] + +[[File:Foobar.jpg|alt=http://testing.123?4=5|6|caption]] + + + +File:Foobar.jpg|alt=http://testing.123?4=5|6|caption +File:Foobar.jpg|alt=http://testing.123?4=5|6|caption + +!! html/php+tidy +

http://testing.123?4=5|6 +

http://testing.123?4=5|6 +

+ +!! html/parsoid +

http://testing.123?4=5|6

+ +

http://testing.123?4=5|6

+ + + +!! end + +!! test +Italics markup in alt attribute (T206940) +!! options +parsoid=wt2html,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|alt=''x''|caption]] + + + +File:Foobar.jpg|alt=''x''|caption + +!! html/php+tidy +

x +

+ +!! html/parsoid +

x

+ + + +!! end + +## FIXME: This test can be dropped when Parsoid content versions 2.0.0 / 1.8.0 +## are no longer in storage. +!! test +Nowiki markup in alt attribute (T206940) +!! options +parsoid=html2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|alt=''x''|caption]] + + + +File:Foobar.jpg|alt=''x''|caption + +!! html/php+tidy +

''x'' +

+ +!! html/parsoid +

''x''

+ + + +!! end + +!! test +Nowiki markup in alt attribute (edited html, no data-parsoid) (T206940) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|alt=''x''|caption]] + + + +File:Foobar.jpg|alt=''x''|caption + +!! html/php+tidy +

''x'' +

+ +!! html/parsoid +

''x''

+ + + +!! end + +## FIXME: This test can be dropped when Parsoid content versions 2.0.0 / 1.8.0 +## are no longer in storage. +!! test +Ampersand in link attribute (T206940) +!! options +parsoid=html2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=Foo & bar]] + + + +File:Foobar.jpg|link=Foo & bar + +!! html/php+tidy +

Foobar.jpg +

+ +!! html/parsoid +

+ + + +!! end + +!! test +Ampersand in link attribute (edited html, no data-parsoid) (T206940) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=Foo_&_bar]] + + + +File:Foobar.jpg|link=Foo_&_bar + +!! html/php+tidy +

Foobar.jpg +

+ +!! html/parsoid +

+ + + +!! end + +!! test +Italics markup in link attribute (T206940) +!! options +parsoid=wt2html,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Foo''s bar''s]] + + +[[File:Foobar.jpg|link=Foo''s bar''s|caption1]] + +[[File:Foobar.jpg|link=''Main Page''|caption2]] + + + +File:Foobar.jpg|link=Foo''s bar''s|caption1 +File:Foobar.jpg|link=''Main Page''|caption2 + +!! html/php+tidy +

Foo''s bar''s +

caption1 +

caption2 +

+ +!! html/parsoid +

Foo''s bar''s

+ + +

+ +

+ + + +!! end + +## FIXME: This test can be dropped when Parsoid content versions 2.0.0 / 1.8.0 +## are no longer in storage. +!! test +Nowiki markup in link attribute (T206940) +!! options +parsoid=html2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=Foo''s_bar''s|caption]] + + + +File:Foobar.jpg|link=Foo''s_bar''s|caption + +!! html/php+tidy +

caption +

+ +!! html/parsoid +

+ + + +!! end + +!! test +Nowiki markup in link attribute (edited html, no data-parsoid) (T206940) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=Foo''s_bar''s|caption]] + + + +File:Foobar.jpg|link=Foo''s_bar''s|caption + +!! html/php+tidy +

caption +

+ +!! html/parsoid +

+ + + +!! end + +!! test +HTML entity prefix in link markup (T209236) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=https://example.com?foo¶ms=bar]] + + + +File:Foobar.jpg|link=https://example.com?foo¶ms=bar + +!! html/php+tidy +

Foobar.jpg +

+ +!! html/parsoid +

+ + + +!! end + +!! test +Image link markup is not generated when redundant (T108504) - encoded href +!! options +parsoid=html2wt,wt2wt +language=sr +!! wikitext +[[Датотека:Foobar.jpg]] +!! html/parsoid +

+!! end + +!! test +Image with table with attributes in caption +!! options +parsoid=wt2html,html2html +!! wikitext +[[File:Foobar.jpg|thumb| +{| class="123" | +|- class="456" | +| ha +|} +]] +!! html/parsoid +
+ + + +
ha
+
+!! end + +!! test +Image with table with rows from templates in caption +!! wikitext +[[File:Foobar.jpg|thumb| +{| +{{1x|{{!}} hi}} +|} +]] +!! html/parsoid +
+ + +
hi
+
+!! end + +!! test +Image with nested tables in caption +!! wikitext +[[File:Foobar.jpg|thumb|Foo
+{| +| +{| +|z +|} +|} +]] +!! html/parsoid +
Foo
+ + +
+ + +
z
+
+!! end + +!! test +Image with heading and horizontal rule in caption +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb| +===Testing=== +123 +-------------- +]] +!! html/php +

Testing[edit]

123
+!! html/parsoid +
+

Testing

+123 +
+
+!! end + +################### +# Conflicting image format options. +# First option specified should 'win'. +# All three cases in each test should be identical. + +!! test +Image with 'frameless' first. +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frameless|caption]] + +[[File:Foobar.jpg|frameless|frame|caption]] + +[[File:Foobar.jpg|frameless|thumb|caption]] +!! html/php +

caption +

caption +

caption +

+!! html/parsoid +

+

+

+!! end + +!! test +Image with 'frame' first. +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frame|caption]] +[[File:Foobar.jpg|frame|frameless|caption]] +[[File:Foobar.jpg|frame|thumb|caption]] +!! html/php +
caption
+
caption
+
caption
+!! html/parsoid +
caption
+
caption
+
caption
+!! end + +!! test +Image with 'thumb' first. +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|caption]] +[[File:Foobar.jpg|thumb|frameless|caption]] +[[File:Foobar.jpg|thumb|frame|caption]] +!! html/php +
caption
+
caption
+
caption
+!! html/parsoid +
caption
+
caption
+
caption
+!! end + +################### +# Image sizing. +# See https://www.mediawiki.org/wiki/Help:Images#Size_and_frame +# and https://phabricator.wikimedia.org/T64258 +# Foobar has actual size of 1941x220 +# 1. Thumbs & frameless always reduce, can't be enlarged unless it's +# a scalable format. +# 2. Framed images always ignore size options; always render at default size. +# 3. "Unspecified format" and border are the only types which can be +# enlarged. +# 4. The srcset attribute doesn't occur if image is being enlarged + +!! test +Image: unspecified format and border enlarge +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|2000px]] + +[[File:Foobar.jpg|border|2000px]] +!! html/php +

Foobar.jpg +

Foobar.jpg +

+!! html/parsoid +

+

+!! end + +!! test +Image: "unspecified format" and border reduce +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|1000px]] + +[[File:Foobar.jpg|border|1000px]] +!! html/php +

Foobar.jpg +

Foobar.jpg +

+!! html/parsoid +

+

+!! end + +!! test +Image: thumbs reduce +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|50px]] +!! html/php +
Foobar.jpg
+!! html/parsoid +
+!! end + +!! test +Image: bitmap thumbs can't be enlarged past original size, but vector can. +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|2000px]] + +[[File:Foobar.svg|thumb|2000px]] +!! html/php +
Foobar.jpg
+
Foobar.svg
+!! html/parsoid +
+
+!! end + +!! test +Image: frameless can reduce in size +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frameless|50px]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Image: bitmap frameless can't be enlarged past original size, but vector can +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frameless|2000px]] + +[[File:Foobar.svg|frameless|2000px]] +!! html/php +

Foobar.jpg +

Foobar.svg +

+!! html/parsoid +

+

+!! end + +!! test +Image: framed images are always unscaled. +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frame]] + +[[File:Foobar.jpg|frame|50px]] + +[[File:Foobar.jpg|frame|50x50px]] + +[[File:Foobar.jpg|frame|2000px]] +!! html/php +
Foobar.jpg
+
Foobar.jpg
+
Foobar.jpg
+
Foobar.jpg
+!! html/parsoid +
+
+
+
+!! end + +!! test +Bogus sizes during html2wt +!! options +parsoid=html2wt +!! html/parsoid +

+

+!! wikitext +[[File:Foobar.jpg]] + +[[File:Foobar.jpg|10x10px]] +!! end + +################### + +!! test +Link to image page- image page normally doesn't exist, hence edit link +Add test with existing image page +#

Image:test +!! wikitext +[[:Image:test]] +!! html +

Image:test +

+!! end + +!! test +T20784 Link to non-existent image page with caption should use caption as link text +!! wikitext +[[:Image:test|caption]] +!! html +

caption +

+!! end + +!! test +Frameless image caption with a free URL +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|http://example.com]] +!! html/php +

http://example.com +

+!! html/parsoid +

+!! end + +!! test +Thumbnail image caption with a free URL +!! options +thumbsize=220 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|http://example.com]] +!! html/php +
http://example.com
+!! html/parsoid +
http://example.com
+!! end + +!! test +Thumbnail image caption with a free URL and explicit alt +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|http://example.com|alt=Alteration]] +!! html/php +
Alteration
http://example.com
+!! html/parsoid +
Alteration
http://example.com
+!! end + +!! test +SVG thumbnails with no language set +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.svg|thumb|caption]] +!! html/php +
caption
+!! html/parsoid +
caption
+!! end + +!! test +SVG thumbnails with language de +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.svg|thumb|caption|lang=de]] +!! html/php +
caption
+!! html/parsoid +
caption
+!! end + +!! test +SVG thumbnails with invalid language code +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.svg|thumb|caption|lang=invalid:language:code]] +!! html/php +
lang=invalid:language:code
+!! html/parsoid +
lang=invalid:language:code
+!! end + +!! test +SVG thumbnails in page language +!! options +language=ru +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.svg]] [[File:Foobar.svg|lang=en]] +!! html/php +

Foobar.svg Foobar.svg +

+!! end + +!! test +SVG thumbnails in page language not present in the file +!! options +language=de +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.svg]] [[File:Foobar.svg|lang=ru]] +!! html/php +

Foobar.svg Foobar.svg +

+!! end + +!! test +T3887: A ISBN with a thumbnail +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|ISBN 1235467890]] +!! html/php +
ISBN 1235467890
+!! html/parsoid +
ISBN 1235467890
+!! end + +!! test +T3887: A RFC with a thumbnail +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|This is RFC 12354]] +!! html/php +
This is RFC 12354
+!! html/parsoid +
This is RFC 12354
+!! end + +!! test +T3887: A mailto link with a thumbnail +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|Please mailto:nobody@example.com]] +!! html/php +
Please mailto:nobody@example.com
+!! html/parsoid +
Please mailto:nobody@example.com
+!! end + +# Pending resolution to T2368 +!! test +T2648: Frameless image caption with a link +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|text with a [[link]] in it]] +!! html/php +

text with a link in it +

+!! html/parsoid +

+!! end + +!! test +T2648: Frameless image caption with a link (suffix) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|text with a [[link]]foo in it]] +!! html/php +

text with a linkfoo in it +

+!! html/parsoid +

+!! end + +!! test +T2648: Frameless image caption with an interwiki link +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|text with a [[MeatBall:Link]] in it]] +!! html/php +

text with a MeatBall:Link in it +

+!! html/parsoid +

+!! end + +!! test +T2648: Frameless image caption with a piped interwiki link +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|text with a [[MeatBall:Link|link]] in it]] +!! html/php +

text with a link in it +

+!! html/parsoid +

+!! end + +!! test +T107474: Frameless image caption with +!! wikitext +[[File:Foobar.jpg|text with a [[MeatBall:Link|link]] in it]] +!! html/parsoid +

+!! end + +!! test +Escape HTML special chars in image alt text +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|& < > "]] +!! html/php +

& < > " +

+!! html/parsoid +

+!! end + +!! test +Escape HTML special chars in image alt text with LanguageConverter +!! options +language=zh +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|& < > "]] +!! html/php +

& < > " +

+!! html/parsoid +

+!! end + +!! test +Entities in file name and attributes +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:7%25 solution.gif|manualthumb=7%25 solution.gif|link=7%25 solution|[[7%25 solution]]]] +!! html/php +

File:7% solution.gif +

+!! html/parsoid +

File:7% solution.gif

+!! end + +!! test +T2499: Alt text should have Ӓ, not &1234; +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|♀]] +!! html/php +

♀ +

+!! html/parsoid +

+!! end + +!! test +Broken image caption with link +!! options +parsoid=wt2html,wt2wt,html2html +!! wikitext +[[Image:Foobar.jpg|thumb|This is a broken caption. But [[Main Page|this]] is just an ordinary link. +!! html/php +

[[Image:Foobar.jpg|thumb|This is a broken caption. But this is just an ordinary link. +

+!! html/parsoid +

[[Image:Foobar.jpg|thumb|This is a broken caption. But this is just an ordinary link.

+!! end + +!! test +Image caption containing another image +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|This is a caption with another [[File:Thumb.png|image]] inside it!]] +!! html/php +
This is a caption with another image inside it!
+!! html/parsoid +
This is a caption with another inside it!
+!! end + +!! test +Image: caption containing a newline +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|This +*is some text]] +!! html/php +

This *is some text +

+!! html/parsoid +

+!!end + +## The leading space should not trigger nowiki escaping in wt2wt mode +!! test +Image: caption containing leading space +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb| bar]] +!! html/php +
bar
+!! html/parsoid +
bar
+!!end + +# html/php output not have newlines after table, td, th, etc. because +# Linker::makeThumbLink2() replaces the newlines with spaces since +# the table is inside a caption. +# FIXME: Verify if that circa 2004 fix is still required. +!! test +Image: caption containing a table +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:Foobar.jpg|thumb|200px|This is an example image thumbnail caption with a table +{| +!Foo!!Bar +|- +|Foo1||Bar1 +|} +and some more text.]] +!! html/php +
This is an example image thumbnail caption with a table
Foo Bar
Foo1 Bar1
and some more text.
+!! html/parsoid +
This is an example image thumbnail caption with a table + + + + + +
FooBar
Foo1Bar1
and some more text.
+!! end + +!! test +T5090: External links other than http: in image captions +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|200x200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]] +!! html/php +
This caption has irc and Secure ext links in it.
+!! html/parsoid +
This caption has irc and Secure ext links in it.
+!! end + +!! test +Custom class +!! options +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|a|class=b]] +!! html/php +

a +

+!! html/parsoid +

+!! end + +!! test +Localized image handling (1). +!! options +parsoid=wt2html,wt2wt,html2html +language=es +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Archivo:Foobar.jpg|izquierda|enlace=foo|caption]] +!! html/php +
caption
caption
+!! html/parsoid +
caption
+!! end + +!! test +Localized image handling (2). +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +language=es +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Archivo:Foobar.jpg|miniatura|izquierda|enlace=foo|caption]] +!! html/php +
caption
+!! html/parsoid +
caption
+!! end + +!! test +Localized image handling (3). +!! options +language=fa +parsoid=html2wt +!! html/parsoid +
+!! wikitext +[[File:Foobar.jpg|بندانگشتی]] +!! end + +!! test +"border", "frameless" and "class" attributes on an image. +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|frameless|border|class=extra|caption]] +!! html/php +

caption +

+!! html/parsoid +

+!! end + +# Note that 'right' is the default alignment, despite the misspelled 'righ' below +!! test +Invalid image attributes (T64500) +!! options +thumbsize=220 +parsoid=wt2html,wt2wt,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|float|left|caption]] + +[[File:Foobar.jpg|thumb|righ|caption]] + +[[File:Foobar.jpg|bogus1|thumb|bogus2|left|bogus3|caption]] +!! html/php +
caption
+
caption
+
caption
+!! html/parsoid +
caption
+
caption
+
caption
+!! end + +!! article +File:Barfoo.jpg +!! text +#REDIRECT [[File:Barfoo.jpg]] +!! endarticle + +# FIXME: Parsoid should run this test -- but we'd need to teach the +# mockAPI about the redirected Barfoo.jpg image. +!! test +Redirected image +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:Barfoo.jpg]] +!! html/php +

File:Barfoo.jpg +

+!! end + +## FIXME: Parsoid needs to learn about this flag. +!! test +Missing image with uploads disabled +!! options +wgEnableUploads=0 +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobaz.jpg]] +!! html/php +

File:Foobaz.jpg +

+!! html/parsoid +

File:Foobaz.jpg

+!! end + +# Parsoid-specific testing for images +# https://www.mediawiki.org/wiki/Specs/HTML#Images +# Currently imperfect due to a flaw in the Parsoid testrunner +# Work in progress +# THESE TESTS SHOULD BE MOVED UP and merged with the php-specific +# image tests. + +!! test +Parsoid-specific image handling - simple image with size and middle alignment +!! wikitext +[[File:Foobar.jpg|middle|50px]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - simple image with size, middle alignment, non-standard namespace alias +!! options +parsoid=wt2wt,wt2html,html2html +!! wikitext +[[Image:Foobar.jpg|middle|50px]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - simple image with size and middle alignment (existing content) +!! wikitext +[[File:Foobar.jpg|50px|middle]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - simple image with size and middle alignment and non-standard namespace name +!! options +parsoid=wt2html,wt2wt,html2html +!! wikitext +[[Image:Foobar.jpg|50px|middle]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - simple image with both sizes, a baseline alignment, and a caption +!! wikitext +[[File:Foobar.jpg|500x10px|baseline|caption]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - simple image with border and size spec +!! wikitext +[[File:Foobar.jpg|50px|border|caption]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - thumbnail with halign, valign, and caption +!! options +parsoid=wt2html,html2html +!! wikitext +[[File:Foobar.jpg|left|baseline|thumb|caption content]] +!! html/parsoid +
caption content
+!! end + +!! test +Parsoid-specific image handling - thumbnail with halign, valign, and caption (existing content) +!! options +parsoid=wt2html,html2html +!! wikitext +[[File:Foobar.jpg|thumb|left|baseline|caption content]] +!! html/parsoid +
caption content
+!! end + +!! test +Parsoid-specific image handling - thumbnail with specific size, halign, valign, and caption +!! options +parsoid=wt2html,html2html +!! wikitext +[[Image:Foobar.jpg|right|middle|thumb|50x50px|caption]] +!! html/parsoid +
caption
+!! end + +!! test +Parsoid-specific image handling - thumbnail with specific size, halign, valign, and caption (existing content) +!! options +parsoid=wt2html,html2html +!! wikitext +[[File:Foobar.jpg|thumb|50x50px|right|middle|caption]] +!! html/parsoid +
caption
+!! end + +!! test +Parsoid-specific image handling - framed image with specific size and caption (size is ignored) +!! options +parsoid=wt2html,wt2wt,html2html +!! wikitext +[[File:Foobar.jpg|frame|500x50px|caption]] +!! html/parsoid +
caption
+!! end + +!! test +Parsoid-specific image handling - framed image with specific size, halign, valign, and caption (size is ignored) +!! options +parsoid=wt2html,html2html +!! wikitext +[[File:Foobar.jpg|left|baseline|frame|500x50px|caption]] +!! html/parsoid +
caption
+!! end + +!! test +Parsoid-specific image handling - frameless image with specific size, border, and caption +!! wikitext +[[File:Foobar.jpg|frameless|442x50px|border|caption]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - simple image with a formatted caption +!! wikitext +[[File:Foobar.jpg|
ab
c
]] +!! html/parsoid +

+!! end + +!! test +Parsoid-specific image handling - caption with a template in it +!! wikitext +[[File:Foobar.jpg|thumb|200x23px|This caption has a {{1x|transclusion}} in it.]] +!! html/parsoid +
This caption has a transclusion in it.
+!! end + +!! test +Parsoid-specific image handling - caption with unbalanced tags in it +!! options +parsoid=wt2html,wt2wt,html2html +!! wikitext +foo +[[File:Foobar.jpg|thumb|200x200px|This caption has a
unbalanced tag in it.]] +bar +!! html/parsoid +

foo

+
This caption has a
unbalanced tag in it.
+

bar

+!! end + +!! test +Parsoid-specific image handling - empty caption (1) +!! options +parsoid=wt2html,wt2wt +!! wikitext +[[File:Foobar.jpg|thumb|]] +!! html/parsoid +
+!! end + +# empty captions don't get serialized unless we're in the "round trip" case +!! test +Parsoid-specific image handling - empty caption (2) +!! options +parsoid=html2wt +!! html/parsoid +
+ + + +
+
+!! wikitext +[[File:Foobar.jpg|thumb]] +!! end + +!! test +Parsoid-specific image handling - whitespace caption +!! wikitext +[[File:Foobar.jpg|thumb| ]] +!! html/parsoid +
+!! end + +!! test +Parsoid-specific image handling - lang option +!! wikitext +foo +[[File:Foobar.svg|lang=de|caption]] +bar +!! html/parsoid +

foo + +bar

+!! end + +!! test +File containing double quotes and spaces +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Cool "Gator".png]] +!! html/php+tidy +

File:Cool "Gator".png +

+!! html/parsoid +

File:Cool "Gator".png

+!! end + +!! test +File containing single quotes +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foo's ''italic'' bar.jpg]] +[[File:Foo's ''italic'' bar.jpg|Foo's ''italic'' bar]] +!! html/php+tidy +

File:Foo's italic bar.jpg +File:Foo's italic bar.jpg +

+!! end + +!! test +Broken image links with HTML captions (T41700) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Nonexistent|]] +[[File:Nonexistent|100x100px|]] +[[File:Nonexistent|<]] +[[File:Nonexistent|abc]] +!! html/php +

File:Nonexistent +File:Nonexistent +File:Nonexistent +File:Nonexistent +

+!! html/parsoid +

File:Nonexistent +File:Nonexistent +File:Nonexistent +File:Nonexistent

+!! end + +!! test +Media in wikilink +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Test|[[File:Foobar.jpg]]]] +!! html/php +

[[Test|Foobar.jpg]] +

+!! html/parsoid +

[[Test|]]

+!! end + +!! test +Template with thumb image (with link in description) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +{{paramtest|param=[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption]]]]}} +!! html/php+untidy +This is a test template with parameter
File:Noimage.png
link caption
+!! html+tidy +

This is a test template with parameter

File:Noimage.png
link caption
+!! html/parsoid +

This is a test template with parameter

File:Noimage.png
link caption
+!! end + +!! test +T3219 URL next to image (good) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +http://example.com [[File:Foobar.jpg]] +!! html/php +

http://example.com Foobar.jpg +

+!! html/parsoid +

http://example.com

+!!end + +!! test +T3219 URL next to image (broken) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +http://example.com[[File:Foobar.jpg]] +!! html/php +

http://example.comFoobar.jpg +

+!! html/parsoid +

http://example.com

+!! end + +!! test +Image link to nonexistent file (T3850 - good) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:No_such.jpg]] +!! html/php +

File:No such.jpg +

+!! html/parsoid +

File:No such.jpg

+!! end + +!! test +:Image link to nonexistent file (T3850 - bad) +!! wikitext +[[:Image:No such.jpg]] +!! html/php +

Image:No such.jpg +

+!! html/parsoid +

Image:No such.jpg

+!! end + +!! test +Fuzz testing: image with bogus manual thumbnail +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|thumbnail= ]] +!! html/php +
Error creating thumbnail:
+!! html/parsoid +
File:Foobar.jpg
+!! end + +!! test +Gallery with valid attributes +!! wikitext + +File:File:Foobar.jpg + +!! html/php +
    +
  • +
    File:Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid + +!! end + +## Parsoid thinks the "centre" here is a property, not a caption. +!! test +Gallery +!! options +parsoid={ + "modes": ["wt2html"] +} +!! wikitext + +image1.png | +image2.gif||||| + +image3| +image4 |300px| centre + image5.svg| http:///////// +[[x|xx]]]] +* image6 + +!! html/php +
    +
  • +
    Image1.png
    +
    +
    +
    • +
  • +
    Image2.gif
    +
    +
    +
    • +
  • +
    Image3
    +
    +
    +
    • +
  • +
    Image4
    +
    +
    centre
+
    +
    +
    • +
  • +
    Image5.svg
    +
    +

    http:///////// +

    +
    +
    • +
  • +
    * image6
    +
    +
    +
    • +
+!! html/parsoid + +!! end + +!! test +Gallery (with options, html) +!! options +parsoid={ + "modes": ["wt2html", "html2html"] +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Nonexistent.jpg|caption +File:Nonexistent.jpg +image:foobar.jpg|some '''caption''' [[Main Page]] +image:foobar.jpg +image:foobar.jpg|Blabla|alt=This is a foo-bar.|blabla. + +!! html/php +
    +
  • Foo Main Page
    • +
  • +
    Nonexistent.jpg
    +
    +

    caption +

    +
    +
    • +
  • +
    Nonexistent.jpg
    +
    +
    +
    • +
  • +
    +
    +

    some caption Main Page +

    +
    +
    • +
  • +
    Foobar.jpg
    +
    +
    +
    • +
  • +
    This is a foo-bar.
    +
    +

    blabla. +

    +
    +
    • +
+!! html/parsoid + +!! end + +## FIXME: This test can be dropped when Parsoid content versions 2.0.0 / 1.8.0 +## are no longer in storage. +!! test +Gallery (with options, extsrc) +!! options +parsoid=html2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Nonexistent.jpg|caption +File:Nonexistent.jpg +image:foobar.jpg|some '''caption''' [[Main Page]] +image:foobar.jpg +image:foobar.jpg|Blabla|alt=This is a foo-bar.|blabla. + +!! html/php +
    +
  • Foo Main Page
    • +
  • +
    Nonexistent.jpg
    +
    +

    caption +

    +
    +
    • +
  • +
    Nonexistent.jpg
    +
    +
    +
    • +
  • +
    +
    +

    some caption Main Page +

    +
    +
    • +
  • +
    Foobar.jpg
    +
    +
    +
    • +
  • +
    This is a foo-bar.
    +
    +

    blabla. +

    +
    +
    • +
+!! html/parsoid + +!! end + +!! test +Gallery (without px units) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid +
    +
    • +
+!! end + +!! test +Gallery (with invalid units) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid +
    +
    • +
+!! end + +!! test +Gallery with link that has fragment +!! options +parsoid={ + "modes": ["wt2html", "html2html"] +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +image:foobar.jpg|link=Main_Page +image:foobar.jpg|link=Main_Page#section +image:foobar.jpg|link=Main Page#section|caption + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
  • +
    Foobar.jpg
    +
    +
    +
    • +
  • +
    +
    +

    caption +

    +
    +
    • +
+!! html/parsoid +
    +
    • +
    • +
  • caption
    • +
+!! end + +!! test +Gallery with template inside caption +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|{{1x|ho}} + +!! html/php +
    +
  • hi
    • +
  • +
    +
    +

    ho +

    +
    +
    • +
+!! html/parsoid +
    +
  • hi
    • +
  • ho
    • +
+!! end + +!! test +Gallery with wikitext inside gallery caption +!! options +parsoid={ + "modes": ["wt2html", "html2html"] +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|Image caption + +!! html/php +
    +
  • # This should not be a list item Text bold link Special
    File in gallery caption
    • +
  • +
    +
    +

    Image caption +

    +
    +
    • +
+!! html/parsoid +
    +
  • # This should not be a list item Text bold link -1
    File in gallery caption
    • +
  • Image caption
    • +
+!! end + +!! test +Gallery with wikitext inside caption +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|alt=galleryalt|[[File:Foobar.jpg|alt=inneralt|20x20px|desc]] +File:Foobar.jpg|alt=galleryalt|{{Test|unamedParam|alt=param}} + +!! html/php +
    +
  • +
    galleryalt
    +
    +

    inneralt +

    +
    +
    • +
  • +
    galleryalt
    +
    +

    This is a test template +

    +
    +
    • +
+!! html/parsoid +
    +
  • galleryalt
    inneralt
    • +
  • galleryalt
    This is a test template
    • +
+!! end + +!! test +Gallery with wikitext incl bogus HTML tag (T237318) +!! options +parsoid=wt2html,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg| + +!! html/php+tidy +
    +
  • +
    +
    +

    </ref> +

    +
    +
    • +
+!! html/parsoid +
    +
  • </ref>
    • +
+!! end + +!! test +Gallery (with showfilename option) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Nonexistent.jpg|caption +File:Nonexistent.jpg +File:Foobar.jpg|some '''caption''' [[Main Page]] +File:Foobar.jpg + +!! html/php + +!! html/parsoid + +!! end + +## Should Parsoid be preserving these variations? See T151367 +!! test +Gallery (with namespace-less filenames) +!! options +parsoid={ + "modes": ["wt2html", "html2html"] +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Nonexistent.jpg +Nonexistent.jpg +image:foobar.jpg +foobar.jpg + +!! html/php +
    +
  • +
    Nonexistent.jpg
    +
    +
    +
    • +
  • +
    Nonexistent.jpg
    +
    +
    +
    • +
  • +
    Foobar.jpg
    +
    +
    +
    • +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid + +!! end + +!! test +Gallery override link with wikilink (T36852) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|alt=galleryalt|link=Wikilink + +!! html/php +
    +
  • +
    galleryalt
    +
    +
    +
    • +
+!! html/parsoid +
    +
  • galleryalt
    • +
+!! end + +!! test +Gallery override link with absolute external link (T36852) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|alt=galleryalt|link=http://www.example.org + +!! html/php +
    +
  • +
    galleryalt
    +
    +
    +
    • +
+!! html/parsoid +
    +
  • galleryalt
    • +
+!! end + +## Putting the caption at the end here runs into T49646 on the php side +## so reducing the modes this runs in Parsoid +!! test +Gallery override link with absolute external link with LanguageConverter +!! options +language=zh +parsoid=wt2html,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:foobar.jpg|caption|alt=galleryalt|link=http://www.example.org + +!! html/php +
    +
  • +
    galleryalt
    +
    +

    caption +

    +
    +
    • +
+!! html/parsoid +
    +
  • galleryalt
    caption
    • +
+!! end + +!! test +Gallery override link with malicious javascript (T36852) +!! options +parsoid={ + "modes": ["wt2html", "html2html"] +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|alt=galleryalt|link=" onclick="alert('malicious javascript code!'); + +!! html/php +
    +
  • +
    galleryalt
    +
    +
    +
    • +
+!! html/parsoid +
    +
  • galleryalt
    • +
+!! end + +!! test +Gallery with invalid title as link (T45964) +!! options +parsoid={ + "modes": ["wt2html", "html2html"] +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|link=< + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid +
    +
    • +
+!! end + +!! test +Serialize gallery without attrs in data-mw +!! options +parsoid={ + "modes": ["html2wt"] +} +!! html/parsoid +
    +
  • 123
    • +
  • File:Test.png
    • +
+!! wikitext + +File:Test.png + +!! end + +!! test +Gallery with class and style attributes +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid +
    +
    • +
+!! end + +!! test +Gallery in nolines mode +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|foo + +!! html/php +
    +
  • No Lines!
    • +
  • +
    +
    +

    foo +

    +
    +
    • +
+!! html/parsoid +
    +
  • No Lines!
    • +
  • foo
    • +
+!! end + +!! test +Gallery in slideshow mode +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid +
    +
    • +
+!! end + +!! test +Gallery in packed mode +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg + +!! html/php +
    +
  • +
    Foobar.jpg
    +
    +
    +
    • +
+!! html/parsoid +
    +
    • +
+!! end + +!! test +Gallery in packed-overlay mode +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|foo + +!! html/php +
    +
  • Packed Overlay!
    • +
  • +
    +
    +

    foo +

    +
    +
    • +
+!! html/parsoid +
    +
  • Packed Overlay!
    • +
  • foo
    • +
+!! end + +!! test +Gallery in packed-hover mode +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|foo + +!! html/php +
    +
  • Packed Hover!
    • +
  • +
    +
    +

    foo +

    +
    +
    • +
+!! html/parsoid +
    +
  • Packed Hover!
    • +
  • foo
    • +
+!! end + +!! test +Serialize gallery image captions on a line +!! options +parsoid={ + "modes": ["html2wt"] +} +!! html/parsoid +
    +

  • hi

    ho

    • +
  • hi
    ho
    • +
+!! wikitext + +File:Foobar.jpg| hi ho +File:Foobar.jpg|hi
ho + +!! end + +!! test +Centre-aligned image +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|centre]] +!! html/php +
Foobar.jpg
+!! html/parsoid +
+!! end + +!! test +None-aligned image +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|none]] +!! html/php +
Foobar.jpg
+!! html/parsoid +
+!! end + +!! test +Width + Height sized image (using px) (height is ignored) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|640x480px]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Width-sized image (using px, no following whitespace) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|640px]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Width-sized image (using px, with following whitespace - test regression from r39467) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg|640px ]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Width-sized image (using px, with preceding whitespace - test regression from r39467) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:foobar.jpg| 640px]] +!! html/php +

Foobar.jpg +

+!! html/parsoid +

+!! end + +!! test +Image with page parameter +!! options +djvu +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:LoremIpsum.djvu]] + +[[File:LoremIpsum.djvu|page=2]] +!! html/php +

LoremIpsum.djvu +

LoremIpsum.djvu +

+!! html/parsoid +

+

+!! end + +!! test +Image with page parameter generated by a template +!! options +djvu +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:LoremIpsum.djvu|page={{1x|2}}]] +!! html/php +

LoremIpsum.djvu +

+!! html/parsoid +

+!! end + +!! test +Image with modified page parameter; serialize href query not data-mw +!! options +djvu +parsoid={ + "modes": ["wt2wt", "selser"], + "changes": [ + ["a[href]", "attr", "href", "./File:LoremIpsum.djvu?page=3"] + ] +} +!! wikitext +[[File:LoremIpsum.djvu|page 2]] + +[[File:LoremIpsum.djvu|page {{1x|2}}]] +!! wikitext/edited +[[File:LoremIpsum.djvu|page 3]] + +[[File:LoremIpsum.djvu|page 3]] +!! end + +# This tests for RESTBase content backward-compatibility; +# the output should change when T259931 has been resolved (the page +# parameter should be removed in the wikitext/edited section) +!! test +Image with modified page parameter; serialize href query not data-mw (2) +!! options +djvu +parsoid={ + "modes": ["wt2wt", "selser"], + "changes": [ + ["a[href]", "attr", "href", "./File:LoremIpsum.djvu"] + ] +} +!! wikitext +[[File:LoremIpsum.djvu|page 2]] + +[[File:LoremIpsum.djvu|page {{1x|2}}]] +!! wikitext/edited +[[File:LoremIpsum.djvu|page 2]] + +[[File:LoremIpsum.djvu|page {{1x|2}}]] +!! end + +# Images with the "|" character in external URLs in comment tags; Eats half the comment, leaves unmatched "" tag. +!! test +Images with the "|" character in the comment +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|An [http://test/?param1=|left|¶m2=|x external] URL]] +!! html/php +
An external URL
+!! html/parsoid +
An external URL
+!! end + +!! test +T146305: Don't break image parsing if language converter markup is in the caption. +!! options +language=sr +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Датотека:Foobar.jpg|thumb|-{R|caption:}-]] +!! html/php +
caption:
+!! html/parsoid +
+!! end + +!! test +T146305: Don't break image parsing if nested language converter markup is in the caption. +!! options +language=zh variant=zh-cn +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|-{|zh-cn:blog (hk: -{zh-hans|WEBJOURNAL}-, tw: -{zh-hans|WEBLOG}-)}-]] +!! html/php +
blog (hk: WEBJOURNAL, tw: WEBLOG)
+!! html/parsoid +
+!! end + +# XXX html2wt disabled because rich markup in alt is not preserved. +!! test +Don't break gallery if language converter markup is inside. +!! options +language=zh +parsoid=wt2html,html2html +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext + +File:Foobar.jpg|alt=-{R|bat}-|[[File:foobar.jpg|20px|desc|alt=-{R|foo}-|-{R|bar}-]] +File:Foobar.jpg|alt=galleryalt|{{Test|unamedParam|alt=-{R|param}-}} + +!! html/php +
    +
  • +
    bat
    +
    +

    foo +

    +
    +
    • +
  • +
    galleryalt
    +
    +

    This is a test template +

    +
    +
    • +
+!! html/parsoid +
    +
    • +
  • galleryalt
    This is a test template
    • +
+!! end + +!! test +Free external link invading image caption +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[Image:Foobar.jpg|thumb|http://x|hello]] +!! html/php +
hello
+!! html/parsoid +
hello
+!! end + +!! test +Special characters in embedded file links (T29679) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Contains & ampersand.jpg]] +[[File:Does not exist.jpg|Title with & ampersand]] +!! html/php +

File:Contains & ampersand.jpg +File:Does not exist.jpg +

+!! html/parsoid +

File:Contains & ampersand.jpg +File:Does not exist.jpg

+!! end + +# T65642/T68749: Formatting elt fixup around images. +# We know wt2wt will fail, but we expect selser to pass. +# Due to the nature of our testing, wt2wt and selser tests will enter the +# banned list and we'll catch selser regressions based on changes to the +# banned list entries for selser tests. +!! test +1. Treebuilder fixup of formatting elt +!! options +parsoid=wt2html,wt2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +{| +| + +[[Image:Foobar.jpg|right|Test]] + +|} +!! html/php+tidy + + +
+

+

+
Test
Test
+

+

+
+!! html/parsoid + + +
+

+
Test
 +

+!! end + +!! test +2. Treebuilder fixup of formatting elt +!! options +parsoid=wt2html,wt2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +'''foo[[File:Foobar.jpg|thumb|caption]]bar''' + +[[Image:Foobar.jpg|right|300px]] +!! html/php+tidy +

foo

caption

bar +

Foobar.jpg
 +!! html/parsoid +

foo

caption

bar

+ +
 +!! end + +!! test +3. Treebuilder fixup of formatting elt +!! options +parsoid=wt2html,wt2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +'''foo[[File:Foobar.jpg|thumb|caption]]bar''' +!! html/php+tidy +

foo

caption

bar

+!! html/parsoid +

foo

caption

bar

+!! end + +!! test +4. Treebuilder fixup of formatting elt: formatting tags around captionless images +!! options +parsoid=wt2html,wt2wt +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +'''[[Image:Foobar.jpg|right|300px]]''' +!! html/php+tidy +
Foobar.jpg
 +!! html/parsoid +
 +!! end + +!! test +Image: Modifying size of an image (1) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["img[height]", "attr", "height", "22"], + ["img[width]", "attr", "width", "200"] + ] +} +!! wikitext +[[Image:Foobar.jpg|230x230px]] +!! wikitext/edited +[[Image:Foobar.jpg|200x200px]] +!!end + +!! test +Image: Modifying size of an image (2) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["img[height]", "attr", "height", "100"], + ["img[width]", "attr", "width", "500"] + ] +} +!! wikitext +[[Image:Foobar.jpg|230x230px]] +!! wikitext/edited +[[Image:Foobar.jpg|500x500px]] +!!end + +# Change in size is ignored so long as class='mw-default-size' +!! test +Image: Modifying size of an image (3) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["figure[class]", "removeClass", "mw-default-size"], + ["figure img", "attr", "height", "19"], + ["figure img", "attr", "width", "170"] + ] +} +!! wikitext +[[Image:Foobar.jpg|thumb]] +!! wikitext/edited +[[Image:Foobar.jpg|thumb|170x170px]] +!!end + +!! test +Image: Modifying alignment of an image (T50665) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["figure[class]", "removeClass", "mw-halign-right"], + ["figure[class]", "addClass", "mw-halign-left"] + ] +} +!! wikitext +[[Image:Foobar.jpg|thumb|caption|right]] +!! wikitext/edited +[[Image:Foobar.jpg|thumb|caption|left]] +!! end + +!! test +Image: Modifying mw-default-size of an frameless image (T64805) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["figure.mw-default-size", "removeClass", "mw-default-size"] + ] +} +!! wikitext +[[Image:Foobar.jpg|frameless|right]] +!! wikitext/edited +[[Image:Foobar.jpg|frameless|right|220x220px]] +!! end + +!! test +Image: Modifying valign of an image (T51221) +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["*[typeof=\"mw:Image\"]", "removeClass", "mw-valign-middle"], + ["*[typeof=\"mw:Image\"]", "addClass", "mw-valign-text-top"] + ] +} +!! wikitext +[[File:Foobar.jpg|20px|middle]] +!! wikitext/edited +[[File:Foobar.jpg|20px|text-top]] +!! end + +!! test +Image: Modifying alt attribute of an image (T58400) +!! options +disabled +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["img[alt]", "attr", "alt", "some alternate edited text"] + ] +} +!! wikitext +[[File:Foobar.jpg|thumb|some caption|alt=some alternate text]] +!! wikitext/edited +[[File:Foobar.jpg|thumb|some caption|alt=some alternate edited text]] +!!end + +!! test +Image: Modifying caption of an image +!! options +parsoid={ + "modes": ["wt2wt"], + "changes": [ + ["figcaption", "text", "new caption"] + ] +} +!! wikitext +[[Image:Foobar.jpg|thumb|original caption]] +!! wikitext/edited +[[Image:Foobar.jpg|thumb|new caption]] +!!end + +!! test +Image: empty alt attribute (T50924) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|alt=|bar]] +!! html/php+tidy +
bar
+!! html/parsoid +
bar
+!! end + +!! test +Image: new attributes should be serialized in wiki's language for RTL languages (T53852) +!! options +parsoid=html2wt +language=ar +disabled +!! html/parsoid +
+!! wikitext +[[Imagen:Foobar.jpg|derecha|miniaturadeimagen]] +!! end + +!! test +Image: Block level image should have \n before and after +!! wikitext +123 +[[File:Foobar.jpg|right|thumb|150x150px]] +456 +!! html/parsoid +

123

+
+

456

+!! end + +!! test +Image: New block level image should have \n before and after (existing content) +!! wikitext +123 +[[File:Foobar.jpg|right|thumb|150x150px]] +456 +!! html/parsoid +

123

+
+

456

+!! end + +!! test +Image: upright option (parsoid) +!! wikitext +[[File:Foobar.jpg|thumb|upright|caption]] +[[File:Foobar.jpg|thumb|upright=0.5|caption]] +[[File:Foobar.jpg|thumb|500x500px|upright=0.5|caption]] +!! html/parsoid +
caption
+
caption
+
caption
+!! end + +!! test +Image: upright option is ignored on inline and frame images (parsoid) +!! wikitext +[[File:Foobar.jpg|500x500px|upright=0.5|caption]] +!! html/parsoid +

+!! end + +!! test +Image: in template parameter with empty parameter +!! wikitext +{{1x|[[File:Foobar.jpg|link=]]}} +!! html/parsoid +

+!! end + +!! test +Image: from basic HTML (1) +!! options +parsoid=html2wt +!! html/parsoid + + Alt + +!! wikitext +[[File:Foobar.jpg|link=|alt=Alt|100x100px]] +!! end + +!! test +Image: from basic HTML (2) +!! options +parsoid=html2wt +!! html/parsoid +Alt +!! wikitext +[[File:Foobar.jpg|link=|alt=Alt|100x100px]] +!! end + +!! test +Image: from basic HTML (3) +!! options +parsoid=html2wt +!! html/parsoid +Alt +!! wikitext +[[File:Foobar.jpg|link=Main|alt=Alt|100x100px]] +!! end + +!! test +Image: from basic HTML (4) +!! options +parsoid=html2wt +!! html/parsoid + +!! wikitext +[[File:Foobar.jpg|link=]] +!! end + +!! test +Image: Invalid title as link +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=<]] +!! html/php +

link=< +

+!! html/parsoid +

+!! end + +!! test +Various link types in alt and link options +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|link=[[Main Page]]|alt=[[Main Page]]|caption]] + +[[File:Foobar.jpg|link=[[Media:Thumb.png]]|alt=[[Media:Thumb.png]]|caption]] + +[[File:Foobar.jpg|link=[[wikipedia:Foo]]|alt=[[wikipedia:Foo]]|caption]] +!! html/php+tidy +

Main Page +

Media:Thumb.png +

wikipedia:Foo +

+!! html/parsoid +

Main Page

+ +

Media:Thumb.png

+ +

wikipedia:Foo

+!! end + +!! test +Magic links inside image captions (autolinked) +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|http://example.com]] +[[File:Foobar.jpg|thumb|RFC 1234]] +[[File:Foobar.jpg|thumb|PMID 1234]] +[[File:Foobar.jpg|thumb|ISBN 123456789x]] +!! html+tidy +
http://example.com
+
RFC 1234
+
PMID 1234
+
ISBN 123456789x
+!! html/parsoid +
http://example.com
+
RFC 1234
+
PMID 1234
+
ISBN 123456789x
+!! end + +!! test +Interwiki links inside image captions +!! options +language=de +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Foobar.jpg|thumb|right|[[:Wikipedia:Foo]] bar]] +!! html+tidy +
Wikipedia:Foo bar
+!! html/parsoid +
Wikipedia:Foo bar
+!! end + +## Don't necessarily expect this to roundtrip, but run serialization to catch crashers +!! test +File in link scenarios +!! options +parsoid={ + "modes": ["wt2html","html2wt"], + "suppressErrors": true +} +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[http://www.google.com [[File:Foobar.jpg|123]]] + +[http://www.google.com [[File:Foobar.jpg|thumb|123]]] +!! html/php+tidy +

123 +

+
123
+!! html/parsoid +

+ +
123
+!! end + +!! test +Thumbnail output +!! config +wgParserEnableLegacyMediaDOM=false +!! wikitext +[[File:Thumb.png|thumb]] +!! html/php+tidy +
Thumb.png
+!! html/parsoid +
+!! end diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 677853b1fab..77717ef8cfe 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -8622,6 +8622,8 @@ Link containing double-single-quotes '' in text embedded in italics (T6598 sanit ## FIXME: Title part of filename is interpreted in php !! test Link with double quotes in title part (literal) and alternate part (interpreted) +!! config +wgParserEnableLegacyMediaDOM=false !! wikitext [[File:Denys_Savchenko_''Pentecoste''.jpg]] @@ -8631,7 +8633,7 @@ Link with double quotes in title part (literal) and alternate part (interpreted) [[''Pentecoste''|''Pentecoste'']] !! html/php -

File:Denys Savchenko Pentecoste.jpg +

File:Denys Savchenko Pentecoste.jpg

''Pentecoste''

Pentecoste

Pentecoste @@ -18383,13 +18385,15 @@ all additional text is vanished Language converter glossary rules inside attributes (T119158) !! options language=sr variant=sr-el +!! config +wgParserEnableLegacyMediaDOM=false !! wikitext -{H|foAjrjvi=>sr-el:" onload="alert(1)" data-foo="}- [[File:Foobar.jpg|alt=-{}-foAjrjvi-{}-]] !! html/php

-

" onload="alert(1)" data-foo=" +

" onload="alert(1)" data-foo="

!! html/parsoid

@@ -22904,6 +22908,8 @@ name= Page status indicators: Torture test !! options showindicators +!! config +wgParserEnableLegacyMediaDOM=false !! wikitext hello world [[Main Page]] @@ -22923,8 +22929,8 @@ paragraphs !! html/php 01=hello world 02=Main Page -03=Foobar.jpg -04=Foobar.jpg +03=Foobar.jpg +04=Foobar.jpg 05=
  • foo
  • bar
06=foo @@ -23067,6 +23073,8 @@ Strip reserved data attributes !! test percent-encoding and + signs in internal links (T28410) +!! config +wgParserEnableLegacyMediaDOM=false !! wikitext [[User:+%]] [[Page+title%]] [[%+]] [[%+|%20]] [[%+ ]] [[%+r]] @@ -23075,7 +23083,7 @@ percent-encoding and + signs in internal links (T28410) !! html/php

User:+% Page+title% %+ %20 %+ %+r -% + bar +% + File:%+abc9 3E 3E+

!! html/parsoid @@ -23255,6 +23263,8 @@ __TOC__ T35845: Headings become cursive in TOC when they contain an image !! options title=[[Main Page]] +!! config +wgParserEnableLegacyMediaDOM=false !! wikitext __TOC__ ==Image [[Image:foobar.jpg]]== @@ -23265,7 +23275,7 @@ __TOC__ -

Image Foobar.jpg[edit]

+

Image Foobar.jpg[edit]

!! html/parsoid

Image

diff --git a/tests/phpunit/ResourceLoaderTestCase.php b/tests/phpunit/ResourceLoaderTestCase.php index b74e695617b..c9dd520a286 100644 --- a/tests/phpunit/ResourceLoaderTestCase.php +++ b/tests/phpunit/ResourceLoaderTestCase.php @@ -69,7 +69,7 @@ abstract class ResourceLoaderTestCase extends MediaWikiIntegrationTestCase { 'Logos' => false, 'Logo' => '/logo.png', 'ResourceBasePath' => '/w', - 'UseNewMediaStructure' => false, + 'ParserEnableLegacyMediaDOM' => true, // For ResourceLoaderStartUpModule and ResourceLoader::__construct() 'ScriptPath' => '/w', diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php index 52e4241f5b1..4ca640ddf6b 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderSkinModuleTest.php @@ -199,7 +199,7 @@ CSS $module->expects( $this->once() )->method( 'getLogoData' ) ->willReturn( $logo ); $module->setConfig( new HashConfig( [ - 'UseNewMediaStructure' => true, + 'ParserEnableLegacyMediaDOM' => false, ] + self::getSettings() ) ); $ctx = $this->getMockBuilder( ResourceLoaderContext::class )