From 211cb997882f389d5a9aca8f5595424a5314aa92 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 27 Feb 2018 15:34:49 -0800 Subject: [PATCH] EditPage: Remove methods from OOUI transition, deprecated in 1.30 No uses found in code search. Change-Id: I683538f72eab3002ebb4b3e0c76a1ffa6fb9e39a --- RELEASE-NOTES-1.31 | 6 +- includes/EditPage.php | 126 ------------------------------------------ 2 files changed, 5 insertions(+), 127 deletions(-) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index 8113314a2a..78d24f3638 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -256,11 +256,15 @@ changes to languages because of Phabricator reports. * Title::isCssJsSubpage – use ::isUserConfigPage * Title::isCssSubpage – use ::isUserCssConfigPage * Title::isJsSubpage – use ::isUserJsConfigPage -* The following variables and method in EditPage, deprecated in MediaWiki 1.30, were removed: +* The following variables and methods in EditPage, deprecated in MediaWiki 1.30, were removed: * $isCssJsSubpage — use ::isUserConfigPage() * $isCssSubpage — use ::isUserCssConfigPage() * $isJsSubpage — use ::isUserJsConfigPage() * $isWrongCaseCssJsPage – use ::isWrongCaseUserConfigPage() + * ::getSummaryInput() – use ::getSummaryInputWidget() + * ::getSummaryInputOOUI() – use ::getSummaryInputWidget() + * ::getCheckboxes() – use ::getCheckboxesWidget() or ::getCheckboxesDefinition() + * ::getCheckboxesOOUI() – use ::getCheckboxesWidget() or ::getCheckboxesDefinition() * The method ResourceLoaderModule::getPosition(), deprecated in 1.29, has been removed. * The DeferredStringifier class is deprecated, use Message::listParam() instead. * The type string for the parameter $lang of DateFormatter::getInstance is diff --git a/includes/EditPage.php b/includes/EditPage.php index 08c4a7286b..ad5f75dd0a 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3153,62 +3153,6 @@ ERROR; ]; } - /** - * Standard summary input and label (wgSummary), abstracted so EditPage - * subclasses may reorganize the form. - * Note that you do not need to worry about the label's for=, it will be - * inferred by the id given to the input. You can remove them both by - * passing [ 'id' => false ] to $userInputAttrs. - * - * @deprecated since 1.30 Use getSummaryInputWidget() instead - * @param string $summary The value of the summary input - * @param string $labelText The html to place inside the label - * @param array $inputAttrs Array of attrs to use on the input - * @param array $spanLabelAttrs Array of attrs to use on the span inside the label - * @return array An array in the format [ $label, $input ] - */ - public function getSummaryInput( $summary = "", $labelText = null, - $inputAttrs = null, $spanLabelAttrs = null - ) { - wfDeprecated( __METHOD__, '1.30' ); - $inputAttrs = $this->getSummaryInputAttributes( $inputAttrs ); - $inputAttrs += Linker::tooltipAndAccesskeyAttribs( 'summary' ); - - $spanLabelAttrs = ( is_array( $spanLabelAttrs ) ? $spanLabelAttrs : [] ) + [ - 'class' => $this->missingSummary ? 'mw-summarymissed' : 'mw-summary', - 'id' => "wpSummaryLabel" - ]; - - $label = null; - if ( $labelText ) { - $label = Xml::tags( - 'label', - $inputAttrs['id'] ? [ 'for' => $inputAttrs['id'] ] : null, - $labelText - ); - $label = Xml::tags( 'span', $spanLabelAttrs, $label ); - } - - $input = Html::input( 'wpSummary', $summary, 'text', $inputAttrs ); - - return [ $label, $input ]; - } - - /** - * Builds a standard summary input with a label. - * - * @deprecated since 1.30 Use getSummaryInputWidget() instead - * @param string $summary The value of the summary input - * @param string $labelText The html to place inside the label - * @param array $inputAttrs Array of attrs to use on the input - * - * @return OOUI\FieldLayout OOUI FieldLayout with Label and Input - */ - function getSummaryInputOOUI( $summary = "", $labelText = null, $inputAttrs = null ) { - wfDeprecated( __METHOD__, '1.30' ); - return $this->getSummaryInputWidget( $summary, $labelText, $inputAttrs ); - } - /** * Builds a standard summary input with a label. * @@ -4225,76 +4169,6 @@ ERROR; return $checkboxes; } - /** - * Returns an array of html code of the following checkboxes old style: - * minor and watch - * - * @deprecated since 1.30 Use getCheckboxesWidget() or getCheckboxesDefinition() instead - * @param int &$tabindex Current tabindex - * @param array $checked See getCheckboxesDefinition() - * @return array - */ - public function getCheckboxes( &$tabindex, $checked ) { - wfDeprecated( __METHOD__, '1.30' ); - $checkboxes = []; - $checkboxesDef = $this->getCheckboxesDefinition( $checked ); - - // Backwards-compatibility for the EditPageBeforeEditChecks hook - if ( !$this->isNew ) { - $checkboxes['minor'] = ''; - } - $checkboxes['watch'] = ''; - - foreach ( $checkboxesDef as $name => $options ) { - $legacyName = isset( $options['legacy-name'] ) ? $options['legacy-name'] : $name; - $label = $this->context->msg( $options['label-message'] )->parse(); - $attribs = [ - 'tabindex' => ++$tabindex, - 'id' => $options['id'], - ]; - $labelAttribs = [ - 'for' => $options['id'], - ]; - if ( isset( $options['tooltip'] ) ) { - $attribs['accesskey'] = $this->context->msg( "accesskey-{$options['tooltip']}" )->text(); - $labelAttribs['title'] = Linker::titleAttrib( $options['tooltip'], 'withaccess' ); - } - if ( isset( $options['title-message'] ) ) { - $labelAttribs['title'] = $this->context->msg( $options['title-message'] )->text(); - } - if ( isset( $options['label-id'] ) ) { - $labelAttribs['id'] = $options['label-id']; - } - $checkboxHtml = - Xml::check( $name, $options['default'], $attribs ) . - ' ' . - Xml::tags( 'label', $labelAttribs, $label ); - - $checkboxes[ $legacyName ] = $checkboxHtml; - } - - // Avoid PHP 7.1 warning of passing $this by reference - $editPage = $this; - Hooks::run( 'EditPageBeforeEditChecks', [ &$editPage, &$checkboxes, &$tabindex ], '1.29' ); - return $checkboxes; - } - - /** - * Returns an array of checkboxes for the edit form, including 'minor' and 'watch' checkboxes and - * any other added by extensions. - * - * @deprecated since 1.30 Use getCheckboxesWidget() or getCheckboxesDefinition() instead - * @param int &$tabindex Current tabindex - * @param array $checked Array of checkbox => bool, where bool indicates the checked - * status of the checkbox - * - * @return array Associative array of string keys to OOUI\FieldLayout instances - */ - public function getCheckboxesOOUI( &$tabindex, $checked ) { - wfDeprecated( __METHOD__, '1.30' ); - return $this->getCheckboxesWidget( $tabindex, $checked ); - } - /** * Returns an array of checkboxes for the edit form, including 'minor' and 'watch' checkboxes and * any other added by extensions. -- 2.20.1