Use (int) rather than intval()

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

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index ba04193..0934ab3 100644 (file)
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -42,8 +42,6 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $fld_details = false, $fld_tags = false;
 
        public function execute() {
-               global $wgChangeTagsSchemaMigrationStage;
-
                $params = $this->extractRequestParams();
                $db = $this->getDB();
                $this->commentStore = CommentStore::getStore();
@@ -116,16 +114,12 @@ class ApiQueryLogEvents extends ApiQueryBase {
                        $this->addTables( 'change_tag' );
                        $this->addJoinConds( [ 'change_tag' => [ 'INNER JOIN',
                                [ 'log_id=ct_log_id' ] ] ] );
-                       if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) {
-                               $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
-                               try {
-                                       $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
-                               } catch ( NameTableAccessException $exception ) {
-                                       // Return nothing.
-                                       $this->addWhere( '1=0' );
-                               }
-                       } else {
-                               $this->addWhereFld( 'ct_tag', $params['tag'] );
+                       $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore();
+                       try {
+                               $this->addWhereFld( 'ct_tag_id', $changeTagDefStore->getId( $params['tag'] ) );
+                       } catch ( NameTableAccessException $exception ) {
+                               // Return nothing.
+                               $this->addWhere( '1=0' );
                        }
                }
 
@@ -270,7 +264,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                $user = $this->getUser();
 
                if ( $this->fld_ids ) {
-                       $vals['logid'] = intval( $row->log_id );
+                       $vals['logid'] = (int)$row->log_id;
                }
 
                if ( $this->fld_title || $this->fld_parsedcomment ) {
@@ -287,8 +281,8 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                        ApiQueryBase::addTitleInfo( $vals, $title );
                                }
                                if ( $this->fld_ids ) {
-                                       $vals['pageid'] = intval( $row->page_id );
-                                       $vals['logpage'] = intval( $row->log_page );
+                                       $vals['pageid'] = (int)$row->page_id;
+                                       $vals['logpage'] = (int)$row->log_page;
                                }
                                if ( $this->fld_details ) {
                                        $vals['params'] = LogFormatter::newFromEntry( $logEntry )->formatParametersForApi();
@@ -311,7 +305,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                        $vals['user'] = $row->user_name ?? $row->log_user_text;
                                }
                                if ( $this->fld_userid ) {
-                                       $vals['userid'] = intval( $row->log_user );
+                                       $vals['userid'] = (int)$row->log_user;
                                }
 
                                if ( !$row->log_user ) {