From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 vendor/oojs/oojs-ui/php/Element.php                |  48 +++++++-
 vendor/oojs/oojs-ui/php/HtmlSnippet.php            |   2 +-
 vendor/oojs/oojs-ui/php/Tag.php                    |  20 ++--
 vendor/oojs/oojs-ui/php/Theme.php                  |  26 +++-
 vendor/oojs/oojs-ui/php/Widget.php                 |  10 ++
 vendor/oojs/oojs-ui/php/elements/ButtonElement.php | 102 ----------------
 .../oojs/oojs-ui/php/elements/FlaggedElement.php   | 133 ---------------------
 vendor/oojs/oojs-ui/php/elements/GroupElement.php  | 129 --------------------
 vendor/oojs/oojs-ui/php/elements/IconElement.php   |  76 ------------
 .../oojs/oojs-ui/php/elements/IndicatorElement.php |  78 ------------
 vendor/oojs/oojs-ui/php/elements/LabelElement.php  |  77 ------------
 .../oojs-ui/php/elements/TabIndexedElement.php     |  88 --------------
 vendor/oojs/oojs-ui/php/elements/TitledElement.php |  74 ------------
 .../oojs/oojs-ui/php/layouts/ActionFieldLayout.php |  55 +++++++++
 vendor/oojs/oojs-ui/php/layouts/FieldLayout.php    |  73 ++++++++++-
 vendor/oojs/oojs-ui/php/layouts/FormLayout.php     |   2 +-
 .../oojs/oojs-ui/php/layouts/HorizontalLayout.php  |  27 +++++
 .../oojs/oojs-ui/php/mixins/AccessKeyedElement.php |  76 ++++++++++++
 vendor/oojs/oojs-ui/php/mixins/ButtonElement.php   |  69 +++++++++++
 vendor/oojs/oojs-ui/php/mixins/FlaggedElement.php  | 133 +++++++++++++++++++++
 vendor/oojs/oojs-ui/php/mixins/GroupElement.php    | 129 ++++++++++++++++++++
 vendor/oojs/oojs-ui/php/mixins/IconElement.php     |  76 ++++++++++++
 .../oojs/oojs-ui/php/mixins/IndicatorElement.php   |  78 ++++++++++++
 vendor/oojs/oojs-ui/php/mixins/LabelElement.php    |  77 ++++++++++++
 .../oojs/oojs-ui/php/mixins/TabIndexedElement.php  |  88 ++++++++++++++
 vendor/oojs/oojs-ui/php/mixins/TitledElement.php   |  74 ++++++++++++
 .../oojs/oojs-ui/php/widgets/ButtonInputWidget.php |  14 ++-
 vendor/oojs/oojs-ui/php/widgets/ButtonWidget.php   |   2 +
 .../oojs-ui/php/widgets/CheckboxInputWidget.php    |   2 +
 .../oojs-ui/php/widgets/DropdownInputWidget.php    |  11 +-
 vendor/oojs/oojs-ui/php/widgets/IconWidget.php     |   2 +-
 .../oojs/oojs-ui/php/widgets/IndicatorWidget.php   |   2 +-
 vendor/oojs/oojs-ui/php/widgets/InputWidget.php    |  10 +-
 vendor/oojs/oojs-ui/php/widgets/LabelWidget.php    |   2 +-
 .../oojs/oojs-ui/php/widgets/RadioInputWidget.php  |   2 +
 .../oojs-ui/php/widgets/RadioSelectInputWidget.php | 127 ++++++++++++++++++++
 .../oojs/oojs-ui/php/widgets/TextInputWidget.php   |  63 +++++++++-
 37 files changed, 1262 insertions(+), 795 deletions(-)
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/ButtonElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/FlaggedElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/GroupElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/IconElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/IndicatorElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/LabelElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/TabIndexedElement.php
 delete mode 100644 vendor/oojs/oojs-ui/php/elements/TitledElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/layouts/ActionFieldLayout.php
 create mode 100644 vendor/oojs/oojs-ui/php/layouts/HorizontalLayout.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/AccessKeyedElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/ButtonElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/FlaggedElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/GroupElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/IconElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/IndicatorElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/LabelElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/TabIndexedElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/mixins/TitledElement.php
 create mode 100644 vendor/oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php

(limited to 'vendor/oojs/oojs-ui/php')

diff --git a/vendor/oojs/oojs-ui/php/Element.php b/vendor/oojs/oojs-ui/php/Element.php
index eaa8c825..a7bd683a 100644
--- a/vendor/oojs/oojs-ui/php/Element.php
+++ b/vendor/oojs/oojs-ui/php/Element.php
@@ -9,7 +9,7 @@ namespace OOUI;
  */
 class Element extends Tag {
 
-	/* Static properties */
+	/* Static Properties */
 
 	/**
 	 * HTML tag name.
@@ -29,7 +29,7 @@ class Element extends Tag {
 	 */
 	public static $defaultDir = 'ltr';
 
-	/* Members */
+	/* Properties */
 
 	/**
 	 * Element data.
@@ -38,10 +38,18 @@ class Element extends Tag {
 	 */
 	protected $data = null;
 
+	/**
+	 * CSS classes explicitly configured for this element (as opposed to #$classes, which contains all
+	 * classes for this element).
+	 *
+	 * @var string[]
+	 */
+	protected $ownClasses = array();
+
 	/**
 	 * Mixins.
 	 *
-	 * @var array List mixed in objects.
+	 * @var ElementMixin[] List mixed in objects.
 	 */
 	protected $mixins = array();
 
@@ -69,7 +77,8 @@ class Element extends Tag {
 			$this->setData( $config['data'] );
 		}
 		if ( isset( $config['classes'] ) && is_array( $config['classes'] ) ) {
-			$this->addClasses( $config['classes'] );
+			$this->ownClasses = $config['classes'];
+			$this->addClasses( $this->ownClasses );
 		}
 		if ( isset( $config['id'] ) ) {
 			$this->setAttributes( array( 'id' => $config['id'] ) );
@@ -121,7 +130,7 @@ class Element extends Tag {
 	 * @return Tag|null Target property or null if not found
 	 */
 	public function __get( $name ) {
-		// Search mixins for methods
+		// Search mixins for the property
 		foreach ( $this->mixins as $mixin ) {
 			if ( isset( $mixin::$targetPropertyName ) && $mixin::$targetPropertyName === $name ) {
 				return $mixin->target;
@@ -132,6 +141,22 @@ class Element extends Tag {
 		return null;
 	}
 
+	/**
+	 * Check for existence of a mixed-in target property.
+	 *
+	 * @param string $name Property name
+	 * @return bool Whether property exists
+	 */
+	public function __isset( $name ) {
+		// Search mixins for the property
+		foreach ( $this->mixins as $mixin ) {
+			if ( isset( $mixin::$targetPropertyName ) && $mixin::$targetPropertyName === $name ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Get the HTML tag name.
 	 *
@@ -220,6 +245,9 @@ class Element extends Tag {
 		if ( $this->data !== null ) {
 			$config['data'] = $this->data;
 		}
+		if ( $this->ownClasses !== array() ) {
+			$config['classes'] = $this->ownClasses;
+		}
 		return $config;
 	}
 
@@ -247,10 +275,18 @@ class Element extends Tag {
 		};
 		array_walk_recursive( $config, $replaceElements );
 		// Set '_' last to ensure that subclasses can't accidentally step on it.
-		$config['_'] = preg_replace( '/^OOUI\\\\/', '', get_class( $this ) );
+		$config['_'] = $this->getJavaScriptClassName();
 		return $config;
 	}
 
+	/**
+	 * The class name of the JavaScript version of this widget
+	 * @return string
+	 */
+	protected function getJavaScriptClassName() {
+		return str_replace( 'OOUI\\', 'OO.ui.', get_class( $this ) );
+	}
+
 	protected function getGeneratedAttributes() {
 		$attributesArray = parent::getGeneratedAttributes();
 		// Add `data-ooui` attribute from serialized config array.
diff --git a/vendor/oojs/oojs-ui/php/HtmlSnippet.php b/vendor/oojs/oojs-ui/php/HtmlSnippet.php
index e0889fca..adde8286 100644
--- a/vendor/oojs/oojs-ui/php/HtmlSnippet.php
+++ b/vendor/oojs/oojs-ui/php/HtmlSnippet.php
@@ -7,7 +7,7 @@ namespace OOUI;
  */
 class HtmlSnippet {
 
-	/* Members */
+	/* Properties */
 
 	/**
 	 * HTML snippet this instance represents.
diff --git a/vendor/oojs/oojs-ui/php/Tag.php b/vendor/oojs/oojs-ui/php/Tag.php
index da8c2bfa..e5fa9df6 100644
--- a/vendor/oojs/oojs-ui/php/Tag.php
+++ b/vendor/oojs/oojs-ui/php/Tag.php
@@ -4,7 +4,7 @@ namespace OOUI;
 
 class Tag {
 
-	/* Members */
+	/* Properties */
 
 	/**
 	 * Tag name for this instance.
@@ -296,23 +296,27 @@ class Tag {
 				// reasons to ever use 'javascript:' URLs anyway.
 				$protocolWhitelist = array(
 					// Sourced from MediaWiki's $wgUrlProtocols
+					// Keep in sync with OO.ui.isSafeUrl
 					'bitcoin', 'ftp', 'ftps', 'geo', 'git', 'gopher', 'http', 'https', 'irc', 'ircs',
 					'magnet', 'mailto', 'mms', 'news', 'nntp', 'redis', 'sftp', 'sip', 'sips', 'sms', 'ssh',
 					'svn', 'tel', 'telnet', 'urn', 'worldwind', 'xmpp',
+					'(protocol-relative)', '(relative)',
 				);
 
 				// Protocol-relative URLs are handled really badly by parse_url()
 				if ( substr( $value, 0, 2 ) === '//' ) {
-					$url = "http:$value";
+					$scheme = '(protocol-relative)';
 				} else {
-					$url = $value;
+					// Must suppress warnings when the value is not a valid URL. parse_url() returns false then.
+					\MediaWiki\suppressWarnings();
+					$scheme = parse_url( $value, PHP_URL_SCHEME );
+					\MediaWiki\restoreWarnings();
+					if ( $scheme === null || ( !$scheme && substr( $value, 0, 1 ) === '/' ) ) {
+						$scheme = '(relative)';
+					}
 				}
-				// Must suppress warnings when the value is not a valid URL. parse_url() returns false then.
-				// @codingStandardsIgnoreStart
-				$scheme = @parse_url( $url, PHP_URL_SCHEME );
-				// @codingStandardsIgnoreEnd
 
-				if ( !( $scheme === null || in_array( strtolower( $scheme ), $protocolWhitelist ) ) ) {
+				if ( !in_array( strtolower( $scheme ), $protocolWhitelist ) ) {
 					throw new Exception( "Potentially unsafe '$key' attribute value. " .
 						"Scheme: '$scheme'; value: '$value'." );
 				}
diff --git a/vendor/oojs/oojs-ui/php/Theme.php b/vendor/oojs/oojs-ui/php/Theme.php
index d36b6d82..7f8eea36 100644
--- a/vendor/oojs/oojs-ui/php/Theme.php
+++ b/vendor/oojs/oojs-ui/php/Theme.php
@@ -7,18 +7,25 @@ namespace OOUI;
  *
  * @abstract
  */
-class Theme {
+abstract class Theme {
 
-	/* Members */
+	/* Properties */
 
 	private static $singleton;
 
 	/* Static Methods */
 
-	public static function setSingleton( Theme $theme ) {
+	/**
+	 * @param Theme|null $theme
+	 */
+	public static function setSingleton( Theme $theme = null ) {
 		self::$singleton = $theme;
 	}
 
+	/**
+	 * @return Theme
+	 * @throws Exception
+	 */
 	public static function singleton() {
 		if ( !self::$singleton ) {
 			throw new Exception( __METHOD__ . ' was called with no singleton theme set.' );
@@ -51,8 +58,15 @@ class Theme {
 	public function updateElementClasses( Element $element ) {
 		$classes = $this->getElementClasses( $element );
 
-		$element
-			->removeClasses( $classes['off'] )
-			->addClasses( $classes['on'] );
+		if ( isset( $element->icon ) ) {
+			$element->icon
+				->removeClasses( $classes['off'] )
+				->addClasses( $classes['on'] );
+		}
+		if ( isset( $element->indicator ) ) {
+			$element->indicator
+				->removeClasses( $classes['off'] )
+				->addClasses( $classes['on'] );
+		}
 	}
 }
diff --git a/vendor/oojs/oojs-ui/php/Widget.php b/vendor/oojs/oojs-ui/php/Widget.php
index 04152aa5..7828a82e 100644
--- a/vendor/oojs/oojs-ui/php/Widget.php
+++ b/vendor/oojs/oojs-ui/php/Widget.php
@@ -9,6 +9,16 @@ namespace OOUI;
  */
 class Widget extends Element {
 
+	/* Static Properties */
+
+	/**
+	 * Whether this widget will behave reasonably when wrapped in a HTML `<label>`. If this is true,
+	 * wrappers such as FieldLayout may use a `<label>`.
+	 *
+	 * @var boolean
+	 */
+	public static $supportsSimpleLabel = false;
+
 	/* Properties */
 
 	/**
diff --git a/vendor/oojs/oojs-ui/php/elements/ButtonElement.php b/vendor/oojs/oojs-ui/php/elements/ButtonElement.php
deleted file mode 100644
index f9acf2d8..00000000
--- a/vendor/oojs/oojs-ui/php/elements/ButtonElement.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element with a button.
- *
- * Buttons are used for controls which can be clicked. They can be configured to use tab indexing
- * and access keys for accessibility purposes.
- *
- * @abstract
- */
-class ButtonElement extends ElementMixin {
-	/**
-	 * Button is framed.
-	 *
-	 * @var boolean
-	 */
-	protected $framed = false;
-
-	/**
-	 * Button's access key.
-	 *
-	 * @var string
-	 */
-	protected $accessKey = null;
-
-	public static $targetPropertyName = 'button';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param boolean $config['framed'] Render button with a frame (default: true)
-	 * @param string $config['accessKey'] Button's access key
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		$target = isset( $config['button'] ) ? $config['button'] : new Tag( 'a' );
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->element->addClasses( array( 'oo-ui-buttonElement' ) );
-		$this->target->addClasses( array( 'oo-ui-buttonElement-button' ) );
-		$this->toggleFramed( isset( $config['framed'] ) ? $config['framed'] : true );
-		$this->setAccessKey( isset( $config['accessKey'] ) ? $config['accessKey'] : null );
-		$this->target->setAttributes( array(
-			'role' => 'button',
-		) );
-	}
-
-	/**
-	 * Toggle frame.
-	 *
-	 * @param boolean $framed Make button framed, omit to toggle
-	 * @chainable
-	 */
-	public function toggleFramed( $framed = null ) {
-		$this->framed = $framed !== null ? !!$framed : !$this->framed;
-		$this->element->toggleClasses( array( 'oo-ui-buttonElement-framed' ), $this->framed );
-		$this->element->toggleClasses( array( 'oo-ui-buttonElement-frameless' ), !$this->framed );
-	}
-
-	/**
-	 * Check if button has a frame.
-	 *
-	 * @return boolean Button is framed
-	 */
-	public function isFramed() {
-		return $this->framed;
-	}
-
-	/**
-	 * Set access key.
-	 *
-	 * @param string $accessKey Button's access key, use empty string to remove
-	 * @chainable
-	 */
-	public function setAccessKey( $accessKey ) {
-		$accessKey = is_string( $accessKey ) && strlen( $accessKey ) ? $accessKey : null;
-
-		if ( $this->accessKey !== $accessKey ) {
-			if ( $accessKey !== null ) {
-				$this->target->setAttributes( array( 'accesskey' => $accessKey ) );
-			} else {
-				$this->target->removeAttributes( array( 'accesskey' ) );
-			}
-			$this->accessKey = $accessKey;
-		}
-
-		return $this;
-	}
-
-	public function getConfig( &$config ) {
-		if ( $this->framed !== true ) {
-			$config['framed'] = $this->framed;
-		}
-		if ( $this->accessKey !== null ) {
-			$config['accessKey'] = $this->accessKey;
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/FlaggedElement.php b/vendor/oojs/oojs-ui/php/elements/FlaggedElement.php
deleted file mode 100644
index bd5dc80d..00000000
--- a/vendor/oojs/oojs-ui/php/elements/FlaggedElement.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element with named flags that can be added, removed, listed and checked.
- *
- * A flag, when set, adds a CSS class on the `$element` by combining `oo-ui-flaggedElement-` with
- * the flag name. Flags are primarily useful for styling.
- *
- * @abstract
- */
-class FlaggedElement extends ElementMixin {
-	/**
-	 * Flags.
-	 *
-	 * @var string
-	 */
-	protected $flags = array();
-
-	public static $targetPropertyName = 'flagged';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param string|string[] $config['flags'] Flags describing importance and functionality, e.g.
-	 *   'primary', 'safe', 'progressive', 'destructive' or 'constructive'
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		$target = isset( $config['flagged'] ) ? $config['flagged'] : $element;
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->setFlags( isset( $config['flags'] ) ? $config['flags'] : null );
-	}
-
-	/**
-	 * Check if a flag is set.
-	 *
-	 * @param string $flag Name of flag
-	 * @return boolean Has flag
-	 */
-	public function hasFlag( $flag ) {
-		return isset( $this->flags[$flag] );
-	}
-
-	/**
-	 * Get the names of all flags set.
-	 *
-	 * @return string[] Flag names
-	 */
-	public function getFlags() {
-		return array_keys( $this->flags );
-	}
-
-	/**
-	 * Clear all flags.
-	 *
-	 * @chainable
-	 */
-	public function clearFlags() {
-		$remove = array();
-		$classPrefix = 'oo-ui-flaggedElement-';
-
-		foreach ( $this->flags as $flag ) {
-			$remove[] = $classPrefix . $flag;
-		}
-
-		$this->target->removeClasses( $remove );
-		$this->flags = array();
-
-		return $this;
-	}
-
-	/**
-	 * Add one or more flags.
-	 *
-	 * @param string|array $flags One or more flags to add, or an array keyed by flag name
-	 *   containing boolean set/remove instructions.
-	 * @chainable
-	 */
-	public function setFlags( $flags ) {
-		$add = array();
-		$remove = array();
-		$classPrefix = 'oo-ui-flaggedElement-';
-
-		if ( is_string( $flags ) ) {
-			// Set
-			if ( !isset( $this->flags[$flags] ) ) {
-				$this->flags[$flags] = true;
-				$add[] = $classPrefix . $flags;
-			}
-		} elseif ( is_array( $flags ) ) {
-			foreach ( $flags as $key => $value ) {
-				if ( is_numeric( $key ) ) {
-					// Set
-					if ( !isset( $this->flags[$value] ) ) {
-						$this->flags[$value] = true;
-						$add[] = $classPrefix . $value;
-					}
-				} else {
-					if ( $value ) {
-						// Set
-						if ( !isset( $this->flags[$key] ) ) {
-							$this->flags[$key] = true;
-							$add[] = $classPrefix . $key;
-						}
-					} else {
-						// Remove
-						if ( isset( $this->flags[$key] ) ) {
-							unset( $this->flags[$key] );
-							$remove[] = $classPrefix . $key;
-						}
-					}
-				}
-			}
-		}
-
-		$this->target
-			->addClasses( $add )
-			->removeClasses( $remove );
-
-		return $this;
-	}
-
-	public function getConfig( &$config ) {
-		if ( !empty( $this->flags ) ) {
-			$config['flags'] = $this->getFlags();
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/GroupElement.php b/vendor/oojs/oojs-ui/php/elements/GroupElement.php
deleted file mode 100644
index 93d3c7a1..00000000
--- a/vendor/oojs/oojs-ui/php/elements/GroupElement.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element containing a sequence of child elements.
- *
- * @abstract
- */
-class GroupElement extends ElementMixin {
-	/**
-	 * List of items in the group.
-	 *
-	 * @var Element[]
-	 */
-	protected $items = array();
-
-	public static $targetPropertyName = 'group';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		$target = isset( $config['group'] ) ? $config['group'] : new Tag( 'div' );
-		parent::__construct( $element, $target, $config );
-	}
-
-	/**
-	 * Check if there are no items.
-	 *
-	 * @return boolean Group is empty
-	 */
-	public function isEmpty() {
-		return !count( $this->items );
-	}
-
-	/**
-	 * Get items.
-	 *
-	 * @return Element[] Items
-	 */
-	public function getItems() {
-		return $this->items;
-	}
-
-	/**
-	 * Add items.
-	 *
-	 * Adding an existing item will move it.
-	 *
-	 * @param Element[] $items Items
-	 * @param number $index Index to insert items at
-	 * @chainable
-	 */
-	public function addItems( array $items, $index = null ) {
-		foreach ( $items as $item ) {
-			// Check if item exists then remove it first, effectively "moving" it
-			$currentIndex = array_search( $item, $this->items );
-			if ( $currentIndex !== false ) {
-				$this->removeItems( array( $item ) );
-				// Adjust index to compensate for removal
-				if ( $currentIndex < $index ) {
-					$index--;
-				}
-			}
-			// Add the item
-			$item->setElementGroup( $this );
-		}
-
-		if ( $index === null || $index < 0 || $index >= count( $this->items ) ) {
-			$this->items = array_merge( $this->items, $items );
-		} else {
-			array_splice( $this->items, $index, 0, $items );
-		}
-
-		// Update actual target element contents to reflect our list
-		$this->target->clearContent();
-		call_user_func_array( array( $this->target, 'appendContent' ), $this->items );
-
-		return $this;
-	}
-
-	/**
-	 * Remove items.
-	 *
-	 * @param Element[] $items Items to remove
-	 * @chainable
-	 */
-	public function removeItems( $items ) {
-		foreach ( $items as $item ) {
-			$index = array_search( $item, $this->items );
-			if ( $index !== false ) {
-				$item->setElementGroup( null );
-				array_splice( $this->items, $index, 1 );
-			}
-		}
-
-		// Update actual target element contents to reflect our list
-		$this->target->clearContent();
-		call_user_func_array( array( $this->target, 'appendContent' ), $this->items );
-
-		return $this;
-	}
-
-	/**
-	 * Clear all items.
-	 *
-	 * Items will be detached, not removed, so they can be used later.
-	 *
-	 * @chainable
-	 */
-	public function clearItems() {
-		foreach ( $this->items as $item ) {
-			$item->setElementGroup( null );
-		}
-
-		$this->items = array();
-		$this->target->clearContent();
-
-		return $this;
-	}
-
-	public function getConfig( &$config ) {
-		$config['items'] = $this->items;
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/IconElement.php b/vendor/oojs/oojs-ui/php/elements/IconElement.php
deleted file mode 100644
index b6d27376..00000000
--- a/vendor/oojs/oojs-ui/php/elements/IconElement.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element containing an icon.
- *
- * Icons are graphics, about the size of normal text. They can be used to aid the user in locating
- * a control or convey information in a more space efficient way. Icons should rarely be used
- * without labels; such as in a toolbar where space is at a premium or within a context where the
- * meaning is very clear to the user.
- *
- * @abstract
- */
-class IconElement extends ElementMixin {
-	/**
-	 * Symbolic icon name.
-	 *
-	 * @var string
-	 */
-	protected $icon = null;
-
-	public static $targetPropertyName = 'icon';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param string $config['icon'] Symbolic icon name
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		// FIXME 'iconElement' is a very stupid way to call '$icon'
-		$target = isset( $config['iconElement'] ) ? $config['iconElement'] : new Tag( 'span' );
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->target->addClasses( array( 'oo-ui-iconElement-icon' ) );
-		$this->setIcon( isset( $config['icon'] ) ? $config['icon'] : null );
-	}
-
-	/**
-	 * Set icon name.
-	 *
-	 * @param string|null $icon Symbolic icon name
-	 * @chainable
-	 */
-	public function setIcon( $icon = null ) {
-		if ( $this->icon !== null ) {
-			$this->target->removeClasses( array( 'oo-ui-icon-' . $this->icon ) );
-		}
-		if ( $icon !== null ) {
-			$this->target->addClasses( array( 'oo-ui-icon-' . $icon ) );
-		}
-
-		$this->icon = $icon;
-		$this->element->toggleClasses( array( 'oo-ui-iconElement' ), (bool)$this->icon );
-
-		return $this;
-	}
-
-	/**
-	 * Get icon name.
-	 *
-	 * @return string Icon name
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
-
-	public function getConfig( &$config ) {
-		if ( $this->icon !== null ) {
-			$config['icon'] = $this->icon;
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/IndicatorElement.php b/vendor/oojs/oojs-ui/php/elements/IndicatorElement.php
deleted file mode 100644
index 56238b6c..00000000
--- a/vendor/oojs/oojs-ui/php/elements/IndicatorElement.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element containing an indicator.
- *
- * Indicators are graphics, smaller than normal text. They can be used to describe unique status or
- * behavior. Indicators should only be used in exceptional cases; such as a button that opens a menu
- * instead of performing an action directly, or an item in a list which has errors that need to be
- * resolved.
- *
- * @abstract
- */
-class IndicatorElement extends ElementMixin {
-	/**
-	 * Symbolic indicator name
-	 *
-	 * @var string|null
-	 */
-	protected $indicator = null;
-
-	public static $targetPropertyName = 'indicator';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param string $config['indicator'] Symbolic indicator name
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		// FIXME 'indicatorElement' is a very stupid way to call '$indicator'
-		$target = isset( $config['indicatorElement'] )
-			? $config['indicatorElement']
-			: new Tag( 'span' );
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->target->addClasses( array( 'oo-ui-indicatorElement-indicator' ) );
-		$this->setIndicator( isset( $config['indicator'] ) ? $config['indicator'] : null );
-	}
-
-	/**
-	 * Set indicator name.
-	 *
-	 * @param string|null $indicator Symbolic name of indicator to use or null for no indicator
-	 * @chainable
-	 */
-	public function setIndicator( $indicator = null ) {
-		if ( $this->indicator !== null ) {
-			$this->target->removeClasses( array( 'oo-ui-indicator-' . $this->indicator ) );
-		}
-		if ( $indicator !== null ) {
-			$this->target->addClasses( array( 'oo-ui-indicator-' . $indicator ) );
-		}
-
-		$this->indicator = $indicator;
-		$this->element->toggleClasses( array( 'oo-ui-indicatorElement' ), (bool)$this->indicator );
-
-		return $this;
-	}
-
-	/**
-	 * Get indicator name.
-	 *
-	 * @return string Symbolic name of indicator
-	 */
-	public function getIndicator() {
-		return $this->indicator;
-	}
-
-	public function getConfig( &$config ) {
-		if ( $this->indicator !== null ) {
-			$config['indicator'] = $this->indicator;
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/LabelElement.php b/vendor/oojs/oojs-ui/php/elements/LabelElement.php
deleted file mode 100644
index d5cf7bee..00000000
--- a/vendor/oojs/oojs-ui/php/elements/LabelElement.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element containing a label.
- *
- * @abstract
- */
-class LabelElement extends ElementMixin {
-	/**
-	 * Label value.
-	 *
-	 * @var string|HtmlSnippet|null
-	 */
-	protected $label = null;
-
-	public static $targetPropertyName = 'label';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param string|HtmlSnippet $config['label'] Label text
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		// FIXME 'labelElement' is a very stupid way to call '$label'
-		$target = isset( $config['labelElement'] ) ? $config['labelElement'] : new Tag( 'span' );
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->target->addClasses( array( 'oo-ui-labelElement-label' ) );
-		$this->setLabel( isset( $config['label'] ) ? $config['label'] : null );
-	}
-
-	/**
-	 * Set the label.
-	 *
-	 * An empty string will result in the label being hidden. A string containing only whitespace will
-	 * be converted to a single `&nbsp;`.
-	 *
-	 * @param string|HtmlSnippet|null $label Label text
-	 * @chainable
-	 */
-	public function setLabel( $label ) {
-		$this->label = $label;
-
-		$this->target->clearContent();
-		if ( $this->label !== null ) {
-			if ( is_string( $this->label ) && $this->label !== '' && trim( $this->label ) === '' ) {
-				$this->target->appendContent( new HtmlSnippet( '&nbsp;' ) );
-			} else {
-				$this->target->appendContent( $label );
-			}
-		}
-
-		$this->element->toggleClasses( array( 'oo-ui-labelElement' ), !!$this->label );
-
-		return $this;
-	}
-
-	/**
-	 * Get the label.
-	 *
-	 * @return string|HtmlSnippet|null Label text
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	public function getConfig( &$config ) {
-		if ( $this->label !== null ) {
-			$config['label'] = $this->label;
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/TabIndexedElement.php b/vendor/oojs/oojs-ui/php/elements/TabIndexedElement.php
deleted file mode 100644
index 223b5371..00000000
--- a/vendor/oojs/oojs-ui/php/elements/TabIndexedElement.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element supporting "sequential focus navigation" using the 'tabindex' attribute.
- *
- * @abstract
- */
-class TabIndexedElement extends ElementMixin {
-	/**
-	 * Tab index value.
-	 *
-	 * @var number|null
-	 */
-	protected $tabIndex = null;
-
-	public static $targetPropertyName = 'tabIndexed';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param number|null $config['tabIndex'] Tab index value. Use 0 to use default ordering, use -1 to
-	 *   prevent tab focusing, use null to suppress the `tabindex` attribute. (default: 0)
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		$target = isset( $config['tabIndexed'] ) ? $config['tabIndexed'] : $element;
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->setTabIndex( isset( $config['tabIndex'] ) ? $config['tabIndex'] : 0 );
-	}
-
-	/**
-	 * Set tab index value.
-	 *
-	 * @param number|null $tabIndex Tab index value or null for no tab index
-	 * @chainable
-	 */
-	public function setTabIndex( $tabIndex ) {
-		$tabIndex = is_numeric( $tabIndex ) ? $tabIndex : null;
-
-		if ( $this->tabIndex !== $tabIndex ) {
-			$this->tabIndex = $tabIndex;
-			$this->updateTabIndex();
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Update the tabIndex attribute, in case of changes to tabIndex or disabled
-	 * state.
-	 *
-	 * @chainable
-	 */
-	public function updateTabIndex() {
-		$disabled = $this->element->isDisabled();
-		if ( $this->tabIndex !== null ) {
-			$this->target->setAttributes( array(
-				// Do not index over disabled elements
-				'tabindex' => $disabled ? -1 : $this->tabIndex,
-				// ChromeVox and NVDA do not seem to inherit this from parent elements
-				'aria-disabled' => ( $disabled ? 'true' : 'false' )
-			) );
-		} else {
-			$this->target->removeAttributes( array( 'tabindex', 'aria-disabled' ) );
-		}
-		return $this;
-	}
-
-	/**
-	 * Get tab index value.
-	 *
-	 * @return number|null Tab index value
-	 */
-	public function getTabIndex() {
-		return $this->tabIndex;
-	}
-
-	public function getConfig( &$config ) {
-		if ( $this->tabIndex !== 0 ) {
-			$config['tabIndex'] = $this->tabIndex;
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/elements/TitledElement.php b/vendor/oojs/oojs-ui/php/elements/TitledElement.php
deleted file mode 100644
index 5f1317c4..00000000
--- a/vendor/oojs/oojs-ui/php/elements/TitledElement.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace OOUI;
-
-/**
- * Element with a title.
- *
- * Titles are rendered by the browser and are made visible when hovering the element. Titles are
- * not visible on touch devices.
- *
- * @abstract
- */
-class TitledElement extends ElementMixin {
-	/**
-	 * Title text.
-	 *
-	 * @var string
-	 */
-	protected $title = null;
-
-	public static $targetPropertyName = 'titled';
-
-	/**
-	 * @param Element $element Element being mixed into
-	 * @param array $config Configuration options
-	 * @param string $config['title'] Title. If not provided, the static property 'title' is used.
-	 */
-	public function __construct( Element $element, array $config = array() ) {
-		// Parent constructor
-		$target = isset( $config['titled'] ) ? $config['titled'] : $element;
-		parent::__construct( $element, $target, $config );
-
-		// Initialization
-		$this->setTitle(
-			isset( $config['title'] ) ? $config['title'] :
-			( isset( $element::$title ) ? $element::$title : null )
-		);
-	}
-
-	/**
-	 * Set title.
-	 *
-	 * @param string|null $title Title text or null for no title
-	 * @chainable
-	 */
-	public function setTitle( $title ) {
-		if ( $this->title !== $title ) {
-			$this->title = $title;
-			if ( $title !== null ) {
-				$this->target->setAttributes( array( 'title' => $title ) );
-			} else {
-				$this->target->removeAttributes( array( 'title' ) );
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get title.
-	 *
-	 * @return string Title string
-	 */
-	public function getTitle() {
-		return $this->title;
-	}
-
-	public function getConfig( &$config ) {
-		if ( $this->title !== null ) {
-			$config['title'] = $this->title;
-		}
-		return parent::getConfig( $config );
-	}
-}
diff --git a/vendor/oojs/oojs-ui/php/layouts/ActionFieldLayout.php b/vendor/oojs/oojs-ui/php/layouts/ActionFieldLayout.php
new file mode 100644
index 00000000..bf908184
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/layouts/ActionFieldLayout.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Layout made of a field, button and optional label.
+ */
+class ActionFieldLayout extends FieldLayout {
+
+	/**
+	 * Button widget to be laid out.
+	 *
+	 * @var Widget
+	 */
+	protected $buttonWidget;
+
+	/**
+	 * @param Widget $fieldWidget Field widget
+	 * @param ButtonWidget $buttonWidget Field widget
+	 * @param array $config Configuration options
+	 */
+	public function __construct( $fieldWidget, $buttonWidget = false, array $config = array() ) {
+		// Allow passing positional parameters inside the config array
+		if ( is_array( $fieldWidget ) && isset( $fieldWidget['fieldWidget'] ) ) {
+			$config = $fieldWidget;
+			$fieldWidget = $config['fieldWidget'];
+			$buttonWidget = $config['buttonWidget'];
+		}
+
+		// Parent constructor
+		parent::__construct( $fieldWidget, $config );
+
+		// Properties
+		$this->buttonWidget = $buttonWidget;
+		$this->button = new Tag( 'div' );
+		$this->input = new Tag( 'div' );
+
+		// Initialization
+		$this->addClasses( array( 'oo-ui-actionFieldLayout' ) );
+		$this->button
+			->addClasses( array( 'oo-ui-actionFieldLayout-button' ) )
+			->appendContent( $this->buttonWidget );
+		$this->input
+			->addClasses( array( 'oo-ui-actionFieldLayout-input' ) )
+			->appendContent( $this->fieldWidget );
+		$this->field
+			->clearContent()
+			->appendContent( $this->input, $this->button );
+	}
+
+	public function getConfig( &$config ) {
+		$config['buttonWidget'] = $this->buttonWidget;
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/layouts/FieldLayout.php b/vendor/oojs/oojs-ui/php/layouts/FieldLayout.php
index ef0d4c6c..bfa25afe 100644
--- a/vendor/oojs/oojs-ui/php/layouts/FieldLayout.php
+++ b/vendor/oojs/oojs-ui/php/layouts/FieldLayout.php
@@ -31,14 +31,37 @@ class FieldLayout extends Layout {
 	 */
 	protected $fieldWidget;
 
-	private $field, $body, $help;
+	/**
+	 * Error messages.
+	 *
+	 * @var array
+	 */
+	protected $errors;
+
+	/**
+	 * Notice messages.
+	 *
+	 * @var array
+	 */
+	protected $notices;
+
+	/**
+	 * @var ButtonWidget|string
+	 */
+	protected $help;
+
+	protected $field, $body, $messages;
 
 	/**
 	 * @param Widget $fieldWidget Field widget
 	 * @param array $config Configuration options
 	 * @param string $config['align'] Alignment mode, either 'left', 'right', 'top' or 'inline'
 	 *   (default: 'left')
-	 * @param string $config['help'] Explanatory text shown as a '?' icon.
+	 * @param array $config['errors'] Error messages about the widget, as strings or HtmlSnippet
+	 *   instances.
+	 * @param array $config['notices'] Notices about the widget, as strings or HtmlSnippet instances.
+	 * @param string|HtmlSnippet $config['help'] Explanatory text shown as a '?' icon.
+	 * @throws Exception An exception is thrown if no widget is specified
 	 */
 	public function __construct( $fieldWidget, array $config = array() ) {
 		// Allow passing positional parameters inside the config array
@@ -47,7 +70,12 @@ class FieldLayout extends Layout {
 			$fieldWidget = $config['fieldWidget'];
 		}
 
-		$hasInputWidget = $fieldWidget instanceof InputWidget;
+		// Make sure we have required constructor arguments
+		if ( $fieldWidget === null ) {
+			throw new Exception( 'Widget not found' );
+		}
+
+		$hasInputWidget = $fieldWidget::$supportsSimpleLabel;
 
 		// Config initialization
 		$config = array_merge( array( 'align' => 'left' ), $config );
@@ -57,7 +85,10 @@ class FieldLayout extends Layout {
 
 		// Properties
 		$this->fieldWidget = $fieldWidget;
+		$this->errors = isset( $config['errors'] ) ? $config['errors'] : array();
+		$this->notices = isset( $config['notices'] ) ? $config['notices'] : array();
 		$this->field = new Tag( 'div' );
+		$this->messages = new Tag( 'ul' );
 		$this->body = new Tag( $hasInputWidget ? 'label' : 'div' );
 		if ( isset( $config['help'] ) ) {
 			$this->help = new ButtonWidget( array(
@@ -72,20 +103,54 @@ class FieldLayout extends Layout {
 
 		// Mixins
 		$this->mixin( new LabelElement( $this, $config ) );
+		$this->mixin( new TitledElement( $this,
+			array_merge( $config, array( 'titled' => $this->label ) ) ) );
 
 		// Initialization
 		$this
 			->addClasses( array( 'oo-ui-fieldLayout' ) )
 			->appendContent( $this->help, $this->body );
+		if ( count( $this->errors ) || count( $this->notices ) ) {
+			$this->appendContent( $this->messages );
+		}
 		$this->body->addClasses( array( 'oo-ui-fieldLayout-body' ) );
+		$this->messages->addClasses( array( 'oo-ui-fieldLayout-messages' ) );
 		$this->field
 			->addClasses( array( 'oo-ui-fieldLayout-field' ) )
 			->toggleClasses( array( 'oo-ui-fieldLayout-disable' ), $this->fieldWidget->isDisabled() )
 			->appendContent( $this->fieldWidget );
 
+		foreach ( $this->notices as $text ) {
+			$this->messages->appendContent( $this->makeMessage( 'notice', $text ) );
+		}
+		foreach ( $this->errors as $text ) {
+			$this->messages->appendContent( $this->makeMessage( 'error', $text ) );
+		}
+
 		$this->setAlignment( $config['align'] );
 	}
 
+	/**
+	 * @param string $kind 'error' or 'notice'
+	 * @param string|HtmlSnippet $text
+	 * @return Tag
+	 */
+	private function makeMessage( $kind, $text ) {
+		$listItem = new Tag( 'li' );
+		if ( $kind === 'error' ) {
+			$icon = new IconWidget( array( 'icon' => 'alert', 'flags' => array( 'warning' ) ) );
+		} elseif ( $kind === 'notice' ) {
+			$icon = new IconWidget( array( 'icon' => 'info' ) );
+		} else {
+			$icon = null;
+		}
+		$message = new LabelWidget( array( 'label' => $text ) );
+		$listItem
+			->appendContent( $icon, $message )
+			->addClasses( array( "oo-ui-fieldLayout-messages-$kind" ) );
+		return $listItem;
+	}
+
 	/**
 	 * Get the field.
 	 *
@@ -132,6 +197,8 @@ class FieldLayout extends Layout {
 	public function getConfig( &$config ) {
 		$config['fieldWidget'] = $this->fieldWidget;
 		$config['align'] = $this->align;
+		$config['errors'] = $this->errors;
+		$config['notices'] = $this->notices;
 		if ( $this->help !== '' ) {
 			$config['help'] = $this->help->getTitle();
 		}
diff --git a/vendor/oojs/oojs-ui/php/layouts/FormLayout.php b/vendor/oojs/oojs-ui/php/layouts/FormLayout.php
index ebeb89de..eadf2750 100644
--- a/vendor/oojs/oojs-ui/php/layouts/FormLayout.php
+++ b/vendor/oojs/oojs-ui/php/layouts/FormLayout.php
@@ -7,7 +7,7 @@ namespace OOUI;
  */
 class FormLayout extends Layout {
 
-	/* Static properties */
+	/* Static Properties */
 
 	public static $tagName = 'form';
 
diff --git a/vendor/oojs/oojs-ui/php/layouts/HorizontalLayout.php b/vendor/oojs/oojs-ui/php/layouts/HorizontalLayout.php
new file mode 100644
index 00000000..d4acb216
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/layouts/HorizontalLayout.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * HorizontalLayout arranges its contents in a single line (using `display: inline-block` for its
+ * items), with small margins between them.
+ */
+class HorizontalLayout extends Layout {
+	/**
+	 * @param array $config Configuration options
+	 * @param Widget[]|Layout[] $config['items'] Widgets or other layouts to add to the layout.
+	 */
+	public function __construct( array $config = array() ) {
+		// Parent constructor
+		parent::__construct( $config );
+
+		// Mixins
+		$this->mixin( new GroupElement( $this, array_merge( $config, array( 'group' => $this ) ) ) );
+
+		// Initialization
+		$this->addClasses( array( 'oo-ui-horizontalLayout' ) );
+		if ( isset( $config['items'] ) ) {
+			$this->addItems( $config['items'] );
+		}
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/AccessKeyedElement.php b/vendor/oojs/oojs-ui/php/mixins/AccessKeyedElement.php
new file mode 100644
index 00000000..eb4b79ea
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/AccessKeyedElement.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element with an accesskey.
+ *
+ * Accesskeys allow an user to go to a specific element by using
+ * a shortcut combination of a browser specific keys + the key
+ * set to the field.
+ *
+ * @abstract
+ */
+class AccessKeyedElement extends ElementMixin {
+	/**
+	 * Accesskey
+	 *
+	 * @var string
+	 */
+	protected $accessKey = null;
+
+	public static $targetPropertyName = 'accessKeyed';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param string $config['accessKey'] AccessKey. If not provided, no accesskey will be added
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		$target = isset( $config['accessKeyed'] ) ? $config['accessKeyed'] : $element;
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->setAccessKey(
+			isset( $config['accessKey'] ) ? $config['accessKey'] : null
+		);
+	}
+
+	/**
+	 * Set access key.
+	 *
+	 * @param string $accessKey Tag's access key, use empty string to remove
+	 * @chainable
+	 */
+	public function setAccessKey( $accessKey ) {
+		$accessKey = is_string( $accessKey ) && strlen( $accessKey ) ? $accessKey : null;
+
+		if ( $this->accessKey !== $accessKey ) {
+			if ( $accessKey !== null ) {
+				$this->target->setAttributes( array( 'accesskey' => $accessKey ) );
+			} else {
+				$this->target->removeAttributes( array( 'accesskey' ) );
+			}
+			$this->accessKey = $accessKey;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get AccessKey.
+	 *
+	 * @return string Accesskey string
+	 */
+	public function getAccessKey() {
+		return $this->accessKey;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->accessKey !== null ) {
+			$config['accessKey'] = $this->accessKey;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/ButtonElement.php b/vendor/oojs/oojs-ui/php/mixins/ButtonElement.php
new file mode 100644
index 00000000..b09c7941
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/ButtonElement.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element with a button.
+ *
+ * Buttons are used for controls which can be clicked. They can be configured to use tab indexing
+ * and access keys for accessibility purposes.
+ *
+ * @abstract
+ */
+class ButtonElement extends ElementMixin {
+	/**
+	 * Button is framed.
+	 *
+	 * @var boolean
+	 */
+	protected $framed = false;
+
+	public static $targetPropertyName = 'button';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param boolean $config['framed'] Render button with a frame (default: true)
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		$target = isset( $config['button'] ) ? $config['button'] : new Tag( 'a' );
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->element->addClasses( array( 'oo-ui-buttonElement' ) );
+		$this->target->addClasses( array( 'oo-ui-buttonElement-button' ) );
+		$this->toggleFramed( isset( $config['framed'] ) ? $config['framed'] : true );
+		$this->target->setAttributes( array(
+			'role' => 'button',
+		) );
+	}
+
+	/**
+	 * Toggle frame.
+	 *
+	 * @param boolean $framed Make button framed, omit to toggle
+	 * @chainable
+	 */
+	public function toggleFramed( $framed = null ) {
+		$this->framed = $framed !== null ? !!$framed : !$this->framed;
+		$this->element->toggleClasses( array( 'oo-ui-buttonElement-framed' ), $this->framed );
+		$this->element->toggleClasses( array( 'oo-ui-buttonElement-frameless' ), !$this->framed );
+	}
+
+	/**
+	 * Check if button has a frame.
+	 *
+	 * @return boolean Button is framed
+	 */
+	public function isFramed() {
+		return $this->framed;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->framed !== true ) {
+			$config['framed'] = $this->framed;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/FlaggedElement.php b/vendor/oojs/oojs-ui/php/mixins/FlaggedElement.php
new file mode 100644
index 00000000..bd5dc80d
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/FlaggedElement.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element with named flags that can be added, removed, listed and checked.
+ *
+ * A flag, when set, adds a CSS class on the `$element` by combining `oo-ui-flaggedElement-` with
+ * the flag name. Flags are primarily useful for styling.
+ *
+ * @abstract
+ */
+class FlaggedElement extends ElementMixin {
+	/**
+	 * Flags.
+	 *
+	 * @var string
+	 */
+	protected $flags = array();
+
+	public static $targetPropertyName = 'flagged';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param string|string[] $config['flags'] Flags describing importance and functionality, e.g.
+	 *   'primary', 'safe', 'progressive', 'destructive' or 'constructive'
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		$target = isset( $config['flagged'] ) ? $config['flagged'] : $element;
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->setFlags( isset( $config['flags'] ) ? $config['flags'] : null );
+	}
+
+	/**
+	 * Check if a flag is set.
+	 *
+	 * @param string $flag Name of flag
+	 * @return boolean Has flag
+	 */
+	public function hasFlag( $flag ) {
+		return isset( $this->flags[$flag] );
+	}
+
+	/**
+	 * Get the names of all flags set.
+	 *
+	 * @return string[] Flag names
+	 */
+	public function getFlags() {
+		return array_keys( $this->flags );
+	}
+
+	/**
+	 * Clear all flags.
+	 *
+	 * @chainable
+	 */
+	public function clearFlags() {
+		$remove = array();
+		$classPrefix = 'oo-ui-flaggedElement-';
+
+		foreach ( $this->flags as $flag ) {
+			$remove[] = $classPrefix . $flag;
+		}
+
+		$this->target->removeClasses( $remove );
+		$this->flags = array();
+
+		return $this;
+	}
+
+	/**
+	 * Add one or more flags.
+	 *
+	 * @param string|array $flags One or more flags to add, or an array keyed by flag name
+	 *   containing boolean set/remove instructions.
+	 * @chainable
+	 */
+	public function setFlags( $flags ) {
+		$add = array();
+		$remove = array();
+		$classPrefix = 'oo-ui-flaggedElement-';
+
+		if ( is_string( $flags ) ) {
+			// Set
+			if ( !isset( $this->flags[$flags] ) ) {
+				$this->flags[$flags] = true;
+				$add[] = $classPrefix . $flags;
+			}
+		} elseif ( is_array( $flags ) ) {
+			foreach ( $flags as $key => $value ) {
+				if ( is_numeric( $key ) ) {
+					// Set
+					if ( !isset( $this->flags[$value] ) ) {
+						$this->flags[$value] = true;
+						$add[] = $classPrefix . $value;
+					}
+				} else {
+					if ( $value ) {
+						// Set
+						if ( !isset( $this->flags[$key] ) ) {
+							$this->flags[$key] = true;
+							$add[] = $classPrefix . $key;
+						}
+					} else {
+						// Remove
+						if ( isset( $this->flags[$key] ) ) {
+							unset( $this->flags[$key] );
+							$remove[] = $classPrefix . $key;
+						}
+					}
+				}
+			}
+		}
+
+		$this->target
+			->addClasses( $add )
+			->removeClasses( $remove );
+
+		return $this;
+	}
+
+	public function getConfig( &$config ) {
+		if ( !empty( $this->flags ) ) {
+			$config['flags'] = $this->getFlags();
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/GroupElement.php b/vendor/oojs/oojs-ui/php/mixins/GroupElement.php
new file mode 100644
index 00000000..93d3c7a1
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/GroupElement.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element containing a sequence of child elements.
+ *
+ * @abstract
+ */
+class GroupElement extends ElementMixin {
+	/**
+	 * List of items in the group.
+	 *
+	 * @var Element[]
+	 */
+	protected $items = array();
+
+	public static $targetPropertyName = 'group';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		$target = isset( $config['group'] ) ? $config['group'] : new Tag( 'div' );
+		parent::__construct( $element, $target, $config );
+	}
+
+	/**
+	 * Check if there are no items.
+	 *
+	 * @return boolean Group is empty
+	 */
+	public function isEmpty() {
+		return !count( $this->items );
+	}
+
+	/**
+	 * Get items.
+	 *
+	 * @return Element[] Items
+	 */
+	public function getItems() {
+		return $this->items;
+	}
+
+	/**
+	 * Add items.
+	 *
+	 * Adding an existing item will move it.
+	 *
+	 * @param Element[] $items Items
+	 * @param number $index Index to insert items at
+	 * @chainable
+	 */
+	public function addItems( array $items, $index = null ) {
+		foreach ( $items as $item ) {
+			// Check if item exists then remove it first, effectively "moving" it
+			$currentIndex = array_search( $item, $this->items );
+			if ( $currentIndex !== false ) {
+				$this->removeItems( array( $item ) );
+				// Adjust index to compensate for removal
+				if ( $currentIndex < $index ) {
+					$index--;
+				}
+			}
+			// Add the item
+			$item->setElementGroup( $this );
+		}
+
+		if ( $index === null || $index < 0 || $index >= count( $this->items ) ) {
+			$this->items = array_merge( $this->items, $items );
+		} else {
+			array_splice( $this->items, $index, 0, $items );
+		}
+
+		// Update actual target element contents to reflect our list
+		$this->target->clearContent();
+		call_user_func_array( array( $this->target, 'appendContent' ), $this->items );
+
+		return $this;
+	}
+
+	/**
+	 * Remove items.
+	 *
+	 * @param Element[] $items Items to remove
+	 * @chainable
+	 */
+	public function removeItems( $items ) {
+		foreach ( $items as $item ) {
+			$index = array_search( $item, $this->items );
+			if ( $index !== false ) {
+				$item->setElementGroup( null );
+				array_splice( $this->items, $index, 1 );
+			}
+		}
+
+		// Update actual target element contents to reflect our list
+		$this->target->clearContent();
+		call_user_func_array( array( $this->target, 'appendContent' ), $this->items );
+
+		return $this;
+	}
+
+	/**
+	 * Clear all items.
+	 *
+	 * Items will be detached, not removed, so they can be used later.
+	 *
+	 * @chainable
+	 */
+	public function clearItems() {
+		foreach ( $this->items as $item ) {
+			$item->setElementGroup( null );
+		}
+
+		$this->items = array();
+		$this->target->clearContent();
+
+		return $this;
+	}
+
+	public function getConfig( &$config ) {
+		$config['items'] = $this->items;
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/IconElement.php b/vendor/oojs/oojs-ui/php/mixins/IconElement.php
new file mode 100644
index 00000000..b6d27376
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/IconElement.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element containing an icon.
+ *
+ * Icons are graphics, about the size of normal text. They can be used to aid the user in locating
+ * a control or convey information in a more space efficient way. Icons should rarely be used
+ * without labels; such as in a toolbar where space is at a premium or within a context where the
+ * meaning is very clear to the user.
+ *
+ * @abstract
+ */
+class IconElement extends ElementMixin {
+	/**
+	 * Symbolic icon name.
+	 *
+	 * @var string
+	 */
+	protected $icon = null;
+
+	public static $targetPropertyName = 'icon';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param string $config['icon'] Symbolic icon name
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		// FIXME 'iconElement' is a very stupid way to call '$icon'
+		$target = isset( $config['iconElement'] ) ? $config['iconElement'] : new Tag( 'span' );
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->target->addClasses( array( 'oo-ui-iconElement-icon' ) );
+		$this->setIcon( isset( $config['icon'] ) ? $config['icon'] : null );
+	}
+
+	/**
+	 * Set icon name.
+	 *
+	 * @param string|null $icon Symbolic icon name
+	 * @chainable
+	 */
+	public function setIcon( $icon = null ) {
+		if ( $this->icon !== null ) {
+			$this->target->removeClasses( array( 'oo-ui-icon-' . $this->icon ) );
+		}
+		if ( $icon !== null ) {
+			$this->target->addClasses( array( 'oo-ui-icon-' . $icon ) );
+		}
+
+		$this->icon = $icon;
+		$this->element->toggleClasses( array( 'oo-ui-iconElement' ), (bool)$this->icon );
+
+		return $this;
+	}
+
+	/**
+	 * Get icon name.
+	 *
+	 * @return string Icon name
+	 */
+	public function getIcon() {
+		return $this->icon;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->icon !== null ) {
+			$config['icon'] = $this->icon;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/IndicatorElement.php b/vendor/oojs/oojs-ui/php/mixins/IndicatorElement.php
new file mode 100644
index 00000000..56238b6c
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/IndicatorElement.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element containing an indicator.
+ *
+ * Indicators are graphics, smaller than normal text. They can be used to describe unique status or
+ * behavior. Indicators should only be used in exceptional cases; such as a button that opens a menu
+ * instead of performing an action directly, or an item in a list which has errors that need to be
+ * resolved.
+ *
+ * @abstract
+ */
+class IndicatorElement extends ElementMixin {
+	/**
+	 * Symbolic indicator name
+	 *
+	 * @var string|null
+	 */
+	protected $indicator = null;
+
+	public static $targetPropertyName = 'indicator';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param string $config['indicator'] Symbolic indicator name
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		// FIXME 'indicatorElement' is a very stupid way to call '$indicator'
+		$target = isset( $config['indicatorElement'] )
+			? $config['indicatorElement']
+			: new Tag( 'span' );
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->target->addClasses( array( 'oo-ui-indicatorElement-indicator' ) );
+		$this->setIndicator( isset( $config['indicator'] ) ? $config['indicator'] : null );
+	}
+
+	/**
+	 * Set indicator name.
+	 *
+	 * @param string|null $indicator Symbolic name of indicator to use or null for no indicator
+	 * @chainable
+	 */
+	public function setIndicator( $indicator = null ) {
+		if ( $this->indicator !== null ) {
+			$this->target->removeClasses( array( 'oo-ui-indicator-' . $this->indicator ) );
+		}
+		if ( $indicator !== null ) {
+			$this->target->addClasses( array( 'oo-ui-indicator-' . $indicator ) );
+		}
+
+		$this->indicator = $indicator;
+		$this->element->toggleClasses( array( 'oo-ui-indicatorElement' ), (bool)$this->indicator );
+
+		return $this;
+	}
+
+	/**
+	 * Get indicator name.
+	 *
+	 * @return string Symbolic name of indicator
+	 */
+	public function getIndicator() {
+		return $this->indicator;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->indicator !== null ) {
+			$config['indicator'] = $this->indicator;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/LabelElement.php b/vendor/oojs/oojs-ui/php/mixins/LabelElement.php
new file mode 100644
index 00000000..d5cf7bee
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/LabelElement.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element containing a label.
+ *
+ * @abstract
+ */
+class LabelElement extends ElementMixin {
+	/**
+	 * Label value.
+	 *
+	 * @var string|HtmlSnippet|null
+	 */
+	protected $label = null;
+
+	public static $targetPropertyName = 'label';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param string|HtmlSnippet $config['label'] Label text
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		// FIXME 'labelElement' is a very stupid way to call '$label'
+		$target = isset( $config['labelElement'] ) ? $config['labelElement'] : new Tag( 'span' );
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->target->addClasses( array( 'oo-ui-labelElement-label' ) );
+		$this->setLabel( isset( $config['label'] ) ? $config['label'] : null );
+	}
+
+	/**
+	 * Set the label.
+	 *
+	 * An empty string will result in the label being hidden. A string containing only whitespace will
+	 * be converted to a single `&nbsp;`.
+	 *
+	 * @param string|HtmlSnippet|null $label Label text
+	 * @chainable
+	 */
+	public function setLabel( $label ) {
+		$this->label = $label;
+
+		$this->target->clearContent();
+		if ( $this->label !== null ) {
+			if ( is_string( $this->label ) && $this->label !== '' && trim( $this->label ) === '' ) {
+				$this->target->appendContent( new HtmlSnippet( '&nbsp;' ) );
+			} else {
+				$this->target->appendContent( $label );
+			}
+		}
+
+		$this->element->toggleClasses( array( 'oo-ui-labelElement' ), !!$this->label );
+
+		return $this;
+	}
+
+	/**
+	 * Get the label.
+	 *
+	 * @return string|HtmlSnippet|null Label text
+	 */
+	public function getLabel() {
+		return $this->label;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->label !== null ) {
+			$config['label'] = $this->label;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/TabIndexedElement.php b/vendor/oojs/oojs-ui/php/mixins/TabIndexedElement.php
new file mode 100644
index 00000000..223b5371
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/TabIndexedElement.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element supporting "sequential focus navigation" using the 'tabindex' attribute.
+ *
+ * @abstract
+ */
+class TabIndexedElement extends ElementMixin {
+	/**
+	 * Tab index value.
+	 *
+	 * @var number|null
+	 */
+	protected $tabIndex = null;
+
+	public static $targetPropertyName = 'tabIndexed';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param number|null $config['tabIndex'] Tab index value. Use 0 to use default ordering, use -1 to
+	 *   prevent tab focusing, use null to suppress the `tabindex` attribute. (default: 0)
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		$target = isset( $config['tabIndexed'] ) ? $config['tabIndexed'] : $element;
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->setTabIndex( isset( $config['tabIndex'] ) ? $config['tabIndex'] : 0 );
+	}
+
+	/**
+	 * Set tab index value.
+	 *
+	 * @param number|null $tabIndex Tab index value or null for no tab index
+	 * @chainable
+	 */
+	public function setTabIndex( $tabIndex ) {
+		$tabIndex = is_numeric( $tabIndex ) ? $tabIndex : null;
+
+		if ( $this->tabIndex !== $tabIndex ) {
+			$this->tabIndex = $tabIndex;
+			$this->updateTabIndex();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Update the tabIndex attribute, in case of changes to tabIndex or disabled
+	 * state.
+	 *
+	 * @chainable
+	 */
+	public function updateTabIndex() {
+		$disabled = $this->element->isDisabled();
+		if ( $this->tabIndex !== null ) {
+			$this->target->setAttributes( array(
+				// Do not index over disabled elements
+				'tabindex' => $disabled ? -1 : $this->tabIndex,
+				// ChromeVox and NVDA do not seem to inherit this from parent elements
+				'aria-disabled' => ( $disabled ? 'true' : 'false' )
+			) );
+		} else {
+			$this->target->removeAttributes( array( 'tabindex', 'aria-disabled' ) );
+		}
+		return $this;
+	}
+
+	/**
+	 * Get tab index value.
+	 *
+	 * @return number|null Tab index value
+	 */
+	public function getTabIndex() {
+		return $this->tabIndex;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->tabIndex !== 0 ) {
+			$config['tabIndex'] = $this->tabIndex;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/mixins/TitledElement.php b/vendor/oojs/oojs-ui/php/mixins/TitledElement.php
new file mode 100644
index 00000000..5f1317c4
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/mixins/TitledElement.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Element with a title.
+ *
+ * Titles are rendered by the browser and are made visible when hovering the element. Titles are
+ * not visible on touch devices.
+ *
+ * @abstract
+ */
+class TitledElement extends ElementMixin {
+	/**
+	 * Title text.
+	 *
+	 * @var string
+	 */
+	protected $title = null;
+
+	public static $targetPropertyName = 'titled';
+
+	/**
+	 * @param Element $element Element being mixed into
+	 * @param array $config Configuration options
+	 * @param string $config['title'] Title. If not provided, the static property 'title' is used.
+	 */
+	public function __construct( Element $element, array $config = array() ) {
+		// Parent constructor
+		$target = isset( $config['titled'] ) ? $config['titled'] : $element;
+		parent::__construct( $element, $target, $config );
+
+		// Initialization
+		$this->setTitle(
+			isset( $config['title'] ) ? $config['title'] :
+			( isset( $element::$title ) ? $element::$title : null )
+		);
+	}
+
+	/**
+	 * Set title.
+	 *
+	 * @param string|null $title Title text or null for no title
+	 * @chainable
+	 */
+	public function setTitle( $title ) {
+		if ( $this->title !== $title ) {
+			$this->title = $title;
+			if ( $title !== null ) {
+				$this->target->setAttributes( array( 'title' => $title ) );
+			} else {
+				$this->target->removeAttributes( array( 'title' ) );
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get title.
+	 *
+	 * @return string Title string
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
+	public function getConfig( &$config ) {
+		if ( $this->title !== null ) {
+			$config['title'] = $this->title;
+		}
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/widgets/ButtonInputWidget.php b/vendor/oojs/oojs-ui/php/widgets/ButtonInputWidget.php
index b3bcb63b..00c17912 100644
--- a/vendor/oojs/oojs-ui/php/widgets/ButtonInputWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/ButtonInputWidget.php
@@ -6,6 +6,15 @@ namespace OOUI;
  * A button that is an input widget. Intended to be used within a FormLayout.
  */
 class ButtonInputWidget extends InputWidget {
+
+	/* Static Properties */
+
+	/**
+	 * Disable generating `<label>` elements for buttons. One would very rarely need additional label
+	 * for a button, and it's already a big clickable target, and it causes unexpected rendering.
+	 */
+	public static $supportsSimpleLabel = false;
+
 	/* Properties */
 
 	/**
@@ -60,8 +69,11 @@ class ButtonInputWidget extends InputWidget {
 	}
 
 	protected function getInputElement( $config ) {
+		$type = in_array( $config['type'], array( 'button', 'submit', 'reset' ) ) ?
+			$config['type'] :
+			'button';
 		$input = new Tag( $config['useInputTag'] ? 'input' : 'button' );
-		$input->setAttributes( array( 'type' => $config['type'] ) );
+		$input->setAttributes( array( 'type' => $type ) );
 		return $input;
 	}
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/ButtonWidget.php b/vendor/oojs/oojs-ui/php/widgets/ButtonWidget.php
index f26608b1..976ac6c2 100644
--- a/vendor/oojs/oojs-ui/php/widgets/ButtonWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/ButtonWidget.php
@@ -50,6 +50,8 @@ class ButtonWidget extends Widget {
 		$this->mixin( new FlaggedElement( $this, $config ) );
 		$this->mixin( new TabIndexedElement( $this,
 			array_merge( $config, array( 'tabIndexed' => $this->button ) ) ) );
+		$this->mixin( new AccessKeyedElement( $this,
+			array_merge( $config, array( 'accessKeyed' => $this->button ) ) ) );
 
 		// Initialization
 		$this->button->appendContent( $this->icon, $this->label, $this->indicator );
diff --git a/vendor/oojs/oojs-ui/php/widgets/CheckboxInputWidget.php b/vendor/oojs/oojs-ui/php/widgets/CheckboxInputWidget.php
index bda09c66..5d180d58 100644
--- a/vendor/oojs/oojs-ui/php/widgets/CheckboxInputWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/CheckboxInputWidget.php
@@ -27,6 +27,8 @@ class CheckboxInputWidget extends InputWidget {
 
 		// Initialization
 		$this->addClasses( array( 'oo-ui-checkboxInputWidget' ) );
+		// Required for pretty styling in MediaWiki theme
+		$this->appendContent( new Tag( 'span' ) );
 		$this->setSelected( isset( $config['selected'] ) ? $config['selected'] : false );
 	}
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/DropdownInputWidget.php b/vendor/oojs/oojs-ui/php/widgets/DropdownInputWidget.php
index ae541a66..f8ea48a3 100644
--- a/vendor/oojs/oojs-ui/php/widgets/DropdownInputWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/DropdownInputWidget.php
@@ -23,6 +23,10 @@ class DropdownInputWidget extends InputWidget {
 		// Parent constructor
 		parent::__construct( $config );
 
+		// Mixins
+		$this->mixin( new TitledElement( $this,
+			array_merge( $config, array( 'titled' => $this->input ) ) ) );
+
 		// Initialization
 		$this->setOptions( isset( $config['options'] ) ? $config['options'] : array() );
 		$this->addClasses( array( 'oo-ui-dropdownInputWidget' ) );
@@ -60,11 +64,12 @@ class DropdownInputWidget extends InputWidget {
 		// Rebuild the dropdown menu
 		$this->input->clearContent();
 		foreach ( $options as $opt ) {
+			$optValue = $this->cleanUpValue( $opt['data'] );
 			$option = new Tag( 'option' );
-			$option->setAttributes( array( 'value' => $opt['data'] ) );
-			$option->appendContent( isset( $opt['label'] ) ? $opt['label'] : $opt['data'] );
+			$option->setAttributes( array( 'value' => $optValue ) );
+			$option->appendContent( isset( $opt['label'] ) ? $opt['label'] : $optValue );
 
-			if ( $value === $opt['data'] ) {
+			if ( $value === $optValue ) {
 				$isValueAvailable = true;
 			}
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/IconWidget.php b/vendor/oojs/oojs-ui/php/widgets/IconWidget.php
index f8273f37..d752ddc8 100644
--- a/vendor/oojs/oojs-ui/php/widgets/IconWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/IconWidget.php
@@ -9,7 +9,7 @@ namespace OOUI;
  */
 class IconWidget extends Widget {
 
-	/* Static properties */
+	/* Static Properties */
 
 	public static $tagName = 'span';
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php b/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php
index 01f2055d..b933a309 100644
--- a/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php
@@ -9,7 +9,7 @@ namespace OOUI;
  */
 class IndicatorWidget extends Widget {
 
-	/* Static properties */
+	/* Static Properties */
 
 	public static $tagName = 'span';
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/InputWidget.php b/vendor/oojs/oojs-ui/php/widgets/InputWidget.php
index 234d3145..24f5a51c 100644
--- a/vendor/oojs/oojs-ui/php/widgets/InputWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/InputWidget.php
@@ -9,6 +9,10 @@ namespace OOUI;
  */
 class InputWidget extends Widget {
 
+	/* Static Properties */
+
+	public static $supportsSimpleLabel = true;
+
 	/* Properties */
 
 	/**
@@ -42,6 +46,10 @@ class InputWidget extends Widget {
 			array_merge( $config, array( 'flagged' => $this ) ) ) );
 		$this->mixin( new TabIndexedElement( $this,
 			array_merge( $config, array( 'tabIndexed' => $this->input ) ) ) );
+		$this->mixin( new TitledElement( $this,
+			array_merge( $config, array( 'titled' => $this->input ) ) ) );
+		$this->mixin( new AccessKeyedElement( $this,
+			array_merge( $config, array( 'accessKeyed' => $this->input ) ) ) );
 
 		// Initialization
 		if ( isset( $config['name'] ) ) {
@@ -53,7 +61,7 @@ class InputWidget extends Widget {
 		$this
 			->addClasses( array( 'oo-ui-inputWidget' ) )
 			->appendContent( $this->input );
-		$this->appendContent( new Tag( 'span' ) );
+		$this->input->addClasses( array( 'oo-ui-inputWidget-input' ) );
 		$this->setValue( isset( $config['value'] ) ? $config['value'] : null );
 	}
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php b/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php
index b59a5f25..8945b15f 100644
--- a/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/LabelWidget.php
@@ -7,7 +7,7 @@ namespace OOUI;
  */
 class LabelWidget extends Widget {
 
-	/* Static properties */
+	/* Static Properties */
 
 	public static $tagName = 'span';
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/RadioInputWidget.php b/vendor/oojs/oojs-ui/php/widgets/RadioInputWidget.php
index 26da29d0..69fd0a8e 100644
--- a/vendor/oojs/oojs-ui/php/widgets/RadioInputWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/RadioInputWidget.php
@@ -18,6 +18,8 @@ class RadioInputWidget extends InputWidget {
 
 		// Initialization
 		$this->addClasses( array( 'oo-ui-radioInputWidget' ) );
+		// Required for pretty styling in MediaWiki theme
+		$this->appendContent( new Tag( 'span' ) );
 		$this->setSelected( isset( $config['selected'] ) ? $config['selected'] : false );
 	}
 
diff --git a/vendor/oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php b/vendor/oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php
new file mode 100644
index 00000000..912c6917
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Multiple radio buttons input widget. Intended to be used within a OO.ui.FormLayout.
+ */
+class RadioSelectInputWidget extends InputWidget {
+
+	/* Static Properties */
+
+	public static $supportsSimpleLabel = false;
+
+	/* Properties */
+
+	/**
+	 * @var string|null
+	 */
+	protected $name = null;
+
+	/**
+	 * @var FieldLayout[]
+	 */
+	protected $fields = array();
+
+	/**
+	 * @param array $config Configuration options
+	 * @param array[] $config['options'] Array of menu options in the format
+	 *   `array( 'data' => …, 'label' => … )`
+	 */
+	public function __construct( array $config = array() ) {
+		// Parent constructor
+		parent::__construct( $config );
+
+		if ( isset( $config['name'] ) ) {
+			$this->name = $config['name'];
+		}
+
+		// Initialization
+		$this->setOptions( isset( $config['options'] ) ? $config['options'] : array() );
+		$this->addClasses( array( 'oo-ui-radioSelectInputWidget' ) );
+	}
+
+	protected function getInputElement( $config ) {
+		// Actually unused
+		return new Tag( 'div' );
+	}
+
+	public function setValue( $value ) {
+		$this->value = $this->cleanUpValue( $value );
+		foreach ( $this->fields as &$field ) {
+			$field->getField()->setSelected( $field->getField()->getValue() === $this->value );
+		}
+		return $this;
+	}
+
+	/**
+	 * Set the options available for this input.
+	 *
+	 * @param array[] $options Array of menu options in the format
+	 *   `array( 'data' => …, 'label' => … )`
+	 * @chainable
+	 */
+	public function setOptions( $options ) {
+		$value = $this->getValue();
+		$isValueAvailable = false;
+		$this->fields = array();
+
+		// Rebuild the radio buttons
+		$this->clearContent();
+		// Need a unique name, otherwise more than one radio will be selectable
+		$name = $this->name ?: 'oo-ui-radioSelectInputWidget' . mt_rand();
+		foreach ( $options as $opt ) {
+			$optValue = $this->cleanUpValue( $opt['data'] );
+			$field = new FieldLayout(
+				new RadioInputWidget( array(
+					'name' => $name,
+					'value' => $optValue,
+					'disabled' => $this->isDisabled(),
+				) ),
+				array(
+					'label' => isset( $opt['label'] ) ? $opt['label'] : $optValue,
+					'align' => 'inline',
+				)
+			);
+
+			if ( $value === $optValue ) {
+				$isValueAvailable = true;
+			}
+
+			$this->fields[] = $field;
+			$this->appendContent( $field );
+		}
+
+		// Restore the previous value, or reset to something sensible
+		if ( $isValueAvailable ) {
+			// Previous value is still available
+			$this->setValue( $value );
+		} else {
+			// No longer valid, reset
+			if ( count( $options ) ) {
+				$this->setValue( $options[0]['data'] );
+			}
+		}
+
+		return $this;
+	}
+
+	public function setDisabled( $state ) {
+		parent::setDisabled( $state );
+		foreach ( $this->fields as $field ) {
+			$field->getField()->setDisabled( $this->isDisabled() );
+		}
+		return $this;
+	}
+
+	public function getConfig( &$config ) {
+		$o = array();
+		foreach ( $this->fields as $field ) {
+			$label = $field->getLabel();
+			$data = $field->getField()->getValue();
+			$o[] = array( 'data' => $data, 'label' => $label );
+		}
+		$config['options'] = $o;
+		return parent::getConfig( $config );
+	}
+}
diff --git a/vendor/oojs/oojs-ui/php/widgets/TextInputWidget.php b/vendor/oojs/oojs-ui/php/widgets/TextInputWidget.php
index a5f31f74..210729fd 100644
--- a/vendor/oojs/oojs-ui/php/widgets/TextInputWidget.php
+++ b/vendor/oojs/oojs-ui/php/widgets/TextInputWidget.php
@@ -9,6 +9,13 @@ class TextInputWidget extends InputWidget {
 
 	/* Properties */
 
+	/**
+	 * Input field type.
+	 *
+	 * @var string
+	 */
+	protected $type = null;
+
 	/**
 	 * Prevent changes.
 	 *
@@ -25,27 +32,49 @@ class TextInputWidget extends InputWidget {
 
 	/**
 	 * @param array $config Configuration options
-	 * @param string $config['type'] HTML tag `type` attribute (default: 'text')
+	 * @param string $config['type'] HTML tag `type` attribute: 'text', 'password', 'search', 'email'
+	 *   or 'url'. Ignored if `multiline` is true. (default: 'text')
+	 *
+	 *   Some values of `type` result in additional behaviors:
+	 *   - `search`: implies `icon: 'search'` and `indicator: 'clear'`; when clicked, the indicator
+	 *     empties the text field
 	 * @param string $config['placeholder'] Placeholder text
 	 * @param boolean $config['autofocus'] Ask the browser to focus this widget, using the 'autofocus'
 	 *   HTML attribute (default: false)
 	 * @param boolean $config['readOnly'] Prevent changes (default: false)
 	 * @param number $config['maxLength'] Maximum allowed number of characters to input
 	 * @param boolean $config['multiline'] Allow multiple lines of text (default: false)
-	 * @param boolean $config['required'] Mark the field as required (default: false)
+	 * @param int $config['rows'] If multiline, number of visible lines in textarea
+	 * @param boolean $config['required'] Mark the field as required.
+	 *   Implies `indicator: 'required'`. (default: false)
+	 * @param boolean $config['autocomplete'] If the field should support autocomplete
+	 *   or not (default: true)
 	 */
 	public function __construct( array $config = array() ) {
 		// Config initialization
 		$config = array_merge( array(
+			'type' => 'text',
 			'readOnly' => false,
 			'autofocus' => false,
 			'required' => false,
+			'autocomplete' => true,
 		), $config );
+		if ( $config['type'] === 'search' ) {
+			if ( !array_key_exists( 'icon', $config ) ) {
+				$config['icon'] = 'search';
+			}
+		}
+		if ( $config['required'] ) {
+			if ( !array_key_exists( 'indicator', $config ) ) {
+				$config['indicator'] = 'required';
+			}
+		}
 
 		// Parent constructor
 		parent::__construct( $config );
 
 		// Properties
+		$this->type = $this->getSaneType( $config );
 		$this->multiline = isset( $config['multiline'] ) ? (bool)$config['multiline'] : false;
 
 		// Mixins
@@ -54,7 +83,7 @@ class TextInputWidget extends InputWidget {
 
 		// Initialization
 		$this
-			->addClasses( array( 'oo-ui-textInputWidget' ) )
+			->addClasses( array( 'oo-ui-textInputWidget', 'oo-ui-textInputWidget-type-' . $this->type ) )
 			->appendContent( $this->icon, $this->indicator );
 		$this->setReadOnly( $config['readOnly'] );
 		if ( isset( $config['placeholder'] ) ) {
@@ -69,6 +98,12 @@ class TextInputWidget extends InputWidget {
 		if ( $config['required'] ) {
 			$this->input->setAttributes( array( 'required' => 'required', 'aria-required' => 'true' ) );
 		}
+		if ( !$config['autocomplete'] ) {
+			$this->input->setAttributes( array( 'autocomplete' => 'off' ) );
+		}
+		if ( $this->multiline && isset( $config['rows'] ) ) {
+			$this->input->setAttributes( array( 'rows' => $config['rows'] ) );
+		}
 	}
 
 	/**
@@ -101,13 +136,23 @@ class TextInputWidget extends InputWidget {
 		if ( isset( $config['multiline'] ) && $config['multiline'] ) {
 			return new Tag( 'textarea' );
 		} else {
-			$type = isset( $config['type'] ) ? $config['type'] : 'text';
 			$input = new Tag( 'input' );
-			$input->setAttributes( array( 'type' => $type ) );
+			$input->setAttributes( array( 'type' => $this->getSaneType( $config ) ) );
 			return $input;
 		}
 	}
 
+	private function getSaneType( $config ) {
+		if ( isset( $config['multiline'] ) && $config['multiline'] ) {
+			return 'multiline';
+		} else {
+			$type = in_array( $config['type'], array( 'text', 'password', 'search', 'email', 'url' ) ) ?
+				$config['type'] :
+				'text';
+			return $type;
+		}
+	}
+
 	/**
 	 * Check if input supports multiple lines.
 	 *
@@ -120,6 +165,10 @@ class TextInputWidget extends InputWidget {
 	public function getConfig( &$config ) {
 		if ( $this->isMultiline() ) {
 			$config['multiline'] = true;
+			$rows = $this->input->getAttribute( 'rows' );
+			if ( $rows !== null ) {
+				$config['rows'] = $rows;
+			}
 		} else {
 			$type = $this->input->getAttribute( 'type' );
 			if ( $type !== 'text' ) {
@@ -146,6 +195,10 @@ class TextInputWidget extends InputWidget {
 		if ( ( $required !== null ) || ( $ariarequired !== null ) ) {
 			$config['required'] = true;
 		}
+		$autocomplete = $this->input->getAttribute( 'autocomplete' );
+		if ( $autocomplete !== null ) {
+			$config['autocomplete'] = false;
+		}
 		return parent::getConfig( $config );
 	}
 }
-- 
cgit v1.2.3-54-g00ecf