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

Revert "Xml: Fix Xml::fieldset() when $content is not given"

Browse source 
Apparently that is intentional and documented. Huh. Whoops.

This reverts commit 0f1cc3bb6e.

Also add test cases for this bizarre function.

Change-Id: I0311f7c85cd575f2a66d50589ec364072be486fb
This commit is contained in:
Bartosz Dziewoński 2017-09-17 17:05:40 +00:00
parent 0f1cc3bb6e
commit 15dc2f8eaa
2 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Xml.php
View file

@ -615,9 +615,9 @@ class Xml {
if ( $content !== false ) {
$s .= $content . "\n";
$s .= self::closeElement( 'fieldset' ) . "\n";
}
$s .= self::closeElement( 'fieldset' ) . "\n";
return $s;
}

51
tests/phpunit/includes/XmlTest.php
View file

@ -477,4 +477,55 @@ class XmlTest extends MediaWikiTestCase {
] )
);
}
/**
* @covers Xml::fieldset
*/
public function testFieldset() {
$this->assertEquals(
"<fieldset>\n",
Xml::fieldset(),
'Opening tag'
);
$this->assertEquals(
"<fieldset>\n",
Xml::fieldset( false ),
'Opening tag (false means no legend)'
);
$this->assertEquals(
"<fieldset>\n",
Xml::fieldset( '' ),
'Opening tag (empty string also means no legend)'
);
$this->assertEquals(
"<fieldset>\n<legend>Foo</legend>\n",
Xml::fieldset( 'Foo' ),
'Opening tag with legend'
);
$this->assertEquals(
"<fieldset>\n<legend>Foo</legend>\nBar\n</fieldset>\n",
Xml::fieldset( 'Foo', 'Bar' ),
'Entire element with legend'
);
$this->assertEquals(
"<fieldset>\n<legend>Foo</legend>\n",
Xml::fieldset( 'Foo', false ),
'Opening tag with legend (false means no content and no closing tag)'
);
$this->assertEquals(
"<fieldset>\n<legend>Foo</legend>\n\n</fieldset>\n",
Xml::fieldset( 'Foo', '' ),
'Entire element with legend but no content (empty string generates a closing tag)'
);
$this->assertEquals(
"<fieldset class=\"bar\">\n<legend>Foo</legend>\nBar\n</fieldset>\n",
Xml::fieldset( 'Foo', 'Bar', [ 'class' => 'bar' ] ),
'Opening tag with legend and attributes'
);
$this->assertEquals(
"<fieldset class=\"bar\">\n<legend>Foo</legend>\n",
Xml::fieldset( 'Foo', false, [ 'class' => 'bar' ] ),
'Entire element with legend and attributes'
);
}
}