From 78401facfe7ad0e83eff0ab4443a636665eb2997 Mon Sep 17 00:00:00 2001
From: Geoffrey Mon <geofbot@gmail.com>
Date: Sat, 6 Jun 2015 20:26:57 -0400
Subject: [PATCH] Use XmlSelect to simplify Xml::monthSelector

 * Modify Xml::monthSelector
 * Tweak XmlTest.php to swap the order of some props (XmlSelect
    output swaps the position of id and name props of <select>s)

Bug: T93234
Change-Id: If7e41251a6b2314e36dac8b7522c8e7b765f1814
---
 includes/Xml.php                   | 21 +++++++--------------
 tests/phpunit/includes/XmlTest.php |  6 +++---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/includes/Xml.php b/includes/Xml.php
index c356c6db61..37cffdefa0 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -144,26 +144,19 @@ class Xml {
 	public static function monthSelector( $selected = '', $allmonths = null, $id = 'month' ) {
 		global $wgLang;
 		$options = array();
+		$data = new XmlSelect( 'month', $id, $selected );
 		if ( is_null( $selected ) ) {
 			$selected = '';
 		}
 		if ( !is_null( $allmonths ) ) {
-			$options[] = self::option(
-				wfMessage( 'monthsall' )->text(),
-				$allmonths,
-				$selected === $allmonths
-			);
+			$options[wfMessage( 'monthsall' )->text()] = $allmonths;
 		}
 		for ( $i = 1; $i < 13; $i++ ) {
-			$options[] = self::option( $wgLang->getMonthName( $i ), $i, $selected === $i );
-		}
-		return self::openElement( 'select', array(
-			'id' => $id,
-			'name' => 'month',
-			'class' => 'mw-month-selector'
-		) )
-			. implode( "\n", $options )
-			. self::closeElement( 'select' );
+			$options[$wgLang->getMonthName( $i )] = $i;
+		}
+		$data->addOptions( $options );
+		$data->setAttribute( 'class', 'mw-month-selector' );
+		return $data->getHTML();
 	}
 
 	/**
diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index 382e3d89b5..bea338de7c 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -154,7 +154,7 @@ class XmlTest extends MediaWikiTestCase {
 			'<label for="year">From year (and earlier):</label> ' .
 				'<input id="year" maxlength="4" size="7" type="number" value="2011" name="year" /> ' .
 				'<label for="month">From month (and earlier):</label> ' .
-				'<select id="month" name="month" class="mw-month-selector">' .
+				'<select name="month" id="month" class="mw-month-selector">' .
 				'<option value="-1">all</option>' . "\n" .
 				'<option value="1">January</option>' . "\n" .
 				'<option value="2" selected="">February</option>' . "\n" .
@@ -175,7 +175,7 @@ class XmlTest extends MediaWikiTestCase {
 			'<label for="year">From year (and earlier):</label> ' .
 				'<input id="year" maxlength="4" size="7" type="number" value="2011" name="year" /> ' .
 				'<label for="month">From month (and earlier):</label> ' .
-				'<select id="month" name="month" class="mw-month-selector">' .
+				'<select name="month" id="month" class="mw-month-selector">' .
 				'<option value="-1">all</option>' . "\n" .
 				'<option value="1">January</option>' . "\n" .
 				'<option value="2">February</option>' . "\n" .
@@ -209,7 +209,7 @@ class XmlTest extends MediaWikiTestCase {
 			'<label for="year">From year (and earlier):</label> ' .
 				'<input id="year" maxlength="4" size="7" type="number" name="year" /> ' .
 				'<label for="month">From month (and earlier):</label> ' .
-				'<select id="month" name="month" class="mw-month-selector">' .
+				'<select name="month" id="month" class="mw-month-selector">' .
 				'<option value="-1">all</option>' . "\n" .
 				'<option value="1">January</option>' . "\n" .
 				'<option value="2">February</option>' . "\n" .
-- 
2.20.1