Change I7b37295e didn't get rebased to take into account the new ApiTag
module added the same day. So update it now.
Also fix some errors in error handling noticed while testing this
update.
Bug: T96251
Bug: T96252
Change-Id: If8b63af91547e117b9d7d88e2ec9739131ee09b7
// validate and process each revid, rcid and logid
$this->requireAtLeastOneParameter( $params, 'revid', 'rcid', 'logid' );
// validate and process each revid, rcid and logid
$this->requireAtLeastOneParameter( $params, 'revid', 'rcid', 'logid' );
- $result = $this->getResult();
$ret = array();
if ( $params['revid'] ) {
foreach ( $params['revid'] as $id ) {
$ret = array();
if ( $params['revid'] ) {
foreach ( $params['revid'] as $id ) {
- $ret[] = $this->processIndividual( 'revid', $params, $id, $result );
+ $ret[] = $this->processIndividual( 'revid', $params, $id );
}
}
if ( $params['rcid'] ) {
foreach ( $params['rcid'] as $id ) {
}
}
if ( $params['rcid'] ) {
foreach ( $params['rcid'] as $id ) {
- $ret[] = $this->processIndividual( 'rcid', $params, $id, $result );
+ $ret[] = $this->processIndividual( 'rcid', $params, $id );
}
}
if ( $params['logid'] ) {
foreach ( $params['logid'] as $id ) {
}
}
if ( $params['logid'] ) {
foreach ( $params['logid'] as $id ) {
- $ret[] = $this->processIndividual( 'logid', $params, $id, $result );
+ $ret[] = $this->processIndividual( 'logid', $params, $id );
- $result->setIndexedTagName( $ret, 'result' );
- $result->addValue( null, $this->getModuleName(), $ret );
+ ApiResult::setIndexedTagName( $ret, 'result' );
+ $this->getResult()->addValue( null, $this->getModuleName(), $ret );
}
protected static function validateLogId( $logid ) {
}
protected static function validateLogId( $logid ) {
- protected function processIndividual( $type, $params, $id, &$result ) {
+ protected function processIndividual( $type, $params, $id ) {
$idResult = array( $type => $id );
// validate the ID
$idResult = array( $type => $id );
// validate the ID
$this->getUser() );
if ( !$status->isOK() ) {
$this->getUser() );
if ( !$status->isOK() ) {
- if ( $status->hasWarning( 'actionthrottledtext' ) ) {
+ if ( $status->hasMessage( 'actionthrottledtext' ) ) {
$idResult['status'] = 'skipped';
} else {
$idResult['status'] = 'failure';
$idResult['status'] = 'skipped';
} else {
$idResult['status'] = 'failure';
- $ret['errors'] = $result->convertStatusToArray( $status, 'error' );
+ $idResult['errors'] = $this->getErrorFormatter()->arrayFromStatus( $status, 'error' );
}
} else {
$idResult['status'] = 'success';
}
} else {
$idResult['status'] = 'success';
} else {
$idResult['actionlogid'] = $status->value->logId;
$idResult['added'] = $status->value->addedTags;
} else {
$idResult['actionlogid'] = $status->value->logId;
$idResult['added'] = $status->value->addedTags;
- $result->setIndexedTagName( $idResult['added'], 't' );
+ ApiResult::setIndexedTagName( $idResult['added'], 't' );
$idResult['removed'] = $status->value->removedTags;
$idResult['removed'] = $status->value->removedTags;
- $result->setIndexedTagName( $idResult['removed'], 't' );
+ ApiResult::setIndexedTagName( $idResult['removed'], 't' );