Merge "Simplify Block::getBy and Block::getByName"

[lhc/web/wiklou.git] / includes / api / ApiQueryUserInfo.php

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 44e2703..f594347 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -67,8 +67,8 @@ class ApiQueryUserInfo extends ApiQueryBase {
                $vals['blockid'] = $block->getId();
                $vals['blockedby'] = $block->getByName();
                $vals['blockedbyid'] = $block->getBy();
-               $vals['blockreason'] = $block->mReason;
-               $vals['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $block->mTimestamp );
+               $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 ) {
@@ -119,7 +119,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
        protected function getCurrentUserInfo() {
                $user = $this->getUser();
                $vals = [];
-               $vals['id'] = intval( $user->getId() );
+               $vals['id'] = (int)$user->getId();
                $vals['name'] = $user->getName();
 
                if ( $user->isAnon() ) {
@@ -189,7 +189,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
                if ( isset( $this->prop['editcount'] ) ) {
                        // use intval to prevent null if a non-logged-in user calls
                        // api.php?format=jsonfm&action=query&meta=userinfo&uiprop=editcount
-                       $vals['editcount'] = intval( $user->getEditCount() );
+                       $vals['editcount'] = (int)$user->getEditCount();
                }
 
                if ( isset( $this->prop['ratelimits'] ) ) {
@@ -284,8 +284,8 @@ class ApiQueryUserInfo extends ApiQueryBase {
                foreach ( $this->getConfig()->get( 'RateLimits' ) as $action => $limits ) {
                        foreach ( $categories as $cat ) {
                                if ( isset( $limits[$cat] ) && !is_null( $limits[$cat] ) ) {
-                                       $retval[$action][$cat]['hits'] = intval( $limits[$cat][0] );
-                                       $retval[$action][$cat]['seconds'] = intval( $limits[$cat][1] );
+                                       $retval[$action][$cat]['hits'] = (int)$limits[$cat][0];
+                                       $retval[$action][$cat]['seconds'] = (int)$limits[$cat][1];
                                }
                        }
                }