From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 19 Sep 2016 17:41:35 +0000 (+0000)
Subject: Merge "Html: Update list of $voidElements"
X-Git-Tag: 1.31.0-rc.0~5480
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=6244b8c23a7c15be3d9de2130d290a2437bb6587;hp=5e08c143e201cf996b4a26a4ca724a83ba6d3ba6;p=lhc%2Fweb%2Fwiklou.git

Merge "Html: Update list of $voidElements"
---

diff --git a/includes/Html.php b/includes/Html.php
index 8c01448749..2ef891d168 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -46,13 +46,12 @@
  * @since 1.16
  */
 class Html {
-	// List of void elements from HTML5, section 8.1.2 as of 2011-08-12
+	// List of void elements from HTML5, section 8.1.2 as of 2016-09-19
 	private static $voidElements = [
 		'area',
 		'base',
 		'br',
 		'col',
-		'command',
 		'embed',
 		'hr',
 		'img',
@@ -339,7 +338,6 @@ class Html {
 				'height' => '150',
 				'width' => '300',
 			],
-			'command' => [ 'type' => 'command' ],
 			'form' => [
 				'action' => 'GET',
 				'autocomplete' => 'on',
diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index 85c95e4768..bc5096639b 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -514,10 +514,6 @@ class HtmlTest extends MediaWikiTestCase {
 			'canvas', [ 'width' => 300 ]
 		];
 
-		$cases[] = [ '<command/>',
-			'command', [ 'type' => 'command' ]
-		];
-
 		$cases[] = [ '<form></form>',
 			'form', [ 'action' => 'GET' ]
 		];