* @file
*/
+use MediaWiki\Block\AbstractBlock;
use MediaWiki\MediaWikiServices;
/**
*/
class ApiQueryUserInfo extends ApiQueryBase {
+ use ApiBlockInfoTrait;
+
const WL_UNREAD_LIMIT = 1000;
private $params = [];
/**
* Get basic info about a given block
- * @param Block $block
- * @return array Array containing several keys:
- * - blockid - ID of the block
- * - blockedby - username of the blocker
- * - blockedbyid - user ID of the blocker
- * - blockreason - reason provided for the block
- * - blockedtimestamp - timestamp for when the block was placed/modified
- * - blockexpiry - expiry time of the block
- * - systemblocktype - system block type, if any
+ *
+ * @deprecated since 1.34 Use ApiBlockInfoTrait::getBlockDetails() instead.
+ * @param AbstractBlock $block
+ * @return array See ApiBlockInfoTrait::getBlockDetails
*/
- public static function getBlockInfo( Block $block ) {
- $vals = [];
- $vals['blockid'] = $block->getId();
- $vals['blockedby'] = $block->getByName();
- $vals['blockedbyid'] = $block->getBy();
- $vals['blockreason'] = $block->getReason();
- $vals['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $block->getTimestamp() );
- $vals['blockexpiry'] = ApiResult::formatExpiry( $block->getExpiry(), 'infinite' );
- $vals['blockpartial'] = !$block->isSitewide();
- if ( $block->getSystemBlockType() !== null ) {
- $vals['systemblocktype'] = $block->getSystemBlockType();
- }
- return $vals;
+ public static function getBlockInfo( AbstractBlock $block ) {
+ wfDeprecated( __METHOD__, '1.34' );
+
+ // Hack to access a private method from a trait:
+ $dummy = new class {
+ use ApiBlockInfoTrait {
+ getBlockDetails as public;
+ }
+ };
+
+ return $dummy->getBlockDetails( $block );
}
/**
$vals['anon'] = true;
}
- if ( isset( $this->prop['blockinfo'] ) && $user->isBlocked() ) {
- $vals = array_merge( $vals, self::getBlockInfo( $user->getBlock() ) );
+ if ( isset( $this->prop['blockinfo'] ) ) {
+ $block = $user->getBlock();
+ if ( $block ) {
+ $vals = array_merge( $vals, $this->getBlockDetails( $block ) );
+ }
}
if ( isset( $this->prop['hasmsg'] ) ) {