Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286916
Change subject: Stop using deprecated WatchedItem methods
......................................................................
Stop using deprecated WatchedItem methods
Depends-On: I193de7ef1566336040463b71735b09db941d8ce1
Change-Id: Ifd6d46596ea273da73c3097aaff1487860bd6424
---
M repo/includes/Interactors/ItemMergeInteractor.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
2 files changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/16/286916/5
diff --git a/repo/includes/Interactors/ItemMergeInteractor.php
b/repo/includes/Interactors/ItemMergeInteractor.php
index d33ea6a..11f898a 100644
--- a/repo/includes/Interactors/ItemMergeInteractor.php
+++ b/repo/includes/Interactors/ItemMergeInteractor.php
@@ -2,8 +2,8 @@
namespace Wikibase\Repo\Interactors;
+use MediaWiki\MediaWikiServices;
use User;
-use WatchedItem;
use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\ChangeOp\ChangeOpsMerge;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
@@ -323,7 +323,9 @@
$fromTitle = $this->entityTitleLookup->getTitleForId( $fromId );
$toTitle = $this->entityTitleLookup->getTitleForId( $toId );
- WatchedItem::duplicateEntries( $fromTitle, $toTitle );
+ MediaWikiServices::getInstance()
+ ->getWatchedItemStore()
+ ->duplicateAllAssociatedEntries( $fromTitle, $toTitle );
}
}
diff --git
a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index 152dbf9..2ea436f 100644
--- a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -4,6 +4,7 @@
use ContentHandler;
use HashSiteStore;
+use MediaWiki\MediaWikiServices;
use Status;
use TestSites;
use Title;
@@ -341,8 +342,8 @@
'Q2' => $toData,
) );
- $watchedItem = $this->getWatchedItemForId( $fromId );
- $watchedItem->addWatch();
+ User::newFromName( 'UTSysop' )
+ ->addWatch(
$this->getEntityTitleLookup()->getTitleForId( $fromId ) );
$interactor->mergeItems( $fromId, $toId, $ignoreConflicts,
'CustomSummary' );
@@ -377,14 +378,10 @@
}
private function assertItemMergedIntoIsWatched( ItemId $toId ) {
- $watchedItem = $this->getWatchedItemForId( $toId );
- $this->assertTrue( $watchedItem->isWatched(), 'Item merged into
is being watched' );
- }
-
- private function getWatchedItemForId( ItemId $itemId ) {
- return WatchedItem::fromUserTitle(
- User::newFromName( 'UTSysop' ),
- $this->getEntityTitleLookup()->getTitleForId( $itemId )
+ $this->assertTrue(
+ User::newFromName( 'UTSysop' )
+ ->isWatched(
$this->getEntityTitleLookup()->getTitleForId( $toId ) ),
+ 'Item merged into is being watched'
);
}
--
To view, visit https://gerrit.wikimedia.org/r/286916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd6d46596ea273da73c3097aaff1487860bd6424
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
