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

Merge "Namespace HTMLForm and friends"

Browse source
This commit is contained in:
jenkins-bot 2024-02-14 19:21:10 +00:00 committed by Gerrit Code Review
commit db99d3f67b
126 changed files with 676 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
RELEASE-NOTES-1.42
View file

@ -438,6 +438,59 @@ because of Phabricator reports.
- TransactionRoundDefiningUpdate
- UserEditCountInfo
- UserEditCountUpdate
- MediaWiki\HTMLForm:
- CodexHTMLForm
- CollapsibleFieldsetLayout
- HTMLForm
- HTMLFormActionFieldLayout
- HTMLFormElement
- HTMLFormField
- HTMLFormFieldLayout
- HTMLFormFieldRequiredOptionsException
- HTMLNestedFilterable
- OOUIHTMLForm
- VFormHTMLForm
- MediaWiki\HTMLForm\Field:
- HTMLApiField
- HTMLAutoCompleteSelectField
- HTMLButtonField
- HTMLCheckField
- HTMLCheckMatrix
- HTMLComboboxField
- HTMLDateTimeField
- HTMLEditTools
- HTMLExpiryField
- HTMLFileField
- HTMLFloatField
- HTMLFormFieldCloner
- HTMLFormFieldWithButton
- HTMLHiddenField
- HTMLInfoField
- HTMLIntField
- HTMLMultiSelectField
- HTMLNamespacesMultiselectField
- HTMLRadioField
- HTMLRestrictionsField
- HTMLSelectAndOtherField
- HTMLSelectField
- HTMLSelectLanguageField
- HTMLSelectLimitField
- HTMLSelectNamespace
- HTMLSelectNamespaceWithButton
- HTMLSelectOrOtherField
- HTMLSizeFilterField
- HTMLSubmitField
- HTMLTagFilter
- HTMLTagMultiselectField
- HTMLTextAreaField
- HTMLTextField
- HTMLTextFieldWithButton
- HTMLTimezoneField
- HTMLTitleTextField
- HTMLTitlesMultiselectField
- HTMLToggleSwitchField
- HTMLUserTextField
- HTMLUsersMultiselectField
- MediaWiki\Installer:
- DatabaseUpdater
- MysqlUpdater

51
autoload.php
View file

@ -1144,6 +1144,57 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\FileBackend\\FSFile\\TempFSFileFactory' => __DIR__ . '/includes/libs/filebackend/fsfile/TempFSFileFactory.php',
'MediaWiki\\FileBackend\\LockManager\\LockManagerGroupFactory' => __DIR__ . '/includes/filebackend/lockmanager/LockManagerGroupFactory.php',
'MediaWiki\\FileRepo\\File\\FileSelectQueryBuilder' => __DIR__ . '/includes/filerepo/file/FileSelectQueryBuilder.php',
'MediaWiki\\HTMLForm\\CodexHTMLForm' => __DIR__ . '/includes/htmlform/CodexHTMLForm.php',
'MediaWiki\\HTMLForm\\CollapsibleFieldsetLayout' => __DIR__ . '/includes/htmlform/CollapsibleFieldsetLayout.php',
'MediaWiki\\HTMLForm\\Field\\HTMLApiField' => __DIR__ . '/includes/htmlform/fields/HTMLApiField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLAutoCompleteSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLAutoCompleteSelectField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLButtonField' => __DIR__ . '/includes/htmlform/fields/HTMLButtonField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLCheckField' => __DIR__ . '/includes/htmlform/fields/HTMLCheckField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLCheckMatrix' => __DIR__ . '/includes/htmlform/fields/HTMLCheckMatrix.php',
'MediaWiki\\HTMLForm\\Field\\HTMLComboboxField' => __DIR__ . '/includes/htmlform/fields/HTMLComboboxField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLDateTimeField' => __DIR__ . '/includes/htmlform/fields/HTMLDateTimeField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLEditTools' => __DIR__ . '/includes/htmlform/fields/HTMLEditTools.php',
'MediaWiki\\HTMLForm\\Field\\HTMLExpiryField' => __DIR__ . '/includes/htmlform/fields/HTMLExpiryField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLFileField' => __DIR__ . '/includes/htmlform/fields/HTMLFileField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLFloatField' => __DIR__ . '/includes/htmlform/fields/HTMLFloatField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldCloner.php',
'MediaWiki\\HTMLForm\\Field\\HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldWithButton.php',
'MediaWiki\\HTMLForm\\Field\\HTMLHiddenField' => __DIR__ . '/includes/htmlform/fields/HTMLHiddenField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLInfoField' => __DIR__ . '/includes/htmlform/fields/HTMLInfoField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLIntField' => __DIR__ . '/includes/htmlform/fields/HTMLIntField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLMultiSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLMultiSelectField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLNamespacesMultiselectField' => __DIR__ . '/includes/htmlform/fields/HTMLNamespacesMultiselectField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLRadioField' => __DIR__ . '/includes/htmlform/fields/HTMLRadioField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLRestrictionsField' => __DIR__ . '/includes/htmlform/fields/HTMLRestrictionsField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectAndOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectAndOtherField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectLanguageField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectLanguageField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectLimitField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespace.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSelectOrOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectOrOtherField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSizeFilterField' => __DIR__ . '/includes/htmlform/fields/HTMLSizeFilterField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLSubmitField' => __DIR__ . '/includes/htmlform/fields/HTMLSubmitField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTagFilter' => __DIR__ . '/includes/htmlform/fields/HTMLTagFilter.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTagMultiselectField' => __DIR__ . '/includes/htmlform/fields/HTMLTagMultiselectField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTextAreaField' => __DIR__ . '/includes/htmlform/fields/HTMLTextAreaField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTextField' => __DIR__ . '/includes/htmlform/fields/HTMLTextField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTextFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLTextFieldWithButton.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTimezoneField' => __DIR__ . '/includes/htmlform/fields/HTMLTimezoneField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTitleTextField' => __DIR__ . '/includes/htmlform/fields/HTMLTitleTextField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLTitlesMultiselectField' => __DIR__ . '/includes/htmlform/fields/HTMLTitlesMultiselectField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLToggleSwitchField' => __DIR__ . '/includes/htmlform/fields/HTMLToggleSwitchField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLUserTextField' => __DIR__ . '/includes/htmlform/fields/HTMLUserTextField.php',
'MediaWiki\\HTMLForm\\Field\\HTMLUsersMultiselectField' => __DIR__ . '/includes/htmlform/fields/HTMLUsersMultiselectField.php',
'MediaWiki\\HTMLForm\\HTMLForm' => __DIR__ . '/includes/htmlform/HTMLForm.php',
'MediaWiki\\HTMLForm\\HTMLFormActionFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormActionFieldLayout.php',
'MediaWiki\\HTMLForm\\HTMLFormElement' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
'MediaWiki\\HTMLForm\\HTMLFormField' => __DIR__ . '/includes/htmlform/HTMLFormField.php',
'MediaWiki\\HTMLForm\\HTMLFormFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormFieldLayout.php',
'MediaWiki\\HTMLForm\\HTMLFormFieldRequiredOptionsException' => __DIR__ . '/includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
'MediaWiki\\HTMLForm\\HTMLNestedFilterable' => __DIR__ . '/includes/htmlform/HTMLNestedFilterable.php',
'MediaWiki\\HTMLForm\\OOUIHTMLForm' => __DIR__ . '/includes/htmlform/OOUIHTMLForm.php',
'MediaWiki\\HTMLForm\\VFormHTMLForm' => __DIR__ . '/includes/htmlform/VFormHTMLForm.php',
'MediaWiki\\HeaderCallback' => __DIR__ . '/includes/Request/HeaderCallback.php',
'MediaWiki\\HookContainer\\DeprecatedHooks' => __DIR__ . '/includes/HookContainer/DeprecatedHooks.php',
'MediaWiki\\HookContainer\\FauxGlobalHookArray' => __DIR__ . '/includes/HookContainer/FauxGlobalHookArray.php',

2
includes/actions/Hook/ActionBeforeFormDisplayHook.php
View file

@ -3,7 +3,7 @@
namespace MediaWiki\Hook;
use Article;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
/**
* This is a hook handler interface, see docs/Hooks.md.

5
includes/htmlform/CodexHTMLForm.php
View file

@ -21,6 +21,8 @@
* @file
*/
namespace MediaWiki\HTMLForm;
use MediaWiki\Html\Html;
/**
@ -66,3 +68,6 @@ class CodexHTMLForm extends HTMLForm {
return Html::rawElement( 'form', $this->getFormAttributes(), $html );
}
}
/** @deprecated since 1.42 */
class_alias( CodexHTMLForm::class, 'CodexHTMLForm' );

11
includes/htmlform/CollapsibleFieldsetLayout.php
View file

@ -1,9 +1,11 @@
<?php
namespace MediaWiki\HTMLForm;
/*
* @stable to extend
*/
class CollapsibleFieldsetLayout extends OOUI\FieldsetLayout {
class CollapsibleFieldsetLayout extends \OOUI\FieldsetLayout {
/**
* @stable to call
* @inheritDoc
@ -19,11 +21,11 @@ class CollapsibleFieldsetLayout extends OOUI\FieldsetLayout {
$this->group->addClasses( [ 'mw-collapsible-content' ] );
$this->header->appendContent(
new OOUI\IconWidget( [
new \OOUI\IconWidget( [
'icon' => 'expand',
'label' => wfMessage( 'collapsible-expand' )->text(),
] ),
new OOUI\IconWidget( [
new \OOUI\IconWidget( [
'icon' => 'collapse',
'label' => wfMessage( 'collapsible-collapse' )->text(),
] )
@ -34,3 +36,6 @@ class CollapsibleFieldsetLayout extends OOUI\FieldsetLayout {
] );
}
}
/** @deprecated since 1.42 */
class_alias( CollapsibleFieldsetLayout::class, 'CollapsibleFieldsetLayout' );

51
includes/htmlform/HTMLForm.php
View file

@ -21,10 +21,51 @@
* @file
*/
namespace MediaWiki\HTMLForm;
use DomainException;
use InvalidArgumentException;
use LogicException;
use MediaWiki\Context\ContextSource;
use MediaWiki\Context\IContextSource;
use MediaWiki\HookContainer\ProtectedHookAccessorTrait;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\Field\HTMLApiField;
use MediaWiki\HTMLForm\Field\HTMLAutoCompleteSelectField;
use MediaWiki\HTMLForm\Field\HTMLCheckField;
use MediaWiki\HTMLForm\Field\HTMLCheckMatrix;
use MediaWiki\HTMLForm\Field\HTMLComboboxField;
use MediaWiki\HTMLForm\Field\HTMLDateTimeField;
use MediaWiki\HTMLForm\Field\HTMLEditTools;
use MediaWiki\HTMLForm\Field\HTMLExpiryField;
use MediaWiki\HTMLForm\Field\HTMLFileField;
use MediaWiki\HTMLForm\Field\HTMLFloatField;
use MediaWiki\HTMLForm\Field\HTMLFormFieldCloner;
use MediaWiki\HTMLForm\Field\HTMLHiddenField;
use MediaWiki\HTMLForm\Field\HTMLInfoField;
use MediaWiki\HTMLForm\Field\HTMLIntField;
use MediaWiki\HTMLForm\Field\HTMLMultiSelectField;
use MediaWiki\HTMLForm\Field\HTMLNamespacesMultiselectField;
use MediaWiki\HTMLForm\Field\HTMLRadioField;
use MediaWiki\HTMLForm\Field\HTMLSelectAndOtherField;
use MediaWiki\HTMLForm\Field\HTMLSelectField;
use MediaWiki\HTMLForm\Field\HTMLSelectLanguageField;
use MediaWiki\HTMLForm\Field\HTMLSelectLimitField;
use MediaWiki\HTMLForm\Field\HTMLSelectNamespace;
use MediaWiki\HTMLForm\Field\HTMLSelectNamespaceWithButton;
use MediaWiki\HTMLForm\Field\HTMLSelectOrOtherField;
use MediaWiki\HTMLForm\Field\HTMLSizeFilterField;
use MediaWiki\HTMLForm\Field\HTMLSubmitField;
use MediaWiki\HTMLForm\Field\HTMLTagFilter;
use MediaWiki\HTMLForm\Field\HTMLTagMultiselectField;
use MediaWiki\HTMLForm\Field\HTMLTextAreaField;
use MediaWiki\HTMLForm\Field\HTMLTextField;
use MediaWiki\HTMLForm\Field\HTMLTextFieldWithButton;
use MediaWiki\HTMLForm\Field\HTMLTimezoneField;
use MediaWiki\HTMLForm\Field\HTMLTitlesMultiselectField;
use MediaWiki\HTMLForm\Field\HTMLTitleTextField;
use MediaWiki\HTMLForm\Field\HTMLUsersMultiselectField;
use MediaWiki\HTMLForm\Field\HTMLUserTextField;
use MediaWiki\Linker\Linker;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MainConfigNames;
@ -33,6 +74,11 @@ use MediaWiki\Parser\Sanitizer;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
use MediaWiki\Title\TitleValue;
use Message;
use MessageSpecifier;
use StatusValue;
use Stringable;
use Xml;
/**
* Object handling generic submission, CSRF protection, layout and
@ -1362,7 +1408,7 @@ class HTMLForm extends ContextSource {
*
* @stable to override
* @param string $html HTML contents to wrap.
* @return string|OOUI\Tag Wrapped HTML.
* @return string|\OOUI\Tag Wrapped HTML.
*/
public function wrapForm( $html ) {
# Include a <fieldset> wrapper for style, if requested.
@ -2220,3 +2266,6 @@ class HTMLForm extends ContextSource {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLForm::class, 'HTMLForm' );

7
includes/htmlform/HTMLFormActionFieldLayout.php
View file

@ -1,9 +1,11 @@
<?php
namespace MediaWiki\HTMLForm;
/*
* @stable to extend
*/
class HTMLFormActionFieldLayout extends OOUI\ActionFieldLayout {
class HTMLFormActionFieldLayout extends \OOUI\ActionFieldLayout {
use HTMLFormElement;
/**
@ -21,3 +23,6 @@ class HTMLFormActionFieldLayout extends OOUI\ActionFieldLayout {
return 'mw.htmlform.ActionFieldLayout';
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormActionFieldLayout::class, 'HTMLFormActionFieldLayout' );

5
includes/htmlform/HTMLFormElement.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm;
/**
* Allows custom data specific to HTMLFormField to be set for OOUI forms. A matching JS widget
* (defined in htmlform.Element.js) picks up the extra config when constructed using OO.ui.infuse().
@ -33,3 +35,6 @@ trait HTMLFormElement {
} );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormElement::class, 'HTMLFormElement' );

31
includes/htmlform/HTMLFormField.php
View file

@ -1,10 +1,20 @@
<?php
namespace MediaWiki\HTMLForm;
use FormatJson;
use HtmlArmor;
use HTMLCheckField;
use HTMLFormFieldCloner;
use InvalidArgumentException;
use MediaWiki\Context\RequestContext;
use MediaWiki\Html\Html;
use MediaWiki\Linker\Linker;
use MediaWiki\Request\WebRequest;
use MediaWiki\Status\Status;
use Message;
use MessageSpecifier;
use StatusValue;
/**
* The parent class to generate form fields. Any field type should
@ -69,7 +79,7 @@ abstract class HTMLFormField {
* @stable to override
*
* @param string $value
* @return OOUI\Widget|string|false
* @return \OOUI\Widget|string|false
*/
public function getInputOOUI( $value ) {
return false;
@ -700,7 +710,7 @@ abstract class HTMLFormField {
*
* @param string $value The value to set the input to.
*
* @return OOUI\FieldLayout
* @return \OOUI\FieldLayout
*/
public function getOOUI( $value ) {
$inputField = $this->getInputOOUI( $value );
@ -710,7 +720,7 @@ abstract class HTMLFormField {
// generate the whole field, label and errors and all, then wrap it in a Widget.
// It might look weird, but it'll work OK.
return $this->getFieldLayoutOOUI(
new OOUI\Widget( [ 'content' => new OOUI\HtmlSnippet( $this->getDiv( $value ) ) ] ),
new \OOUI\Widget( [ 'content' => new \OOUI\HtmlSnippet( $this->getDiv( $value ) ) ] ),
[ 'align' => 'top' ]
);
}
@ -720,7 +730,7 @@ abstract class HTMLFormField {
// We have an OOUI implementation, but it's not proper, and we got a load of HTML.
// Cheat a little and wrap it in a widget. It won't be infusable, though, since client-side
// JavaScript doesn't know how to rebuilt the contents.
$inputField = new OOUI\Widget( [ 'content' => new OOUI\HtmlSnippet( $inputField ) ] );
$inputField = new \OOUI\Widget( [ 'content' => new \OOUI\HtmlSnippet( $inputField ) ] );
$infusable = false;
}
@ -728,13 +738,13 @@ abstract class HTMLFormField {
$help = $this->getHelpText();
$errors = $this->getErrorsRaw( $value );
foreach ( $errors as &$error ) {
$error = new OOUI\HtmlSnippet( $error );
$error = new \OOUI\HtmlSnippet( $error );
}
$config = [
'classes' => [ "mw-htmlform-field-$fieldType" ],
'align' => $this->getLabelAlignOOUI(),
'help' => ( $help !== null && $help !== '' ) ? new OOUI\HtmlSnippet( $help ) : null,
'help' => ( $help !== null && $help !== '' ) ? new \OOUI\HtmlSnippet( $help ) : null,
'errors' => $errors,
'infusable' => $infusable,
'helpInline' => $this->isHelpInline(),
@ -757,7 +767,7 @@ abstract class HTMLFormField {
// the element could specify, that the label doesn't need to be added
$label = $this->getLabel();
if ( $label && $label !== "\u{00A0}" && $label !== '&#160;' ) {
$config['label'] = new OOUI\HtmlSnippet( $label );
$config['label'] = new \OOUI\HtmlSnippet( $label );
}
if ( $this->mCondState ) {
@ -798,9 +808,9 @@ abstract class HTMLFormField {
/**
* Get a FieldLayout (or subclass thereof) to wrap this field in when using OOUI output.
* @param OOUI\Widget $inputField
* @param \OOUI\Widget $inputField
* @param array $config
* @return OOUI\FieldLayout
* @return \OOUI\FieldLayout
*/
protected function getFieldLayoutOOUI( $inputField, $config ) {
return new HTMLFormFieldLayout( $inputField, $config );
@ -1312,3 +1322,6 @@ abstract class HTMLFormField {
return (bool)$this->mCondState;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormField::class, 'HTMLFormField' );

9
includes/htmlform/HTMLFormFieldLayout.php
View file

@ -1,10 +1,12 @@
<?php
namespace MediaWiki\HTMLForm;
/*
* @stable to extend
*/
class HTMLFormFieldLayout extends OOUI\FieldLayout {
use HTMLFormElement;
class HTMLFormFieldLayout extends \OOUI\FieldLayout {
use \MediaWiki\HTMLForm\HTMLFormElement;
/**
* @stable to call
@ -21,3 +23,6 @@ class HTMLFormFieldLayout extends OOUI\FieldLayout {
return 'mw.htmlform.FieldLayout';
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormFieldLayout::class, 'HTMLFormFieldLayout' );

7
includes/htmlform/HTMLFormFieldRequiredOptionsException.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm;
use InvalidArgumentException;
/**
* @newable
* @stable to extend
@ -18,3 +22,6 @@ class HTMLFormFieldRequiredOptionsException extends InvalidArgumentException {
implode( ', ', $missing ) ) );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormFieldRequiredOptionsException::class, 'HTMLFormFieldRequiredOptionsException' );

5
includes/htmlform/HTMLNestedFilterable.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm;
interface HTMLNestedFilterable {
/**
* Support for separating multi-option preferences into multiple preferences
@ -9,3 +11,6 @@ interface HTMLNestedFilterable {
*/
public function filterDataForSubmit( $data );
}
/** @deprecated since 1.42 */
class_alias( HTMLNestedFilterable::class, 'HTMLNestedFilterable' );

54
includes/htmlform/OOUIHTMLForm.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm;
/**
* HTML form generation and submission handling, OOUI style.
*
@ -21,6 +23,7 @@
* @file
*/
use DomainException;
use MediaWiki\Html\Html;
use MediaWiki\Linker\Linker;
use MediaWiki\Parser\Sanitizer;
@ -83,18 +86,18 @@ class OOUIHTMLForm extends HTMLForm {
];
}
$buttons .= new OOUI\ButtonInputWidget( $attribs );
$buttons .= new \OOUI\ButtonInputWidget( $attribs );
}
if ( $this->mShowReset ) {
$buttons .= new OOUI\ButtonInputWidget( [
$buttons .= new \OOUI\ButtonInputWidget( [
'type' => 'reset',
'label' => $this->msg( 'htmlform-reset' )->text(),
] );
}
if ( $this->mShowCancel ) {
$buttons .= new OOUI\ButtonWidget( [
$buttons .= new \OOUI\ButtonWidget( [
'label' => $this->msg( 'cancel' )->text(),
'href' => $this->getCancelTargetURL(),
] );
@ -114,18 +117,18 @@ class OOUIHTMLForm extends HTMLForm {
}
if ( isset( $button['label-message'] ) ) {
$label = new OOUI\HtmlSnippet( $this->getMessage( $button['label-message'] )->parse() );
$label = new \OOUI\HtmlSnippet( $this->getMessage( $button['label-message'] )->parse() );
} elseif ( isset( $button['label'] ) ) {
$label = $button['label'];
} elseif ( isset( $button['label-raw'] ) ) {
$label = new OOUI\HtmlSnippet( $button['label-raw'] );
$label = new \OOUI\HtmlSnippet( $button['label-raw'] );
} else {
$label = $button['value'];
}
$attrs['classes'] = isset( $attrs['class'] ) ? (array)$attrs['class'] : [];
$buttons .= new OOUI\ButtonInputWidget( [
$buttons .= new \OOUI\ButtonInputWidget( [
'type' => 'submit',
'name' => $button['name'],
'value' => $button['value'],
@ -147,22 +150,22 @@ class OOUIHTMLForm extends HTMLForm {
/**
* @inheritDoc
* @return OOUI\PanelLayout
* @return \OOUI\PanelLayout
*/
protected function wrapFieldSetSection( $legend, $section, $attributes, $isRoot ) {
// to get a user visible effect, wrap the fieldset into a framed panel layout
$layout = new OOUI\PanelLayout( [
$layout = new \OOUI\PanelLayout( [
'expanded' => false,
'padded' => true,
'framed' => true,
] );
$layout->appendContent(
new OOUI\FieldsetLayout( [
new \OOUI\FieldsetLayout( [
'label' => $legend,
'items' => [
new OOUI\Widget( [
'content' => new OOUI\HtmlSnippet( $section )
new \OOUI\Widget( [
'content' => new \OOUI\HtmlSnippet( $section )
] ),
],
] + $attributes )
@ -172,7 +175,7 @@ class OOUIHTMLForm extends HTMLForm {
/**
* @inheritDoc
* @return OOUI\FieldLayout HTML
* @return \OOUI\FieldLayout HTML
*/
protected function formatField( HTMLFormField $field, $value ) {
return $field->getOOUI( $value );
@ -180,7 +183,7 @@ class OOUIHTMLForm extends HTMLForm {
/**
* Put a form section together from the individual fields' HTML, merging it and wrapping.
* @param OOUI\FieldLayout[] $fieldsHtml Array of outputs from formatField()
* @param \OOUI\FieldLayout[] $fieldsHtml Array of outputs from formatField()
* @param string $sectionName
* @param bool $anyFieldHasLabel Unused
* @return string HTML
@ -236,7 +239,7 @@ class OOUIHTMLForm extends HTMLForm {
}
foreach ( $errors as &$error ) {
$error = new OOUI\HtmlSnippet( $error );
$error = new \OOUI\HtmlSnippet( $error );
}
// Used in formatFormHeader()
@ -268,11 +271,11 @@ class OOUIHTMLForm extends HTMLForm {
];
// if there's no header, don't create an (empty) LabelWidget, simply use a placeholder
if ( $this->mHeader ) {
$element = new OOUI\LabelWidget( [ 'label' => new OOUI\HtmlSnippet( $this->mHeader ) ] );
$element = new \OOUI\LabelWidget( [ 'label' => new \OOUI\HtmlSnippet( $this->mHeader ) ] );
} else {
$element = new OOUI\Widget( [] );
$element = new \OOUI\Widget( [] );
}
return new OOUI\FieldLayout(
return new \OOUI\FieldLayout(
$element,
[
'align' => 'top',
@ -289,27 +292,27 @@ class OOUIHTMLForm extends HTMLForm {
public function wrapForm( $html ) {
if ( is_string( $this->mWrapperLegend ) ) {
$phpClass = $this->mCollapsible ? CollapsibleFieldsetLayout::class : OOUI\FieldsetLayout::class;
$phpClass = $this->mCollapsible ? CollapsibleFieldsetLayout::class : \OOUI\FieldsetLayout::class;
$content = new $phpClass( [
'label' => $this->mWrapperLegend,
'collapsed' => $this->mCollapsed,
'items' => [
new OOUI\Widget( [
'content' => new OOUI\HtmlSnippet( $html )
new \OOUI\Widget( [
'content' => new \OOUI\HtmlSnippet( $html )
] ),
],
] + OOUI\Element::configFromHtmlAttributes( $this->mWrapperAttributes ) );
] + \OOUI\Element::configFromHtmlAttributes( $this->mWrapperAttributes ) );
} else {
$content = new OOUI\HtmlSnippet( $html );
$content = new \OOUI\HtmlSnippet( $html );
}
$form = new OOUI\FormLayout( $this->getFormAttributes() + [
$form = new \OOUI\FormLayout( $this->getFormAttributes() + [
'classes' => [ 'mw-htmlform', 'mw-htmlform-ooui' ],
'content' => $content,
] );
// Include a wrapper for style, if requested.
$form = new OOUI\PanelLayout( [
$form = new \OOUI\PanelLayout( [
'classes' => [ 'mw-htmlform-ooui-wrapper' ],
'expanded' => false,
'padded' => $this->mWrapperLegend !== false,
@ -320,3 +323,6 @@ class OOUIHTMLForm extends HTMLForm {
return $form;
}
}
/** @deprecated since 1.42 */
class_alias( OOUIHTMLForm::class, 'OOUIHTMLForm' );

5
includes/htmlform/VFormHTMLForm.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm;
/**
* HTML form generation and submission handling, vertical-form style.
*
@ -73,3 +75,6 @@ class VFormHTMLForm extends HTMLForm {
return Html::rawElement( 'form', $this->getFormAttributes(), $html );
}
}
/** @deprecated since 1.42 */
class_alias( VFormHTMLForm::class, 'VFormHTMLForm' );

7
includes/htmlform/fields/HTMLApiField.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormField;
/**
* @stable to extend
*/
@ -24,3 +28,6 @@ class HTMLApiField extends HTMLFormField {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLApiField::class, 'HTMLApiField' );

10
includes/htmlform/fields/HTMLAutoCompleteSelectField.php
View file

@ -1,5 +1,12 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use FormatJson;
use InvalidArgumentException;
use MediaWiki\HTMLForm\HTMLFormField;
use XmlSelect;
/**
* Text field for selecting a value from a large list of possible values, with
* auto-completion and optionally with a select dropdown for selecting common
@ -182,3 +189,6 @@ class HTMLAutoCompleteSelectField extends HTMLTextField {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLAutoCompleteSelectField::class, 'HTMLAutoCompleteSelectField' );

17
includes/htmlform/fields/HTMLButtonField.php
View file

@ -1,7 +1,13 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Context\RequestContext;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\CodexHTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\HTMLForm\VFormHTMLForm;
use Message;
/**
* Adds a generic button inline to the form. Does not do anything, you must add
@ -100,21 +106,21 @@ class HTMLButtonField extends HTMLFormField {
* Get the OOUI widget for this field.
* @stable to override
* @param string $value
* @return OOUI\ButtonInputWidget
* @return \OOUI\ButtonInputWidget
*/
public function getInputOOUI( $value ) {
return new OOUI\ButtonInputWidget( [
return new \OOUI\ButtonInputWidget( [
'name' => $this->mName,
'value' => $this->getDefault(),
'label' => !$this->isBadIE() && $this->buttonLabel
? new OOUI\HtmlSnippet( $this->buttonLabel )
? new \OOUI\HtmlSnippet( $this->buttonLabel )
: $this->getDefault(),
'type' => $this->buttonType,
'classes' => [ 'mw-htmlform-submit', $this->mClass ],
'id' => $this->mID,
'flags' => $this->mFlags,
'useInputTag' => $this->isBadIE(),
] + OOUI\Element::configFromHtmlAttributes(
] + \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'tabindex' ] )
) );
}
@ -151,3 +157,6 @@ class HTMLButtonField extends HTMLFormField {
return (bool)preg_match( '/MSIE [1-7]\./i', $request->getHeader( 'User-Agent' ) );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLButtonField::class, 'HTMLButtonField' );

17
includes/htmlform/fields/HTMLCheckField.php
View file

@ -1,7 +1,15 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\CodexHTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\HTMLForm\OOUIHTMLForm;
use MediaWiki\HTMLForm\VFormHTMLForm;
use MediaWiki\Request\WebRequest;
use Xml;
/**
* A checkbox field
@ -66,7 +74,7 @@ class HTMLCheckField extends HTMLFormField {
* @stable to override
* @since 1.26
* @param string $value
* @return OOUI\CheckboxInputWidget The checkbox widget.
* @return \OOUI\CheckboxInputWidget The checkbox widget.
*/
public function getInputOOUI( $value ) {
if ( !empty( $this->mParams['invert'] ) ) {
@ -77,7 +85,7 @@ class HTMLCheckField extends HTMLFormField {
$attr['id'] = $this->mID;
$attr['name'] = $this->mName;
$attr += OOUI\Element::configFromHtmlAttributes(
$attr += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'tabindex' ] )
);
@ -88,7 +96,7 @@ class HTMLCheckField extends HTMLFormField {
$attr['selected'] = $value;
$attr['value'] = '1'; // Nasty hack, but needed to make this work
return new OOUI\CheckboxInputWidget( $attr );
return new \OOUI\CheckboxInputWidget( $attr );
}
/**
@ -160,3 +168,6 @@ class HTMLCheckField extends HTMLFormField {
}
}
}
/** @deprecated since 1.42 */
class_alias( HTMLCheckField::class, 'HTMLCheckField' );

14
includes/htmlform/fields/HTMLCheckMatrix.php
View file

@ -1,7 +1,14 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use FormatJson;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\HTMLForm\HTMLFormFieldRequiredOptionsException;
use MediaWiki\HTMLForm\HTMLNestedFilterable;
use MediaWiki\Request\WebRequest;
use Xml;
/**
* A checkbox matrix
@ -166,7 +173,7 @@ class HTMLCheckMatrix extends HTMLFormField implements HTMLNestedFilterable {
public function getInputOOUI( $value ) {
$attribs = $this->getAttributes( [ 'disabled', 'tabindex' ] );
return new MediaWiki\Widget\CheckMatrixWidget(
return new \MediaWiki\Widget\CheckMatrixWidget(
[
'name' => $this->mName,
'infusable' => true,
@ -178,7 +185,7 @@ class HTMLCheckMatrix extends HTMLFormField implements HTMLNestedFilterable {
'forcedOff' => $this->mParams['force-options-off'] ?? [],
'forcedOn' => $this->mParams['force-options-on'] ?? [],
'values' => $value,
] + OOUI\Element::configFromHtmlAttributes( $attribs )
] + \OOUI\Element::configFromHtmlAttributes( $attribs )
);
}
@ -289,3 +296,6 @@ class HTMLCheckMatrix extends HTMLFormField implements HTMLNestedFilterable {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLCheckMatrix::class, 'HTMLCheckMatrix' );

11
includes/htmlform/fields/HTMLComboboxField.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use XmlSelect;
/**
* A combo box field.
*
@ -38,7 +42,7 @@ class HTMLComboboxField extends HTMLTextField {
public function getInputOOUI( $value ) {
$disabled = false;
$allowedParams = [ 'tabindex' ];
$attribs = OOUI\Element::configFromHtmlAttributes(
$attribs = \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -54,7 +58,7 @@ class HTMLComboboxField extends HTMLTextField {
$attribs['placeholder'] = $this->mPlaceholder;
}
return new OOUI\ComboBoxInputWidget( [
return new \OOUI\ComboBoxInputWidget( [
'name' => $this->mName,
'id' => $this->mID,
'options' => $this->getOptionsOOUI(),
@ -67,3 +71,6 @@ class HTMLComboboxField extends HTMLTextField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLComboboxField::class, 'HTMLComboboxField' );

15
includes/htmlform/fields/HTMLDateTimeField.php
View file

@ -1,5 +1,11 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use DateTime;
use DateTimeZone;
use Exception;
use InvalidArgumentException;
use Wikimedia\RequestTimeout\TimeoutException;
/**
@ -165,15 +171,15 @@ class HTMLDateTimeField extends HTMLTextField {
'id' => $this->mID,
];
$params += OOUI\Element::configFromHtmlAttributes(
$params += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'readonly', 'min', 'max' ] )
);
if ( $this->mType === 'date' ) {
$this->mParent->getOutput()->addModuleStyles( 'mediawiki.widgets.DateInputWidget.styles' );
return new MediaWiki\Widget\DateInputWidget( $params );
return new \MediaWiki\Widget\DateInputWidget( $params );
} else {
return new MediaWiki\Widget\DateTimeInputWidget( $params );
return new \MediaWiki\Widget\DateTimeInputWidget( $params );
}
}
@ -190,3 +196,6 @@ class HTMLDateTimeField extends HTMLTextField {
}
}
/** @deprecated since 1.42 */
class_alias( HTMLDateTimeField::class, 'HTMLDateTimeField' );

7
includes/htmlform/fields/HTMLEditTools.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormField;
/*
* @stable to extend
*/
@ -51,3 +55,6 @@ class HTMLEditTools extends HTMLFormField {
return $msg;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLEditTools::class, 'HTMLEditTools' );

7
includes/htmlform/fields/HTMLExpiryField.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\Widget\ExpiryInputWidget;
/**
@ -91,3 +95,6 @@ class HTMLExpiryField extends HTMLFormField {
}
}
/** @deprecated since 1.42 */
class_alias( HTMLExpiryField::class, 'HTMLExpiryField' );

10
includes/htmlform/fields/HTMLFileField.php
View file

@ -1,6 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use OOUI\Widget;
/**
@ -121,7 +124,7 @@ class HTMLFileField extends HTMLFormField {
'readonly',
];
$attribs += OOUI\Element::configFromHtmlAttributes(
$attribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -140,7 +143,7 @@ class HTMLFileField extends HTMLFormField {
* @return Widget
*/
protected function getInputWidget( $params ) {
return new OOUI\SelectFileInputWidget( $params );
return new \OOUI\SelectFileInputWidget( $params );
}
/**
@ -151,3 +154,6 @@ class HTMLFileField extends HTMLFormField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFileField::class, 'HTMLFileField' );

7
includes/htmlform/fields/HTMLFloatField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
/**
* A field that will contain a numeric value
*
@ -51,6 +53,9 @@ class HTMLFloatField extends HTMLTextField {
* @stable to override
*/
protected function getInputWidget( $params ) {
return new OOUI\NumberInputWidget( $params );
return new \OOUI\NumberInputWidget( $params );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFloatField::class, 'HTMLFloatField' );

9
includes/htmlform/fields/HTMLFormFieldCloner.php
View file

@ -1,8 +1,14 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use InvalidArgumentException;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\Parser\Sanitizer;
use MediaWiki\Request\DerivativeRequest;
use Xml;
/**
* A container for HTMLFormFields that allows for multiple copies of the set of
@ -573,3 +579,6 @@ class HTMLFormFieldCloner extends HTMLFormField {
return $html;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormFieldCloner::class, 'HTMLFormFieldCloner' );

10
includes/htmlform/fields/HTMLFormFieldWithButton.php
View file

@ -1,6 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
/**
* Enables HTMLFormField elements to be build with a button.
@ -64,14 +67,14 @@ class HTMLFormFieldWithButton extends HTMLFormField {
}
public function getInputOOUI( $value ) {
return new OOUI\ButtonInputWidget( [
return new \OOUI\ButtonInputWidget( [
'name' => $this->mButtonName,
'value' => $this->mButtonValue,
'type' => $this->mButtonType,
'label' => $this->mButtonValue,
'flags' => $this->mButtonFlags,
'id' => $this->mButtonId ?: null,
] + OOUI\Element::configFromHtmlAttributes(
] + \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'tabindex' ] )
) );
}
@ -85,3 +88,6 @@ class HTMLFormFieldWithButton extends HTMLFormField {
return $element . "\u{00A0}" . $this->getInputHTML( '' );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLFormFieldWithButton::class, 'HTMLFormFieldWithButton' );

7
includes/htmlform/fields/HTMLHiddenField.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormField;
/*
* @stable to extend
*/
@ -71,3 +75,6 @@ class HTMLHiddenField extends HTMLFormField {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLHiddenField::class, 'HTMLHiddenField' );

16
includes/htmlform/fields/HTMLInfoField.php
View file

@ -1,5 +1,10 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use Closure;
use MediaWiki\HTMLForm\HTMLFormField;
/**
* An information field (text blob), not a proper input.
* @stable to extend
@ -48,10 +53,10 @@ class HTMLInfoField extends HTMLFormField {
*/
public function getInputOOUI( $value ) {
if ( !empty( $this->mParams['raw'] ) ) {
$value = new OOUI\HtmlSnippet( $value );
$value = new \OOUI\HtmlSnippet( $value );
}
return new OOUI\LabelWidget( [
return new \OOUI\LabelWidget( [
'label' => $value,
'id' => $this->mID
] );
@ -100,12 +105,12 @@ class HTMLInfoField extends HTMLFormField {
/**
* @stable to override
* @param mixed $value If not FieldLayout or subclass has been deprecated.
* @return OOUI\FieldLayout
* @return \OOUI\FieldLayout
* @since 1.32
*/
public function getOOUI( $value ) {
if ( !empty( $this->mParams['rawrow'] ) ) {
if ( !( $value instanceof OOUI\FieldLayout ) ) {
if ( !( $value instanceof \OOUI\FieldLayout ) ) {
wfDeprecatedMsg( __METHOD__ . ": 'default' parameter as a string when using " .
"'rawrow' was deprecated in MediaWiki 1.32 (must be a FieldLayout or subclass)",
'1.32' );
@ -124,3 +129,6 @@ class HTMLInfoField extends HTMLFormField {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLInfoField::class, 'HTMLInfoField' );

5
includes/htmlform/fields/HTMLIntField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
/**
* A field that must contain a number
*
@ -31,3 +33,6 @@ class HTMLIntField extends HTMLFloatField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLIntField::class, 'HTMLIntField' );

20
includes/htmlform/fields/HTMLMultiSelectField.php
View file

@ -1,7 +1,14 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\HTMLForm\HTMLNestedFilterable;
use MediaWiki\HTMLForm\OOUIHTMLForm;
use MediaWiki\Request\WebRequest;
use RuntimeException;
use Xml;
/**
* Multi-select field
@ -167,7 +174,7 @@ class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable
* @stable to override
* @since 1.28
* @param string[] $value
* @return string|OOUI\CheckboxMultiselectInputWidget
* @return string|\OOUI\CheckboxMultiselectInputWidget
* @suppress PhanParamSignatureMismatch
*/
public function getInputOOUI( $value ) {
@ -217,7 +224,7 @@ class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable
unset( $option );
$attr['options'] = $options;
$attr += OOUI\Element::configFromHtmlAttributes(
$attr += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'tabindex' ] )
);
@ -225,12 +232,12 @@ class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable
$attr['classes'] = [ $this->mClass ];
}
$widget = new OOUI\CheckboxMultiselectInputWidget( $attr );
$widget = new \OOUI\CheckboxMultiselectInputWidget( $attr );
if ( $sectionLabel ) {
$out[] = new OOUI\FieldsetLayout( [
$out[] = new \OOUI\FieldsetLayout( [
'items' => [ $widget ],
// @phan-suppress-next-line SecurityCheck-XSS Key is html, taint cannot track that
'label' => new OOUI\HtmlSnippet( $sectionLabel ),
'label' => new \OOUI\HtmlSnippet( $sectionLabel ),
] );
} else {
$out[] = $widget;
@ -306,3 +313,6 @@ class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLMultiSelectField::class, 'HTMLMultiSelectField' );

5
includes/htmlform/fields/HTMLNamespacesMultiselectField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\MediaWikiServices;
use MediaWiki\Widget\NamespacesMultiselectWidget;
@ -121,3 +123,6 @@ class HTMLNamespacesMultiselectField extends HTMLSelectNamespace {
}
}
/** @deprecated since 1.42 */
class_alias( HTMLNamespacesMultiselectField::class, 'HTMLNamespacesMultiselectField' );

13
includes/htmlform/fields/HTMLRadioField.php
View file

@ -1,7 +1,11 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\Parser\Sanitizer;
use Xml;
/**
* Radio checkbox fields.
@ -68,16 +72,16 @@ class HTMLRadioField extends HTMLFormField {
$options[] = [
'data' => $data,
// @phan-suppress-next-line SecurityCheck-XSS Labels are raw when not from message
'label' => $this->mOptionsLabelsNotFromMessage ? new OOUI\HtmlSnippet( $label ) : $label,
'label' => $this->mOptionsLabelsNotFromMessage ? new \OOUI\HtmlSnippet( $label ) : $label,
];
}
return new OOUI\RadioSelectInputWidget( [
return new \OOUI\RadioSelectInputWidget( [
'name' => $this->mName,
'id' => $this->mID,
'value' => $value,
'options' => $options,
] + OOUI\Element::configFromHtmlAttributes(
] + \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'tabindex' ] )
) );
}
@ -114,3 +118,6 @@ class HTMLRadioField extends HTMLFormField {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLRadioField::class, 'HTMLRadioField' );

8
includes/htmlform/fields/HTMLRestrictionsField.php
View file

@ -1,7 +1,12 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\MediaWikiServices;
use MediaWiki\Request\WebRequest;
use Message;
use MWRestrictions;
/**
* Class for updating an MWRestrictions value (which is, currently, basically just an IP address
@ -131,3 +136,6 @@ class HTMLRestrictionsField extends HTMLFormField {
);
}
}
/** @deprecated since 1.42 */
class_alias( HTMLRestrictionsField::class, 'HTMLRestrictionsField' );

13
includes/htmlform/fields/HTMLSelectAndOtherField.php
View file

@ -1,7 +1,11 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use InvalidArgumentException;
use MediaWiki\Html\Html;
use MediaWiki\Request\WebRequest;
use MediaWiki\Widget\SelectWithInputWidget;
/**
* Double field with a dropdown list constructed from a system message in the format
@ -106,7 +110,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
'maxlength',
];
$textAttribs += OOUI\Element::configFromHtmlAttributes(
$textAttribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -122,7 +126,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
'disabled',
];
$dropdownInputAttribs += OOUI\Element::configFromHtmlAttributes(
$dropdownInputAttribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -155,7 +159,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
* @return \MediaWiki\Widget\SelectWithInputWidget
*/
public function getInputWidget( $params ) {
return new MediaWiki\Widget\SelectWithInputWidget( $params );
return new SelectWithInputWidget( $params );
}
/**
@ -238,3 +242,6 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectAndOtherField::class, 'HTMLSelectAndOtherField' );

12
includes/htmlform/fields/HTMLSelectField.php
View file

@ -1,5 +1,10 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormField;
use XmlSelect;
/**
* A select dropdown field. Basically a wrapper for Xmlselect class
*
@ -60,7 +65,7 @@ class HTMLSelectField extends HTMLFormField {
public function getInputOOUI( $value ) {
$disabled = false;
$allowedParams = [ 'tabindex' ];
$attribs = OOUI\Element::configFromHtmlAttributes(
$attribs = \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -72,7 +77,7 @@ class HTMLSelectField extends HTMLFormField {
$disabled = true;
}
return new OOUI\DropdownInputWidget( [
return new \OOUI\DropdownInputWidget( [
'name' => $this->mName,
'id' => $this->mID,
'options' => $this->getOptionsOOUI(),
@ -89,3 +94,6 @@ class HTMLSelectField extends HTMLFormField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectField::class, 'HTMLSelectField' );

6
includes/htmlform/fields/HTMLSelectLanguageField.php
View file

@ -1,5 +1,8 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
@ -44,3 +47,6 @@ class HTMLSelectLanguageField extends HTMLSelectField {
$this->mParams['default'] ??= $languageCode;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectLanguageField::class, 'HTMLSelectLanguageField' );

5
includes/htmlform/fields/HTMLSelectLimitField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
/**
* A limit dropdown, which accepts any valid number
*
@ -35,3 +37,6 @@ class HTMLSelectLimitField extends HTMLSelectField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectLimitField::class, 'HTMLSelectLimitField' );

8
includes/htmlform/fields/HTMLSelectNamespace.php
View file

@ -1,6 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
/**
* Wrapper for Html::namespaceSelector to use in HTMLForm
@ -52,7 +55,7 @@ class HTMLSelectNamespace extends HTMLFormField {
* @stable to override
*/
public function getInputOOUI( $value ) {
return new MediaWiki\Widget\NamespaceInputWidget( [
return new \MediaWiki\Widget\NamespaceInputWidget( [
'value' => $value,
'name' => $this->mName,
'id' => $this->mID,
@ -78,3 +81,6 @@ class HTMLSelectNamespace extends HTMLFormField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectNamespace::class, 'HTMLSelectNamespace' );

8
includes/htmlform/fields/HTMLSelectNamespaceWithButton.php
View file

@ -1,4 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormActionFieldLayout;
/**
* Creates a Html::namespaceSelector input field with a button assigned to the input field.
*
@ -26,3 +31,6 @@ class HTMLSelectNamespaceWithButton extends HTMLSelectNamespace {
return new HTMLFormActionFieldLayout( $inputField, $buttonWidget, $config );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectNamespaceWithButton::class, 'HTMLSelectNamespaceWithButton' );

13
includes/htmlform/fields/HTMLSelectOrOtherField.php
View file

@ -1,7 +1,11 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\Request\WebRequest;
use XmlSelect;
/**
* Select dropdown field, with an additional "other" textbox.
@ -113,7 +117,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
'tabindex',
];
$dropdownAttribs += OOUI\Element::configFromHtmlAttributes(
$dropdownAttribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -134,7 +138,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
'minlength',
];
$textAttribs += OOUI\Element::configFromHtmlAttributes(
$textAttribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -163,7 +167,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
}
public function getInputWidget( $params ) {
return new MediaWiki\Widget\SelectWithInputWidget( $params );
return new \MediaWiki\Widget\SelectWithInputWidget( $params );
}
/**
@ -197,3 +201,6 @@ class HTMLSelectOrOtherField extends HTMLTextField {
return [ self::FIELD_CLASS ];
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSelectOrOtherField::class, 'HTMLSelectOrOtherField' );

9
includes/htmlform/fields/HTMLSizeFilterField.php
View file

@ -1,6 +1,10 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Request\WebRequest;
use MediaWiki\Widget\SizeFilterWidget;
use Xml;
/**
* A size filter field for use on query-type special pages. It looks a bit like:
@ -60,7 +64,7 @@ class HTMLSizeFilterField extends HTMLIntField {
$value = $params['value'];
$params['value'] = $value ? abs( $value ) : '';
return new MediaWiki\Widget\SizeFilterWidget( [
return new SizeFilterWidget( [
'selectMin' => $this->mSelectMin,
'textinput' => $params,
'radioselectinput' => [
@ -95,3 +99,6 @@ class HTMLSizeFilterField extends HTMLIntField {
return false;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSizeFilterField::class, 'HTMLSizeFilterField' );

5
includes/htmlform/fields/HTMLSubmitField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
/**
* Add a submit button inline in the form (as opposed to
* HTMLForm::addButton(), which will add it at the end).
@ -19,3 +21,6 @@ class HTMLSubmitField extends HTMLButtonField {
return $request->getCheck( $this->mName );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLSubmitField::class, 'HTMLSubmitField' );

11
includes/htmlform/fields/HTMLTagFilter.php
View file

@ -1,4 +1,10 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use ChangeTags;
use MediaWiki\HTMLForm\HTMLFormField;
/**
* Wrapper for ChangeTags::buildTagFilterSelector to use in HTMLForm
*
@ -31,7 +37,7 @@ class HTMLTagFilter extends HTMLFormField {
if ( $this->tagFilter ) {
return parent::getOOUI( $value );
}
return new OOUI\FieldLayout( new OOUI\Widget() );
return new \OOUI\FieldLayout( new \OOUI\Widget() );
}
public function getInputHTML( $value ) {
@ -54,3 +60,6 @@ class HTMLTagFilter extends HTMLFormField {
return true;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTagFilter::class, 'HTMLTagFilter' );

5
includes/htmlform/fields/HTMLTagMultiselectField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Widget\TagMultiselectWidget;
/**
@ -131,3 +133,6 @@ class HTMLTagMultiselectField extends HTMLTextField {
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTagMultiselectField::class, 'HTMLTagMultiselectField' );

18
includes/htmlform/fields/HTMLTextAreaField.php
View file

@ -1,12 +1,15 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use InvalidArgumentException;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\MediaWikiServices;
/*
* @stable to extend
*/
use MediaWiki\Html\Html;
use MediaWiki\MediaWikiServices;
class HTMLTextAreaField extends HTMLFormField {
protected const DEFAULT_COLS = 80;
protected const DEFAULT_ROWS = 25;
@ -145,11 +148,11 @@ class HTMLTextAreaField extends HTMLFormField {
'autofocus',
];
$attribs += OOUI\Element::configFromHtmlAttributes(
$attribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
return new OOUI\MultilineTextInputWidget( [
return new \OOUI\MultilineTextInputWidget( [
'id' => $this->mID,
'name' => $this->mName,
'value' => $value,
@ -157,3 +160,6 @@ class HTMLTextAreaField extends HTMLFormField {
] + $attribs );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTextAreaField::class, 'HTMLTextAreaField' );

11
includes/htmlform/fields/HTMLTextField.php
View file

@ -1,6 +1,10 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\CodexHTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use OOUI\Widget;
/**
@ -207,7 +211,7 @@ class HTMLTextField extends HTMLFormField {
'indicator',
];
$attribs += OOUI\Element::configFromHtmlAttributes(
$attribs += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( $allowedParams )
);
@ -233,7 +237,7 @@ class HTMLTextField extends HTMLFormField {
* @return Widget
*/
protected function getInputWidget( $params ) {
return new OOUI\TextInputWidget( $params );
return new \OOUI\TextInputWidget( $params );
}
/**
@ -246,3 +250,6 @@ class HTMLTextField extends HTMLFormField {
return [];
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTextField::class, 'HTMLTextField' );

8
includes/htmlform/fields/HTMLTextFieldWithButton.php
View file

@ -1,4 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\HTMLForm\HTMLFormActionFieldLayout;
/**
* Creates a text input field with a button assigned to the input field.
*
@ -26,3 +31,6 @@ class HTMLTextFieldWithButton extends HTMLTextField {
return new HTMLFormActionFieldLayout( $inputField, $buttonWidget, $config );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTextFieldWithButton::class, 'HTMLTextFieldWithButton' );

8
includes/htmlform/fields/HTMLTimezoneField.php
View file

@ -1,5 +1,10 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use DateTime;
use DateTimeZone;
use InvalidArgumentException;
use MediaWiki\Context\RequestContext;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
@ -164,3 +169,6 @@ class HTMLTimezoneField extends HTMLSelectOrOtherField {
return $classes;
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTimezoneField::class, 'HTMLTimezoneField' );

7
includes/htmlform/fields/HTMLTitleTextField.php
View file

@ -1,5 +1,9 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use FormatJson;
use InvalidArgumentException;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\MalformedTitleException;
use MediaWiki\Title\Title;
@ -128,3 +132,6 @@ class HTMLTitleTextField extends HTMLTextField {
];
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTitleTextField::class, 'HTMLTitleTextField' );

5
includes/htmlform/fields/HTMLTitlesMultiselectField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Widget\TitlesMultiselectWidget;
/**
@ -145,3 +147,6 @@ class HTMLTitlesMultiselectField extends HTMLTitleTextField {
}
}
/** @deprecated since 1.42 */
class_alias( HTMLTitlesMultiselectField::class, 'HTMLTitlesMultiselectField' );

7
includes/htmlform/fields/HTMLToggleSwitchField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\Widget\ToggleSwitchWidget;
class HTMLToggleSwitchField extends HTMLCheckField {
@ -20,7 +22,7 @@ class HTMLToggleSwitchField extends HTMLCheckField {
$attr['id'] = $this->mID;
$attr['name'] = $this->mName;
$attr += OOUI\Element::configFromHtmlAttributes(
$attr += \OOUI\Element::configFromHtmlAttributes(
$this->getAttributes( [ 'disabled', 'tabindex' ] )
);
@ -47,3 +49,6 @@ class HTMLToggleSwitchField extends HTMLCheckField {
return [ 'mediawiki.widgets.ToggleSwitchWidget' ];
}
}
/** @deprecated since 1.42 */
class_alias( HTMLToggleSwitchField::class, 'HTMLToggleSwitchField' );

5
includes/htmlform/fields/HTMLUserTextField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\MediaWikiServices;
use MediaWiki\User\ExternalUserNames;
use MediaWiki\Widget\UserInputWidget;
@ -147,3 +149,6 @@ class HTMLUserTextField extends HTMLTextField {
return parent::getInputHTML( $value );
}
}
/** @deprecated since 1.42 */
class_alias( HTMLUserTextField::class, 'HTMLUserTextField' );

5
includes/htmlform/fields/HTMLUsersMultiselectField.php
View file

@ -1,5 +1,7 @@
<?php
namespace MediaWiki\HTMLForm\Field;
use MediaWiki\MediaWikiServices;
use MediaWiki\User\UserRigorOptions;
use MediaWiki\Widget\UsersMultiselectWidget;
@ -156,3 +158,6 @@ class HTMLUsersMultiselectField extends HTMLUserTextField {
}
}
/** @deprecated since 1.42 */
class_alias( HTMLUsersMultiselectField::class, 'HTMLUsersMultiselectField' );

2
includes/page/ProtectionForm.php
View file

@ -27,7 +27,6 @@ namespace MediaWiki\Page;
use Article;
use ErrorPageError;
use HTMLForm;
use Language;
use LogEventsList;
use LogPage;
@ -35,6 +34,7 @@ use MediaWiki\CommentStore\CommentStore;
use MediaWiki\Context\IContextSource;
use MediaWiki\HookContainer\HookRunner;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MediaWikiServices;
use MediaWiki\Output\OutputPage;
use MediaWiki\Permissions\Authority;

7
includes/preferences/DefaultPreferencesFactory.php
View file

@ -20,8 +20,6 @@
namespace MediaWiki\Preferences;
use HTMLForm;
use HTMLFormField;
use ILanguageConverter;
use Language;
use LanguageCode;
@ -34,6 +32,9 @@ use MediaWiki\Context\IContextSource;
use MediaWiki\HookContainer\HookContainer;
use MediaWiki\HookContainer\HookRunner;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\HTMLForm\HTMLNestedFilterable;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Linker\LinkRenderer;
@ -377,7 +378,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
public static function getPreferenceForField( $name, HTMLFormField $field, array $userOptions ) {
$val = $userOptions[$name] ?? null;
if ( $field instanceof \HTMLNestedFilterable ) {
if ( $field instanceof HTMLNestedFilterable ) {
$val = [];
$prefix = $field->mParams['prefix'] ?? $name;
// Fetch all possible preference keys of the given field on this wiki.

2
includes/preferences/Hook/PreferencesFormPreSaveHook.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\Preferences\Hook;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\User\User;
/**

2
includes/preferences/PreferencesFactory.php
View file

@ -20,8 +20,8 @@
namespace MediaWiki\Preferences;
use HTMLForm;
use MediaWiki\Context\IContextSource;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\User\User;
use PreferencesFormOOUI;

2
includes/specialpage/AuthManagerSpecialPage.php
View file

@ -3,7 +3,6 @@
namespace MediaWiki\SpecialPage;
use ErrorPageError;
use HTMLForm;
use HTMLInfoField;
use InvalidArgumentException;
use LogicException;
@ -11,6 +10,7 @@ use MediaWiki\Auth\AuthenticationRequest;
use MediaWiki\Auth\AuthenticationResponse;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Context\DerivativeContext;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Language\RawMessage;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Request\DerivativeRequest;

2
includes/specialpage/FormSpecialPage.php
View file

@ -23,8 +23,8 @@
namespace MediaWiki\SpecialPage;
use HTMLForm;
use MediaWiki\Context\DerivativeContext;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Request\DerivativeRequest;
use MediaWiki\Status\Status;
use MediaWiki\User\User;

2
includes/specialpage/Hook/SpecialPageBeforeFormDisplayHook.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\SpecialPage\Hook;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
/**
* This is a hook handler interface, see docs/Hooks.md.

2
includes/specialpage/LoginSignupSpecialPage.php
View file

@ -26,7 +26,6 @@ namespace MediaWiki\SpecialPage;
use ErrorPageError;
use Exception;
use FatalError;
use HTMLForm;
use LogicException;
use LoginHelper;
use MediaWiki\Auth\AuthenticationRequest;
@ -36,6 +35,7 @@ use MediaWiki\Auth\PasswordAuthenticationRequest;
use MediaWiki\Context\DerivativeContext;
use MediaWiki\Context\RequestContext;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Language\RawMessage;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;

2
includes/specialpage/SpecialRedirectWithAction.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\SpecialPage;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MediaWikiServices;
use MediaWiki\Status\Status;
use MediaWiki\Title\MalformedTitleException;

2
includes/specials/Hook/EmailUserFormHook.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\Hook;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
/**
* This is a hook handler interface, see docs/Hooks.md.

2
includes/specials/Hook/PreferencesGetLegendHook.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\Hook;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
/**
* This is a hook handler interface, see docs/Hooks.md.

2
includes/specials/SpecialActiveUsers.php
View file

@ -23,11 +23,11 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Block\HideUserUtils;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\Html\FormOptions;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Pager\ActiveUsersPager;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialAllMessages.php
View file

@ -23,10 +23,10 @@
namespace MediaWiki\Specials;
use HTMLForm;
use LocalisationCache;
use MediaWiki\Html\FormOptions;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Languages\LanguageFactory;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MainConfigNames;

2
includes/specials/SpecialAllPages.php
View file

@ -23,8 +23,8 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Page\ExistingPageRecord;

2
includes/specials/SpecialAutoblockList.php
View file

@ -23,7 +23,6 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Block\BlockActionInfo;
use MediaWiki\Block\BlockRestrictionStore;
use MediaWiki\Block\BlockUtils;
@ -33,6 +32,7 @@ use MediaWiki\CommentFormatter\RowCommentFormatter;
use MediaWiki\CommentStore\CommentStore;
use MediaWiki\Config\ConfigException;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Pager\BlockListPager;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialBlock.php
View file

@ -25,7 +25,6 @@ namespace MediaWiki\Specials;
use ErrorPageError;
use HtmlArmor;
use HTMLForm;
use Language;
use LogEventsList;
use MediaWiki\Block\BlockActionInfo;
@ -41,6 +40,7 @@ use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\CommentStore\CommentStore;
use MediaWiki\Context\IContextSource;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Page\PageReference;

2
includes/specials/SpecialBlockList.php
View file

@ -23,7 +23,6 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Block\BlockActionInfo;
use MediaWiki\Block\BlockRestrictionStore;
use MediaWiki\Block\BlockUtils;
@ -35,6 +34,7 @@ use MediaWiki\CommentFormatter\RowCommentFormatter;
use MediaWiki\CommentStore\CommentStore;
use MediaWiki\Config\ConfigException;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Pager\BlockListPager;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialBookSources.php
View file

@ -23,8 +23,8 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Revision\RevisionLookup;
use MediaWiki\Revision\SlotRecord;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialBotPasswords.php
View file

@ -24,11 +24,11 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use HTMLRestrictionsField;
use InvalidPassword;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\GrantsInfo;

2
includes/specials/SpecialChangeContentModel.php
View file

@ -4,13 +4,13 @@ namespace MediaWiki\Specials;
use ContentHandler;
use ErrorPageError;
use HTMLForm;
use LogEventsList;
use LogPage;
use MediaWiki\Collation\CollationFactory;
use MediaWiki\CommentStore\CommentStore;
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\EditPage\SpamChecker;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Language\RawMessage;
use MediaWiki\Page\ContentModelChangeFactory;
use MediaWiki\Page\WikiPageFactory;

2
includes/specials/SpecialChangeEmail.php
View file

@ -24,9 +24,9 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Parser\Sanitizer;
use MediaWiki\SpecialPage\FormSpecialPage;

2
includes/specials/SpecialComparePages.php
View file

@ -26,8 +26,8 @@
namespace MediaWiki\Specials;
use DifferenceEngine;
use HTMLForm;
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Revision\RevisionLookup;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Revision\SlotRecord;

2
includes/specials/SpecialConfirmEmail.php
View file

@ -23,8 +23,8 @@
namespace MediaWiki\Specials;
use HTMLForm;
use IDBAccessObject;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Language\RawMessage;
use MediaWiki\Parser\Sanitizer;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialContributions.php
View file

@ -23,7 +23,6 @@
namespace MediaWiki\Specials;
use HTMLForm;
use HTMLMultiSelectField;
use LogEventsList;
use MediaWiki\Block\Block;
@ -32,6 +31,7 @@ use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\CommentFormatter\CommentFormatter;
use MediaWiki\HookContainer\HookRunner;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Pager\ContribsPager;

2
includes/specials/SpecialDeletedContributions.php
View file

@ -23,13 +23,13 @@
namespace MediaWiki\Specials;
use HTMLForm;
use LogEventsList;
use MediaWiki\Block\Block;
use MediaWiki\Block\DatabaseBlockStore;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\CommentFormatter\CommentFormatter;
use MediaWiki\Html\FormOptions;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Pager\DeletedContribsPager;
use MediaWiki\Permissions\PermissionManager;

2
includes/specials/SpecialDiff.php
View file

@ -24,7 +24,7 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\SpecialPage\RedirectSpecialPage;
use MediaWiki\Title\Title;

4
includes/specials/SpecialEditWatchlist.php
View file

@ -31,11 +31,12 @@ namespace MediaWiki\Specials;
use EditWatchlistCheckboxSeriesField;
use EditWatchlistNormalHTMLForm;
use GenderCache;
use HTMLForm;
use LogicException;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\Deferred\DeferredUpdates;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\HTMLForm\OOUIHTMLForm;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MainConfigNames;
@ -53,7 +54,6 @@ use MediaWiki\Title\Title;
use MediaWiki\Title\TitleParser;
use MediaWiki\Title\TitleValue;
use MediaWiki\Watchlist\WatchlistManager;
use OOUIHTMLForm;
use Parser;
use UserNotLoggedIn;
use WatchedItemStore;

2
includes/specials/SpecialEmailUser.php
View file

@ -24,9 +24,9 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use MediaWiki\Config\Config;
use MediaWiki\Context\IContextSource;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Mail\EmailUserFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;

2
includes/specials/SpecialExpandTemplates.php
View file

@ -23,8 +23,8 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Output\OutputPage;
use MediaWiki\Parser\ParserOutput;

2
includes/specials/SpecialExport.php
View file

@ -25,9 +25,9 @@
namespace MediaWiki\Specials;
use HTMLForm;
use HTMLTextAreaField;
use MediaWiki\Export\WikiExporterFactory;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Linker\LinksMigration;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;

2
includes/specials/SpecialFileDuplicateSearch.php
View file

@ -26,9 +26,9 @@
namespace MediaWiki\Specials;
use File;
use HTMLForm;
use ILanguageConverter;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Linker\Linker;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialImport.php
View file

@ -27,9 +27,9 @@
namespace MediaWiki\Specials;
use Exception;
use HTMLForm;
use ImportReporter;
use ImportStreamSource;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Permissions\PermissionManager;
use MediaWiki\SpecialPage\SpecialPage;

2
includes/specials/SpecialLinkAccounts.php
View file

@ -3,11 +3,11 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use LogicException;
use MediaWiki\Auth\AuthenticationRequest;
use MediaWiki\Auth\AuthenticationResponse;
use MediaWiki\Auth\AuthManager;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\SpecialPage\AuthManagerSpecialPage;
use StatusValue;

2
includes/specials/SpecialLinkSearch.php
View file

@ -24,9 +24,9 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\ExternalLinks\LinkFilter;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Linker\Linker;
use MediaWiki\MainConfigNames;
use MediaWiki\SpecialPage\QueryPage;

2
includes/specials/SpecialLockdb.php
View file

@ -24,7 +24,7 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\SpecialPage\FormSpecialPage;
use MediaWiki\Status\Status;

2
includes/specials/SpecialMIMESearch.php
View file

@ -26,10 +26,10 @@ namespace MediaWiki\Specials;
use File;
use HtmlArmor;
use HTMLForm;
use ILanguageConverter;
use LocalFile;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Linker\Linker;
use MediaWiki\MediaWikiServices;

2
includes/specials/SpecialMergeHistory.php
View file

@ -23,11 +23,11 @@
namespace MediaWiki\Specials;
use HTMLForm;
use LogEventsList;
use LogPage;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\CommentFormatter\CommentFormatter;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Page\MergeHistoryFactory;
use MediaWiki\Pager\MergeHistoryPager;
use MediaWiki\Revision\RevisionStore;

2
includes/specials/SpecialMute.php
View file

@ -22,7 +22,7 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Preferences\MultiUsernameFilter;
use MediaWiki\SpecialPage\FormSpecialPage;

2
includes/specials/SpecialNewFiles.php
View file

@ -23,13 +23,13 @@
namespace MediaWiki\Specials;
use HTMLForm;
use HTMLUserTextField;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\Context\DerivativeContext;
use MediaWiki\Context\IContextSource;
use MediaWiki\Html\FormOptions;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Pager\NewFilesPager;
use MediaWiki\Permissions\GroupPermissionsLookup;
use MediaWiki\Request\DerivativeRequest;

2
includes/specials/SpecialNewPages.php
View file

@ -24,7 +24,6 @@
namespace MediaWiki\Specials;
use HtmlArmor;
use HTMLForm;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\ChangeTags\ChangeTagsStore;
use MediaWiki\CommentFormatter\RowCommentFormatter;
@ -32,6 +31,7 @@ use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\Feed\FeedItem;
use MediaWiki\Html\FormOptions;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\Pager\NewPagesPager;
use MediaWiki\Permissions\GroupPermissionsLookup;

2
includes/specials/SpecialNewSection.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\SpecialPage\RedirectSpecialPage;
use MediaWiki\Title\Title;
use SearchEngineFactory;

2
includes/specials/SpecialPageLanguage.php
View file

@ -26,12 +26,12 @@
namespace MediaWiki\Specials;
use ApiMessage;
use HTMLForm;
use LogEventsList;
use LogPage;
use ManualLogEntry;
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\Context\IContextSource;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Language\RawMessage;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MainConfigNames;

2
includes/specials/SpecialPagesWithProp.php
View file

@ -24,8 +24,8 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\SpecialPage\QueryPage;
use MediaWiki\Title\Title;
use Skin;

2
includes/specials/SpecialPasswordReset.php
View file

@ -24,7 +24,7 @@
namespace MediaWiki\Specials;
use ErrorPageError;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\SpecialPage\FormSpecialPage;
use MediaWiki\Status\Status;

2
includes/specials/SpecialPermanentLink.php
View file

@ -23,7 +23,7 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\SpecialPage\RedirectSpecialPage;
use MediaWiki\Title\Title;

2
includes/specials/SpecialPreferences.php
View file

@ -23,9 +23,9 @@
namespace MediaWiki\Specials;
use HTMLForm;
use MediaWiki\Context\IContextSource;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MediaWikiServices;
use MediaWiki\Preferences\PreferencesFactory;
use MediaWiki\SpecialPage\SpecialPage;

Some files were not shown because too many files have changed in this diff Show more