Merge ""spellcheck" attribute for HTMLForm "text" and "textarea""

diff --combined includes/htmlform/HTMLTextAreaField.php
index 22e96f6,ba9707d..a4ed95f
--- 1/includes/htmlform/HTMLTextAreaField.php
--- 2/includes/htmlform/HTMLTextAreaField.php
+++ b/includes/htmlform/HTMLTextAreaField.php
@@@ -12,11 -12,21 +12,21 @@@ class HTMLTextAreaField extends HTMLFor
                return isset( $this->mParams['rows'] ) ? $this->mParams['rows'] : static::DEFAULT_ROWS;
        }
  
+       function getSpellCheck() {
+               $val = isset( $this->mParams['spellcheck'] ) ? $this->mParams['spellcheck'] : null;
+               if( is_bool( $val ) ) {
+                       // "spellcheck" attribute literally requires "true" or "false" to work.
+                       return $val === true ? 'true' : 'false';
+               }
+               return null;
+       }
+ 
        function getInputHTML( $value ) {
                $attribs = array(
                                'id' => $this->mID,
                                'cols' => $this->getCols(),
                                'rows' => $this->getRows(),
+                               'spellcheck' => $this->getSpellCheck(),
                        ) + $this->getTooltipAndAccessKey();
  
                if ( $this->mClass !== '' ) {
@@@ -35,33 -45,4 +45,33 @@@
                $attribs += $this->getAttributes( $allowedParams );
                return Html::textarea( $this->mName, $value, $attribs );
        }
 +
 +      function getInputOOUI( $value ) {
 +              $attribs = $this->getTooltipAndAccessKey();
 +
 +              if ( $this->mClass !== '' ) {
 +                      $attribs['classes'] = array( $this->mClass );
 +              }
 +
 +              $allowedParams = array(
 +                      'placeholder',
 +                      'tabindex',
 +                      'disabled',
 +                      'readonly',
 +                      'required',
 +                      'autofocus',
 +              );
 +
 +              $attribs += $this->getAttributes( $allowedParams, array(
 +                      'tabindex' => 'tabIndex',
 +                      'readonly' => 'readOnly',
 +              ) );
 +
 +              return new OOUI\TextInputWidget( array(
 +                      'id' => $this->mID,
 +                      'name' => $this->mName,
 +                      'multiline' => true,
 +                      'value' => $value,
 +              ) + $attribs );
 +      }
  }

diff --combined includes/htmlform/HTMLTextField.php
index 2958274,76278db..06b397f
--- 1/includes/htmlform/HTMLTextField.php
--- 2/includes/htmlform/HTMLTextField.php
+++ b/includes/htmlform/HTMLTextField.php
@@@ -5,6 -5,15 +5,15 @@@ class HTMLTextField extends HTMLFormFie
                return isset( $this->mParams['size'] ) ? $this->mParams['size'] : 45;
        }
  
+       function getSpellCheck() {
+               $val = isset( $this->mParams['spellcheck'] ) ? $this->mParams['spellcheck'] : null;
+               if( is_bool( $val ) ) {
+                       // "spellcheck" attribute literally requires "true" or "false" to work.
+                       return $val === true ? 'true' : 'false';
+               }
+               return null;
+       }
+ 
        function getInputHTML( $value ) {
                $attribs = array(
                                'id' => $this->mID,
@@@ -12,6 -21,7 +21,7 @@@
                                'size' => $this->getSize(),
                                'value' => $value,
                                'dir' => $this->mDir,
+                               'spellcheck' => $this->getSpellCheck(),
                        ) + $this->getTooltipAndAccessKey();
  
                if ( $this->mClass !== '' ) {
@@@ -41,11 -51,6 +51,11 @@@
                $attribs += $this->getAttributes( $allowedParams );
  
                # Extract 'type'
 +              $type = $this->getType( $attribs );
 +              return Html::input( $this->mName, $value, $type, $attribs );
 +      }
 +
 +      protected function getType( &$attribs ) {
                $type = isset( $attribs['type'] ) ? $attribs['type'] : 'text';
                unset( $attribs['type'] );
  
@@@ -71,45 -76,6 +81,45 @@@
                        }
                }
  
 -              return Html::input( $this->mName, $value, $type, $attribs );
 +              return $type;
 +      }
 +
 +      function getInputOOUI( $value ) {
 +              $attribs = $this->getTooltipAndAccessKey();
 +
 +              if ( $this->mClass !== '' ) {
 +                      $attribs['classes'] = array( $this->mClass );
 +              }
 +
 +              # @todo Enforce pattern, step, required, readonly on the server side as
 +              # well
 +              $allowedParams = array(
 +                      'autofocus',
 +                      'autosize',
 +                      'disabled',
 +                      'flags',
 +                      'indicator',
 +                      'maxlength',
 +                      'placeholder',
 +                      'readonly',
 +                      'required',
 +                      'tabindex',
 +                      'type',
 +              );
 +
 +              $attribs += $this->getAttributes( $allowedParams, array(
 +                      'maxlength' => 'maxLength',
 +                      'readonly' => 'readOnly',
 +                      'tabindex' => 'tabIndex',
 +              ) );
 +
 +              $type = $this->getType( $attribs );
 +
 +              return new OOUI\TextInputWidget( array(
 +                      'id' => $this->mID,
 +                      'name' => $this->mName,
 +                      'value' => $value,
 +                      'type' => $type,
 +              ) + $attribs );
        }
  }