From a4880e9bbfd90642cfa5b852bdabf4101760f092 Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <ladsgroup@gmail.com>
Date: Wed, 9 Jan 2019 09:05:49 +0100
Subject: [PATCH] Fix order of arguments in ChangeTags::getPrevTags

Bug: T212703
Change-Id: I9e38c999718762daeb5c155ea8eaaa5d16dd85c1
---
 includes/changetags/ChangeTags.php            |  2 +-
 .../includes/changetags/ChangeTagsTest.php    | 35 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php
index 32cfd13f58..a1cf468e6b 100644
--- a/includes/changetags/ChangeTags.php
+++ b/includes/changetags/ChangeTags.php
@@ -428,7 +428,7 @@ class ChangeTags {
 		return [ $tagsToAdd, $tagsToRemove, $prevTags ];
 	}
 
-	private static function getPrevTags( $rc_id = null, $rev_id = null, $log_id = null ) {
+	private static function getPrevTags( $rc_id = null, $log_id = null, $rev_id = null ) {
 		$conds = array_filter(
 			[
 				'ct_rc_id' => $rc_id,
diff --git a/tests/phpunit/includes/changetags/ChangeTagsTest.php b/tests/phpunit/includes/changetags/ChangeTagsTest.php
index f1ee99f6d4..e9058b620d 100644
--- a/tests/phpunit/includes/changetags/ChangeTagsTest.php
+++ b/tests/phpunit/includes/changetags/ChangeTagsTest.php
@@ -338,7 +338,8 @@ class ChangeTagsTest extends MediaWikiTestCase {
 		$dbw->delete( 'change_tag_def', '*' );
 
 		$rcId = 123;
-		ChangeTags::updateTags( [ 'tag1', 'tag2' ], [], $rcId );
+		$revId = 341;
+		ChangeTags::updateTags( [ 'tag1', 'tag2' ], [], $rcId, $revId );
 
 		$dbr = wfGetDB( DB_REPLICA );
 
@@ -360,20 +361,22 @@ class ChangeTagsTest extends MediaWikiTestCase {
 		$expected2 = [
 			(object)[
 				'ct_tag_id' => 1,
-				'ct_rc_id' => 123
+				'ct_rc_id' => 123,
+				'ct_rev_id' => 341
 			],
 			(object)[
 				'ct_tag_id' => 2,
-				'ct_rc_id' => 123
+				'ct_rc_id' => 123,
+				'ct_rev_id' => 341
 			],
 		];
-		$res2 = $dbr->select( 'change_tag', [ 'ct_tag_id', 'ct_rc_id' ], '' );
+		$res2 = $dbr->select( 'change_tag', [ 'ct_tag_id', 'ct_rc_id', 'ct_rev_id' ], '' );
 		$this->assertEquals( $expected2, iterator_to_array( $res2, false ) );
 
 		$rcId = 124;
-		ChangeTags::updateTags( [ 'tag1' ], [], $rcId );
-
-		ChangeTags::updateTags( [ 'tag3' ], [], $rcId );
+		$revId = 342;
+		ChangeTags::updateTags( [ 'tag1' ], [], $rcId, $revId );
+		ChangeTags::updateTags( [ 'tag3' ], [], $rcId, $revId );
 
 		$dbr = wfGetDB( DB_REPLICA );
 
@@ -400,22 +403,26 @@ class ChangeTagsTest extends MediaWikiTestCase {
 		$expected2 = [
 			(object)[
 				'ct_tag_id' => 1,
-				'ct_rc_id' => 123
+				'ct_rc_id' => 123,
+				'ct_rev_id' => 341
 			],
 			(object)[
-				'ct_tag_id' => 2,
-				'ct_rc_id' => 123
+				'ct_tag_id' => 1,
+				'ct_rc_id' => 124,
+				'ct_rev_id' => 342
 			],
 			(object)[
-				'ct_tag_id' => 1,
-				'ct_rc_id' => 124
+				'ct_tag_id' => 2,
+				'ct_rc_id' => 123,
+				'ct_rev_id' => 341
 			],
 			(object)[
 				'ct_tag_id' => 3,
-				'ct_rc_id' => 124
+				'ct_rc_id' => 124,
+				'ct_rev_id' => 342
 			],
 		];
-		$res2 = $dbr->select( 'change_tag', [ 'ct_tag_id', 'ct_rc_id' ], '' );
+		$res2 = $dbr->select( 'change_tag', [ 'ct_tag_id', 'ct_rc_id', 'ct_rev_id' ], '' );
 		$this->assertEquals( $expected2, iterator_to_array( $res2, false ) );
 	}
 
-- 
2.20.1