X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fskins%2FBaseTemplate.php;h=9436c3b1d895f9da6094a3a4c326c7842769f7f2;hb=43fe3f21d48075ebbabcf0825b1520804ca9175e;hp=cd63796088a55162d4bfffa797a267518ce9f413;hpb=509b2f7fe247bfe89c6bedd21d4bfd22d435aa4d;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php index cd63796088..9436c3b1d8 100644 --- a/includes/skins/BaseTemplate.php +++ b/includes/skins/BaseTemplate.php @@ -32,12 +32,11 @@ abstract class BaseTemplate extends QuickTemplate { * Get a Message object with its context set * * @param string $name Message name - * @param mixed $params,... Message params - * @suppress PhanCommentParamWithoutRealParam HHVM bug T228695#5450847 + * @param mixed ...$params Message params * @return Message */ - public function getMsg( $name /* ... */ ) { - return $this->getSkin()->msg( ...func_get_args() ); + public function getMsg( $name, ...$params ) { + return $this->getSkin()->msg( $name, ...$params ); } function msg( $str ) { @@ -48,7 +47,7 @@ abstract class BaseTemplate extends QuickTemplate { * @deprecated since 1.33 Use ->msg() or ->getMsg() instead. */ function msgWiki( $str ) { - // TODO: Add wfDeprecated( __METHOD__, '1.33' ) after 1.33 got released + wfDeprecated( __METHOD__, '1.33' ); // Hard-deprecated in 1.34 echo $this->getMsg( $str )->parseAsBlock(); } @@ -140,7 +139,15 @@ abstract class BaseTemplate extends QuickTemplate { if ( isset( $plink['active'] ) ) { $ptool['active'] = $plink['active']; } - foreach ( [ 'href', 'class', 'text', 'dir', 'data', 'exists' ] as $k ) { + foreach ( [ + 'href', + 'class', + 'text', + 'dir', + 'data', + 'exists', + 'data-mw' + ] as $k ) { if ( isset( $plink[$k] ) ) { $ptool['links'][0][$k] = $plink[$k]; } @@ -756,6 +763,7 @@ abstract class BaseTemplate extends QuickTemplate { */ public function getTrail() { return WrappedString::join( "\n", [ + // @phan-suppress-next-line PhanTypeMismatchArgument MWDebug::getDebugHTML( $this->getSkin()->getContext() ), $this->get( 'bottomscripts' ), $this->get( 'reporttime' )