Fix order of arguments in ChangeTags::getPrevTags

Bug: T212703
Change-Id: I9e38c999718762daeb5c155ea8eaaa5d16dd85c1

diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php
index 32cfd13..a1cf468 100644 (file)
--- 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 f1ee99f..e9058b6 100644 (file)
--- 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 ) );
        }