Switch Signature of WatchedItemStore::addWatchBatch

Adding batches of watched items per users
makes much more sense.
Only the deprecated static WatchedItem method
needed the old silly way of passing in objects.

Change-Id: I90f9583b66bd3b5afcf07faefedb38a8a0149f6e

1 files changed, 13 insertions, 17 deletions

diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php
index 4eea54deecaf..c4340ad5e1f6 100644
--- a/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@ -615,30 +615,30 @@ class WatchedItemStore {
 	 * @param LinkTarget $target
 	 */
 	public function addWatch( User $user, LinkTarget $target ) {
-		$this->addWatchBatch( [ [ $user, $target ] ] );
+		$this->addWatchBatchForUser( $user, [ $target ] );
 	}
 
 	/**
-	 * @param array[] $userTargetCombinations array of arrays containing [0] => User [1] => LinkTarget
+	 * @param User $user
+	 * @param LinkTarget[] $targets
 	 *
 	 * @return bool success
 	 */
-	public function addWatchBatch( array $userTargetCombinations ) {
+	public function addWatchBatchForUser( User $user, array $targets ) {
 		if ( $this->loadBalancer->getReadOnlyReason() !== false ) {
 			return false;
 		}
+		// Only loggedin user can have a watchlist
+		if ( $user->isAnon() ) {
+			return false;
+		}
+
+		if ( !$targets ) {
+			return true;
+		}
 
 		$rows = [];
-		foreach ( $userTargetCombinations as list( $user, $target ) ) {
-			/**
-			 * @var User $user
-			 * @var LinkTarget $target
-			 */
-
-			// Only loggedin user can have a watchlist
-			if ( $user->isAnon() ) {
-				continue;
-			}
+		foreach ( $targets as $target ) {
 			$rows[] = [
 				'wl_user' => $user->getId(),
 				'wl_namespace' => $target->getNamespace(),
@@ -648,10 +648,6 @@ class WatchedItemStore {
 			$this->uncache( $user, $target );
 		}
 
-		if ( !$rows ) {
-			return false;
-		}
-
 		$dbw = $this->getConnection( DB_MASTER );
 		foreach ( array_chunk( $rows, 100 ) as $toInsert ) {
 			// Use INSERT IGNORE to avoid overwriting the notification timestamp