-
!! end
# The expected HTML structure in this test is debatable. The PHP parser does
@@ -7396,7 +7300,6 @@ a
a
-
!! html/php+tidy
@@ -7423,7 +7326,6 @@ parsoid=wt2html,html2html
a
-
!! html/php+tidy
a
@@ -7477,8 +7379,7 @@ parsoid=wt2html,wt2wt
baz
-
quux
-
+
quux
!! end
!! test
@@ -7519,7 +7420,6 @@ parsoid=wt2html,wt2wt
baz
quux
-
!! html/parsoid
foo
bar
@@ -9686,8 +9586,7 @@ Handling html with a div self-closing tag
-
-
+
!! html/parsoid
@@ -9768,8 +9667,7 @@ foo
-foo
bar
-
+foo
bar
!! end
!! test
@@ -9778,7 +9676,6 @@ Horizontal ruler -- 4+ dashes render hr
----
!! html
-
!! end
!! test
@@ -9787,7 +9684,6 @@ Horizontal ruler -- eats additional dashes on the same line
---------
!! html
-
!! end
!! test
@@ -9798,7 +9694,6 @@ Horizontal ruler -- does not collapse dashes on consecutive lines
!! html
-
!! end
!! test
@@ -9816,10 +9711,8 @@ Horizontal ruler -- Supports content following dashes on same line
---- Foo
!! html
Foo
-
!! html+tidy
-
Foo
-
+
Foo
!! end
###
@@ -10115,12 +10008,10 @@ Multiple list tags generated by templates
-
!! html+tidy
a
b
-
c
-
+
c
!! html/parsoid
a
b
@@ -10234,8 +10125,7 @@ parsoid=wt2html,wt2wt
not a li-hack
-
-!!end
+!! end
!! test
Parsoid: Make sure nested lists are serialized on their own line even if HTML contains no newlines
@@ -10668,7 +10558,6 @@ parsoid={ "modes": ["wt2html","wt2wt"], "normalizePhp": true }
!! wikitext
{{SUBJECTSPACE}}
!! html/*
-
!! end
!! test
@@ -10930,7 +10819,6 @@ parsoid={ "modes": ["wt2html","wt2wt"], "normalizePhp": true }
!! wikitext
{{SCRIPTPATH}}
!! html/*
-
!! end
!! test
@@ -11089,7 +10977,6 @@ Namespace 0 {{ns:0}} (T6783)
!! wikitext
{{ns:0}}
!! html
-
!! end
!! test
@@ -11097,7 +10984,6 @@ Namespace 0 {{ns:00}} (T6783)
!! wikitext
{{ns:00}}
!! html
-
!! end
!! test
@@ -11673,7 +11559,6 @@ Template with thumb image (with link in description)
{{paramtest|param=[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption]]]]}}
!! html/php
This is a test template with parameter
-
!! end
# Uses same input as the contents of [[Template:Includeonly section]]
@@ -12188,7 +12067,6 @@ T8563: Edit link generation for section suppressed by
==Section 1==
!! html
-
!!end
## Parsoid drops empty elements in templates.
@@ -13223,7 +13094,6 @@ Templates: HTML Tag: 1. Generation of HTML attr. key
foo
!! html
foo
-
!!end
!!test
@@ -13232,7 +13102,6 @@ Templates: HTML Tag: 2. Generation of HTML attr. value
foo
!! html
foo
-
!!end
!!test
@@ -13241,7 +13110,6 @@ Templates: HTML Tag: 3. Generation of HTML attr key and value
foo
!! html
foo
-
!!end
!!test
@@ -13250,7 +13118,6 @@ Templates: HTML Tag: 4. Generation of starting piece of HTML attr value
foo
!! html
foo
-
!!end
!!test
@@ -13259,7 +13126,6 @@ Templates: HTML Tag: 5. Generation of middle piece of HTML attr value
foo
!! html
foo
-
!!end
!!test
@@ -13268,7 +13134,6 @@ Templates: HTML Tag: 6. Generation of end piece of HTML attr value
foo
!! html
foo
-
!!end
# SSS FIXME: While it is great we added support for all this,
@@ -13280,7 +13145,6 @@ Templates: HTML Tag: 7. Generation of partial attribute key string
foo
!! html
foo
-
!!end
!! test
@@ -13289,7 +13153,6 @@ Templates: HTML Tag: 8. Template-generated attribute (k=v)
bar
!! html
bar
-
!!end
!! test
@@ -13298,7 +13161,6 @@ Templates: HTML Tag: 9. Multiple template-generated attributes
bar
!! html
bar
-
!!end
!! test
@@ -13317,7 +13179,6 @@ Templates: Support for templates generating attributes and content
bar
-
!! html/parsoid
@@ -13351,7 +13212,6 @@ Table cell with attribute before expanded attribute
foo
!! html/php
foo
-
!! html/parsoid
foo
!! end
@@ -13367,7 +13227,6 @@ Table cell with attribute before expanded attribute
Foo
-
!! html/parsoid
Foo
@@ -13385,7 +13244,6 @@ Table cell with attribute before expanded attribute
Foo
-
!! html/parsoid
Foo
@@ -13404,7 +13262,6 @@ Table cell with attribute before expanded attribute
hi
-
!! html/parsoid
hi
@@ -13417,7 +13274,6 @@ Templates: HTML Tables: 1. Generating start of a HTML table
{{echo|
foo
}}
!! html
foo
-
!!end
!!test
@@ -13426,7 +13282,6 @@ Templates: HTML Tables: 2a. Generating middle of a HTML table
{{echo|
foo
}}
!! html
foo
-
!!end
!!test
@@ -13435,7 +13290,6 @@ Templates: HTML Tables: 2b. Generating middle of a HTML table
{{echo|
foo
}}
!! html
foo
-
!!end
!!test
@@ -13444,8 +13298,7 @@ Templates: HTML Tables: 3. Generating end of a HTML table
{{echo|
foo
}}
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 4a. Generating a single tag of a HTML table
@@ -13453,8 +13306,7 @@ Templates: HTML Tables: 4a. Generating a single tag of a HTML table
{{echo|
}}
foo
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 4b. Generating a single tag of a HTML table
@@ -13462,8 +13314,7 @@ Templates: HTML Tables: 4b. Generating a single tag of a HTML table
{{echo|
}}
foo
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 4c. Generating a single tag of a HTML table
@@ -13471,8 +13322,7 @@ Templates: HTML Tables: 4c. Generating a single tag of a HTML table
{{echo|
}}foo
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 4d. Generating a single tag of a HTML table
@@ -13480,8 +13330,7 @@ Templates: HTML Tables: 4d. Generating a single tag of a HTML table
foo{{echo|
}}
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 4e. Generating a single tag of a HTML table
@@ -13489,8 +13338,7 @@ Templates: HTML Tables: 4e. Generating a single tag of a HTML table
foo
{{echo|
}}
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 4f. Generating a single tag of a HTML table
@@ -13498,8 +13346,7 @@ Templates: HTML Tables: 4f. Generating a single tag of a HTML table
foo
{{echo|
}}
!! html
foo
-
-!!end
+!! end
!!test
Templates: HTML Tables: 5. Proper fostering of categories from inside
@@ -13529,7 +13376,6 @@ Templates: Wiki Tables: 1a. Fostering of entire template content
a
-
!! html/php+tidy
a
@@ -13555,7 +13401,6 @@ foo
-
!! html/php+tidy
foo
@@ -13584,7 +13429,6 @@ Templates: Wiki Tables: 2. Fostering of partial template content
a
b
-
!! html/php+tidy
a
@@ -13608,8 +13452,7 @@ Templates: Wiki Tables: 3. td-content via multiple templates
ab
-
-!!end
+!! end
!!test
Templates: Wiki Tables: 4. Templated tags, no content
@@ -13619,8 +13462,7 @@ Templates: Wiki Tables: 4. Templated tags, no content
!! html
-
-!!end
+!! end
!!test
Templates: Wiki Tables: 5. Templated tags, regular td-tags
@@ -13633,8 +13475,7 @@ Templates: Wiki Tables: 5. Templated tags, regular td-tags
foo
-
-!!end
+!! end
!!test
Templates: Wiki Tables: 6. Templated tags, templated td-tags
@@ -13647,8 +13488,7 @@ Templates: Wiki Tables: 6. Templated tags, templated td-tags
foo
-
-!!end
+!! end
## This test case is very specific to Parsoid's internals
## and is hence only tested for Parsoid's code. Parsoid uses
@@ -13741,10 +13581,8 @@ Templates: Ugly nesting: 4. Divs opened/closed across templates
a
b{{echo|c
d}}e
!! html
a
bc
de
-
!! html+tidy
-
a
bc
de
-
+
a
bc
de
!! end
!! test
@@ -14621,7 +14459,6 @@ Right-aligned image
[[File:Foobar.jpg|right]]
!! html/php
-
!! html/parsoid
!! end
@@ -14632,7 +14469,6 @@ Image with caption
[[File:Foobar.jpg|right|Caption text]]
!! html/php
-
!! html/parsoid
Caption text
!! end
@@ -14643,7 +14479,6 @@ Image with caption, T55312 #1
[[File:Foobar.jpg|right|Caption page stuff]]
!! html/php
-
!! html/parsoid
Caption text
!! end
@@ -14753,7 +14583,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|thumb|{{echo|137px}}|This is a caption]]
!! html/php
This is a caption
-
!! html/parsoid
This is a caption
!! end
@@ -14764,7 +14593,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|{{echo|thumb}}|{{echo|137px}}|This is a caption]]
!! html/php
This is a caption
-
!! html/parsoid
This is a caption
!! end
@@ -14788,7 +14616,6 @@ Image with multiple attributes from the same template
[[File:Foobar.jpg|{{image_attribs}}]]
!! html/php
-
!! html/parsoid
Caption text
!! end
@@ -14806,13 +14633,11 @@ thumbsize=220
123
456
123
456
-
!! html/php+tidy
123456
123
456
-123
456
-
+123
456
!! html/parsoid
123456
123
456
@@ -14825,7 +14650,6 @@ Image with multiple captions -- only last one is accepted
[[File:Foobar.jpg|right|Caption1 - ignored|[[Caption2]] - ignored|Caption3 - accepted]]
!! html/php
-
!! html/parsoid
Caption3 - accepted
!! end
@@ -14868,7 +14692,6 @@ Image with width attribute at different positions
-
!! html/parsoid
Title
!! end
@@ -15042,7 +14864,6 @@ thumbsize=220
[[File:Foobar.jpg|thumbnail=Thumb.png|Title]]
!! html/php
Title
-
!! html/parsoid
Title
!! end
@@ -15056,7 +14877,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|thumb=Thumb.png|link=Main_Page|Title]]
!! html/php
Title
-
!! html/parsoid
Title
!! end
@@ -15070,7 +14890,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|thumb=Thumb.png|link=http://example.com|Title]]
!! html/php
Title
-
!! html/parsoid
Title
!! end
@@ -15084,7 +14903,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|thumb=Thumb.png|link=|Title]]
!! html/php
Title
-
!! html/parsoid
Title
!! end
@@ -15098,7 +14916,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|thumb=Thumb.png|link=Main_Page|alt=alttext|Title]]
!! html/php
Title
-
!! html/parsoid
Title
!! end
@@ -15111,7 +14928,6 @@ parsoid=wt2html,wt2wt,html2html
[[File:Foobar.jpg|frame|left|This is a test image [[Main Page]]]]
!! html/php
-
!! html/parsoid
This is a test image Main Page
!! end
@@ -15124,7 +14940,6 @@ parsoid=wt2html,wt2wt,html2html
[[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]|alt=Altitude]]
!! html/php
-
!! html/parsoid
This is a test image Main Page
!! end
@@ -15151,7 +14966,6 @@ Alt image option should handle most kinds of wikitext without barfing
[[Image:Foobar.jpg|thumb|This is the image caption|alt=This is a [[link]] and a {{echo|''bold template''}}.]]
!! html/php
This is the image caption
-
!! html/parsoid
This is the image caption
!! end
@@ -15586,7 +15400,6 @@ Image with heading and horizontal rule in caption
]]
!! html/php
-
!! html/parsoid
lang=invalid:language:code
!! end
@@ -15915,7 +15718,6 @@ T3887: A ISBN with a thumbnail
[[File:Foobar.jpg|thumb|ISBN 1235467890]]
!! html/php
-
!! html/parsoid
This is RFC 12354
!! end
@@ -15937,7 +15738,6 @@ T3887: A mailto link with a thumbnail
[[File:Foobar.jpg|thumb|Please mailto:nobody@example.com]]
!! html/php
-
!! html/parsoid
Please mailto:nobody@example.com
!! end
@@ -16060,7 +15860,6 @@ Image caption containing another image
[[File:Foobar.jpg|thumb|This is a caption with another [[File:Thumb.png|image]] inside it!]]
!! html/php
This is a caption with another inside it!
-
!! html/parsoid
This is a caption with another inside it!
!! end
@@ -16084,7 +15883,6 @@ Image: caption containing leading space
[[File:Foobar.jpg|thumb| bar]]
!! html/php
bar
-
!! html/parsoid
bar
!!end
@@ -16107,7 +15905,6 @@ parsoid=wt2html,wt2wt,html2html
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
@@ -16124,7 +15921,6 @@ T5090: External links other than http: in image captions
[[File:Foobar.jpg|thumb|200x200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]]
!! html/php
-
!! html/parsoid
This caption has irc and Secure ext links in it.
!! end
@@ -16151,7 +15947,6 @@ language=es
[[Archivo:Foobar.jpg|izquierda|enlace=foo|caption]]
!! html/php
-
-!!end
+!! end
!! test
Table attribute safety
@@ -18967,7 +18700,6 @@ Table attribute safety
status
-
!! end
!! test
@@ -18976,7 +18708,6 @@ CSS line continuation 1
!! html
-
!! end
!! test
@@ -18985,7 +18716,6 @@ CSS line continuation 2
!! html
-
!! end
!! article
@@ -19000,7 +18730,6 @@ Expansion of multi-line templates in attribute values (T8255)
-
!! html
-
-
!! end
!! test
@@ -19010,7 +18739,6 @@ Expansion of multi-line templates in attribute values (T8255 sanity check)
#00FF00">-
!! html/php
-
-
!! html/parsoid
-
@@ -19022,7 +18750,6 @@ Expansion of multi-line templates in attribute values (T8255 sanity check 2)
!! end
@@ -19301,7 +19016,6 @@ Goodbye
array (
)
-
!! end
###
@@ -19402,8 +19116,7 @@ parsoid=wt2html
!! wikitext
Table not started
!! html+tidy
-
Table not started
-
+
Table not started
!! end
!! test
@@ -19476,7 +19189,6 @@ Sanitizer: Validating that and work, but only for Microdata
-
!! end
!! test
@@ -19591,8 +19303,7 @@ Punctuation: CSS !important (T13874)
important
!! html
important
-
-!!end
+!! end
!! test
Punctuation: CSS ! important (T13874; with space after)
@@ -19600,8 +19311,7 @@ Punctuation: CSS ! important (T13874; with space after)
important
!! html
important
-
-!!end
+!! end
!! test
HTML bullet list, closed tags (T7497)
@@ -19615,13 +19325,11 @@ HTML bullet list, closed tags (T7497)
One
Two
-
!! html/parsoid
One
Two
-
!! end
!! test
@@ -19641,7 +19349,6 @@ HTML bullet list, unclosed tags (T7497)
One
Two
-
!! end
!! test
@@ -19656,13 +19363,11 @@ HTML ordered list, closed tags (T7497)
One
Two
-
!! html/parsoid
One
Two
-
!! end
!! test
@@ -19683,7 +19388,6 @@ HTML ordered list, unclosed tags (T7497)
One
Two
-
!! end
!! test
@@ -19708,7 +19412,6 @@ HTML nested bullet list, closed tags (T7497)
-
!! html/parsoid
One
@@ -19765,7 +19468,6 @@ HTML nested ordered list, closed tags (T7497)
-
!! end
!! test
@@ -19788,7 +19490,6 @@ HTML nested ordered list, open tags (T7497)
Sub-two
-
!! html/parsoid
One
@@ -19802,7 +19503,6 @@ HTML nested ordered list, open tags (T7497)
-
!! end
!! test
@@ -19813,7 +19513,6 @@ HTML ordered list item with parameters oddity
!! html
One
-
!! end
# parsoid doesn't explicitly mark autonumbered links, see T55505
@@ -19862,7 +19561,6 @@ Fuzz testing: Parser13
-
!! end
# Note that Parsoid output differs from the PHP parser here: the PHP
@@ -19881,7 +19579,6 @@ http://
-
!! end
!! test
@@ -19966,7 +19661,6 @@ http://===r:::https://b
-
!! end
## Remex doesn't account for fostered content.
@@ -19996,7 +19690,6 @@ MOVE YOUR MOUSE CURSOR OVER THIS TEXT
-
!! html/php+tidy
{{{|
@@ -20008,8 +19701,7 @@ MOVE YOUR MOUSE CURSOR OVER THIS TEXT
-
!! end
!! test
@@ -20656,8 +20339,7 @@ section=2
==sec1==
==sec2==
!! html/php
-
-!!end
+!! end
# Formerly testing for T4607, now resolved by the use of unmarked sections
# instead of respecting HTML-style headings
@@ -21280,7 +20962,6 @@ File:File:Foobar.jpg
-
!! html/parsoid
@@ -21343,7 +21024,6 @@ image4 |300px| centre
-
!! html/parsoid
@@ -21405,7 +21085,6 @@ image:foobar.jpg|Blabla|alt=This is a foo-bar.|blabla.
-
!! html/parsoid
!! end
@@ -22255,8 +21916,7 @@ dt/dd/dl test
!! html/parsoid
-
-!!end
+!! end
# Images with the "|" character in external URLs in comment tags; Eats half the comment, leaves unmatched "" tag.
!! test
@@ -22265,7 +21925,6 @@ Images with the "|" character in the comment
[[File:Foobar.jpg|thumb|An [http://test/?param1=|left|¶m2=|x external] URL]]
!! html/php
!! end
@@ -26072,8 +25682,7 @@ parsoid=html2wt
=====foo=====
======foo======
=======foo=======
-
-!!end
+!! end
!! test
Headings: 2. Outside heading nest on a single line
-
-!!end
+!! end
!!test
Non-empty attributes in th-cells
@@ -27976,8 +27565,7 @@ Non-empty attributes in th-cells
Foo
Bar
-
-!!end
+!! end
!!test
Accept empty attributes in th-cells
@@ -27991,8 +27579,7 @@ Accept empty attributes in th-cells
foo
bar
-
-!!end
+!! end
!!test
Empty table rows go away
@@ -28012,7 +27599,6 @@ Empty table rows go away
-
!! end
###
@@ -28031,7 +27617,6 @@ RT-ed inter-element separators should be valid separators
-
!! html/parsoid
@@ -28079,8 +27664,7 @@ Empty TD followed by TD with tpl-generated attribute
foo
-
-!!end
+!! end
!!test
Indented table with an empty td
@@ -28098,8 +27682,7 @@ Indented table with an empty td
foo
-
-!!end
+!! end
!! test
Indented table with blank lines in between (T85627)
@@ -28116,7 +27699,6 @@ Indented table with blank lines in between (T85627)
!! end
@@ -28532,7 +28110,6 @@ hello
{{OpenTable}}
|}
!! html/parsoid
-
!! end
!! test
@@ -30676,7 +30253,6 @@ parsoid={
[[foo]]
x
-
!! end
!! test
@@ -31680,7 +31256,6 @@ Decoding of HTML entities in embedded HTML tags
x
!! html/php
x
-
!! html/parsoid
x
!! end
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 92765cb0d0..ba794eb2fd 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -1486,7 +1486,7 @@ class OutputPageTest extends MediaWikiTestCase {
"