From ee7e5636faaf16462c330871cd51fb4ed18d837a Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Wed, 4 May 2016 17:14:24 +0100
Subject: [PATCH] Add wfDeprecated calls to WatchedItem

Depends-On: Ifd6d46596ea273da73c3097aaff1487860bd6424
Depends-On: Ib9502202be3c73f9d3f253b310f35901e1c88cd4
Depends-On: I69d40b48ad3ab126e01b1103ec82b531f2674ced
Change-Id: Ib26ecd3a5f2d98472da78f2cd382153f27cb350b
---
 includes/WatchedItem.php                           | 14 +++++++-------
 .../includes/WatchedItemIntegrationTest.php        |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 50c79dce53..b070e1eba6 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -152,7 +152,7 @@ class WatchedItem {
 	 *             or WatchedItemStore::loadWatchedItem()
 	 */
 	public static function fromUserTitle( $user, $title, $checkRights = User::CHECK_USER_RIGHTS ) {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		return new self( $user, $title, self::DEPRECATED_USAGE_TIMESTAMP, (bool)$checkRights );
 	}
 
@@ -160,7 +160,7 @@ class WatchedItem {
 	 * @deprecated since 1.27 Use WatchedItemStore::resetNotificationTimestamp()
 	 */
 	public function resetNotificationTimestamp( $force = '', $oldid = 0 ) {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
 			return;
 		}
@@ -176,7 +176,7 @@ class WatchedItem {
 	 * @deprecated since 1.27 Use WatchedItemStore::addWatchBatch()
 	 */
 	public static function batchAddWatch( array $items ) {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		if ( !$items ) {
 			return false;
 		}
@@ -209,7 +209,7 @@ class WatchedItem {
 	 * @return bool
 	 */
 	public function addWatch() {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		$this->user->addWatch( $this->getTitle(), $this->checkRights );
 		return true;
 	}
@@ -219,7 +219,7 @@ class WatchedItem {
 	 * @return bool
 	 */
 	public function removeWatch() {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
 			return false;
 		}
@@ -232,7 +232,7 @@ class WatchedItem {
 	 * @return bool
 	 */
 	public function isWatched() {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		return $this->user->isWatched( $this->getTitle(), $this->checkRights );
 	}
 
@@ -240,7 +240,7 @@ class WatchedItem {
 	 * @deprecated since 1.27 Use WatchedItemStore::duplicateAllAssociatedEntries()
 	 */
 	public static function duplicateEntries( Title $oldTitle, Title $newTitle ) {
-		// wfDeprecated( __METHOD__, '1.27' );
+		wfDeprecated( __METHOD__, '1.27' );
 		$store = MediaWikiServices::getInstance()->getWatchedItemStore();
 		$store->duplicateAllAssociatedEntries( $oldTitle, $newTitle );
 	}
diff --git a/tests/phpunit/includes/WatchedItemIntegrationTest.php b/tests/phpunit/includes/WatchedItemIntegrationTest.php
index e5362053fd..be22260d76 100644
--- a/tests/phpunit/includes/WatchedItemIntegrationTest.php
+++ b/tests/phpunit/includes/WatchedItemIntegrationTest.php
@@ -13,6 +13,14 @@ class WatchedItemIntegrationTest extends MediaWikiTestCase {
 		parent::setUp();
 		self::$users['WatchedItemIntegrationTestUser']
 			= new TestUser( 'WatchedItemIntegrationTestUser' );
+
+		$this->hideDeprecated( 'WatchedItem::fromUserTitle' );
+		$this->hideDeprecated( 'WatchedItem::addWatch' );
+		$this->hideDeprecated( 'WatchedItem::removeWatch' );
+		$this->hideDeprecated( 'WatchedItem::isWatched' );
+		$this->hideDeprecated( 'WatchedItem::resetNotificationTimestamp' );
+		$this->hideDeprecated( 'WatchedItem::duplicateEntries' );
+		$this->hideDeprecated( 'WatchedItem::batchAddWatch' );
 	}
 
 	private function getUser() {
@@ -20,6 +28,7 @@ class WatchedItemIntegrationTest extends MediaWikiTestCase {
 	}
 
 	public function testWatchAndUnWatchItem() {
+
 		$user = $this->getUser();
 		$title = Title::newFromText( 'WatchedItemIntegrationTestPage' );
 		// Cleanup after previous tests
-- 
2.20.1