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

installer: Deprecate WebInstaller::getInfoBox, getWarningBox and getErrorBox

Browse source 
Since MW 1.31 there are messageBox, warningBox, errorBox and successBox
available which should be used instead.

These are simple wrappers around Html::messageBox and related methods
which should be used directly instead. Internal usage has been migrated
as of a9252abb1c, but these public methods remain for now. Once
removed we can also removed the internal Html::infoBox() method.

Bug: T232903
Change-Id: I2756c88987754c4e3f84d98c531d8396098cd7fe
This commit is contained in:
Volker E 2019-09-16 18:53:29 -07:00 committed by Krinkle
parent 76a8bfa278
commit d6ed082b6d
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.34
View file

@ -575,6 +575,8 @@ because of Phabricator reports.
* Specifying a SpecialPage object for the list of special pages (either through
the SpecialPage_initList hook or by adding to $wgSpecialPages) is now
deprecated.
* WebInstaller::getInfoBox(), getWarningBox() and getErrorBox() are deprecated.
Use Html::errorBox() or Html::warningBox() instead.
* Use of ActorMigration with 'ar_user', 'img_user', 'oi_user', 'fa_user',
'rc_user', 'log_user', and 'ipb_by' is deprecated. Queries should be adjusted
to use the corresponding actor fields directly. Note that use with

2
includes/Html.php
View file

@ -1011,7 +1011,7 @@ class Html {
/**
* Get HTML for an information message box with an icon.
*
* @internal For use by the WebInstaller class.
* @internal For use by the WebInstaller class only.
* @param string $rawHtml HTML
* @param string $icon Path to icon file (used as 'src' attribute)
* @param string $alt Alternate text for the icon

6
includes/installer/WebInstaller.php
View file

@ -638,34 +638,40 @@ class WebInstaller extends Installer {
/**
* Get HTML for an error box with an icon.
*
* @deprecated since 1.34 Use Html::errorBox() instead.
* @param string $text Wikitext, get this with wfMessage()->plain()
*
* @return string
*/
public function getErrorBox( $text ) {
wfDeprecated( __METHOD__, '1.34' );
return $this->getInfoBox( $text, 'critical-32.png', 'config-error-box' );
}
/**
* Get HTML for a warning box with an icon.
*
* @deprecated since 1.34 Use Html::warningBox() instead.
* @param string $text Wikitext, get this with wfMessage()->plain()
*
* @return string
*/
public function getWarningBox( $text ) {
wfDeprecated( __METHOD__, '1.34' );
return $this->getInfoBox( $text, 'warning-32.png', 'config-warning-box' );
}
/**
* Get HTML for an information message box with an icon.
*
* @deprecated since 1.34.
* @param string|HtmlArmor $text Wikitext to be parsed (from Message::plain) or raw HTML.
* @param string|bool $icon Icon name, file in mw-config/images. Default: false
* @param string|bool $class Additional class name to add to the wrapper div. Default: false.
* @return string HTML
*/
public function getInfoBox( $text, $icon = false, $class = false ) {
wfDeprecated( __METHOD__, '1.34' );
$html = ( $text instanceof HtmlArmor ) ?
HtmlArmor::getHtml( $text ) :
$this->parse( $text, true );