From 6a2cd1c5c22b6dd79fbc1ef65bf3b6e1d92b8fb7 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Fri, 13 Apr 2018 23:36:34 +0200 Subject: [PATCH] Use constants for rc_patrolled values instead of numbers These are recently introduced, better to use them Change-Id: Id904ff09081cb5a1fe2f1c24c5d415da18fd2294 --- includes/Storage/RevisionStore.php | 2 +- includes/revisiondelete/RevDelLogItem.php | 2 +- includes/revisiondelete/RevDelRevisionItem.php | 2 +- includes/specialpage/ChangesListSpecialPage.php | 4 ++-- includes/specials/pagers/NewFilesPager.php | 2 +- includes/specials/pagers/NewPagesPager.php | 2 +- includes/watcheditem/WatchedItemQueryService.php | 8 ++++---- .../watcheditem/WatchedItemQueryServiceUnitTest.php | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php index 584142bfc1..1f0afaec0c 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Storage/RevisionStore.php @@ -636,7 +636,7 @@ class RevisionStore */ public function getRcIdIfUnpatrolled( RevisionRecord $rev ) { $rc = $this->getRecentChange( $rev ); - if ( $rc && $rc->getAttribute( 'rc_patrolled' ) == 0 ) { + if ( $rc && $rc->getAttribute( 'rc_patrolled' ) == RecentChange::PRC_UNPATROLLED ) { return $rc->getAttribute( 'rc_id' ); } else { return 0; diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php index 198a28b503..36198cd2cf 100644 --- a/includes/revisiondelete/RevDelLogItem.php +++ b/includes/revisiondelete/RevDelLogItem.php @@ -75,7 +75,7 @@ class RevDelLogItem extends RevDelItem { $dbw->update( 'recentchanges', [ 'rc_deleted' => $bits, - 'rc_patrolled' => 1 + 'rc_patrolled' => RecentChange::PRC_PATROLLED ], [ 'rc_logid' => $this->row->log_id, diff --git a/includes/revisiondelete/RevDelRevisionItem.php b/includes/revisiondelete/RevDelRevisionItem.php index cb5ce48e87..7b5d130b24 100644 --- a/includes/revisiondelete/RevDelRevisionItem.php +++ b/includes/revisiondelete/RevDelRevisionItem.php @@ -83,7 +83,7 @@ class RevDelRevisionItem extends RevDelItem { $dbw->update( 'recentchanges', [ 'rc_deleted' => $bits, - 'rc_patrolled' => 1 + 'rc_patrolled' => RecentChange::PRC_PATROLLED ], [ 'rc_this_oldid' => $this->revision->getId(), // condition diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 2a4acc86ab..ac13f113b2 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -475,7 +475,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { 'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds, &$query_options, &$join_conds ) { - $conds[] = 'rc_patrolled = 0'; + $conds['rc_patrolled'] = RecentChange::PRC_UNPATROLLED; }, 'isReplacedInStructuredUi' => true, ], @@ -485,7 +485,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { 'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds, &$query_options, &$join_conds ) { - $conds[] = 'rc_patrolled != 0'; + $conds[] = 'rc_patrolled != ' . RecentChange::PRC_UNPATROLLED; }, 'isReplacedInStructuredUi' => true, ], diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php index 57cdad9ad7..c214f1f77b 100644 --- a/includes/specials/pagers/NewFilesPager.php +++ b/includes/specials/pagers/NewFilesPager.php @@ -110,7 +110,7 @@ class NewFilesPager extends RangeChronologicalPager { $tables[] = 'recentchanges'; $conds['rc_type'] = RC_LOG; $conds['rc_log_type'] = 'upload'; - $conds['rc_patrolled'] = 0; + $conds['rc_patrolled'] = RecentChange::PRC_UNPATROLLED; $conds['rc_namespace'] = NS_FILE; if ( $wgActorTableSchemaMigrationStage === MIGRATION_NEW ) { diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php index efdc75a344..f16a5cb615 100644 --- a/includes/specials/pagers/NewPagesPager.php +++ b/includes/specials/pagers/NewPagesPager.php @@ -82,7 +82,7 @@ class NewPagesPager extends ReverseChronologicalPager { # If this user cannot see patrolled edits or they are off, don't do dumb queries! if ( $this->opts->getValue( 'hidepatrolled' ) && $this->getUser()->useNPPatrol() ) { - $conds['rc_patrolled'] = 0; + $conds['rc_patrolled'] = RecentChange::PRC_UNPATROLLED; } if ( $this->opts->getValue( 'hidebots' ) ) { diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php index bf419a94a5..506ee0092c 100644 --- a/includes/watcheditem/WatchedItemQueryService.php +++ b/includes/watcheditem/WatchedItemQueryService.php @@ -498,15 +498,15 @@ class WatchedItemQueryService { // TODO: not sure if this should simply ignore patrolled filters if user does not have the patrol // right, or maybe rather fail loud at this point, same as e.g. ApiQueryWatchlist does? if ( in_array( self::FILTER_PATROLLED, $options['filters'] ) ) { - $conds[] = 'rc_patrolled != 0'; + $conds[] = 'rc_patrolled != ' . RecentChange::PRC_UNPATROLLED; } elseif ( in_array( self::FILTER_NOT_PATROLLED, $options['filters'] ) ) { - $conds[] = 'rc_patrolled = 0'; + $conds['rc_patrolled'] = RecentChange::PRC_UNPATROLLED; } if ( in_array( self::FILTER_AUTOPATROLLED, $options['filters'] ) ) { - $conds[] = 'rc_patrolled = 2'; + $conds['rc_patrolled'] = RecentChange::PRC_AUTOPATROLLED; } elseif ( in_array( self::FILTER_NOT_AUTOPATROLLED, $options['filters'] ) ) { - $conds[] = 'rc_patrolled != 2'; + $conds[] = 'rc_patrolled != ' . RecentChange::PRC_AUTOPATROLLED; } } diff --git a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php index be51626a6f..50e6c202f4 100644 --- a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php +++ b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php @@ -776,7 +776,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase { null, [], [], - [ 'rc_patrolled = 0' ], + [ 'rc_patrolled' => 0 ], [], [], ], -- 2.20.1