X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fwatcheditem%2FWatchedItem.php;h=43a9c4e53630153592423e8fd7cdbe85e01a7e8b;hb=a3a9b8d440c10e0f1937b20d36cd9e1004843197;hp=bfd1d6136b4d03120b61a001eac7010656f3b9d6;hpb=cc122862fa411dbd5f2958ad91d568862f06d79e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/watcheditem/WatchedItem.php b/includes/watcheditem/WatchedItem.php
index bfd1d6136b..43a9c4e536 100644
--- a/includes/watcheditem/WatchedItem.php
+++ b/includes/watcheditem/WatchedItem.php
@@ -18,7 +18,7 @@
  * @file
  * @ingroup Watchlist
  */
-use MediaWiki\MediaWikiServices;
+
 use MediaWiki\Linker\LinkTarget;
 
 /**
@@ -30,34 +30,6 @@ use MediaWiki\Linker\LinkTarget;
  * @ingroup Watchlist
  */
 class WatchedItem {
-
-	/**
-	 * @deprecated since 1.27, see User::IGNORE_USER_RIGHTS
-	 */
-	const IGNORE_USER_RIGHTS = User::IGNORE_USER_RIGHTS;
-
-	/**
-	 * @deprecated since 1.27, see User::CHECK_USER_RIGHTS
-	 */
-	const CHECK_USER_RIGHTS = User::CHECK_USER_RIGHTS;
-
-	/**
-	 * @deprecated Internal class use only
-	 */
-	const DEPRECATED_USAGE_TIMESTAMP = -100;
-
-	/**
-	 * @var bool
-	 * @deprecated Internal class use only
-	 */
-	public $checkRights = User::CHECK_USER_RIGHTS;
-
-	/**
-	 * @var Title
-	 * @deprecated Internal class use only
-	 */
-	private $title;
-
 	/**
 	 * @var LinkTarget
 	 */
@@ -77,20 +49,15 @@ class WatchedItem {
 	 * @param User $user
 	 * @param LinkTarget $linkTarget
 	 * @param null|string $notificationTimestamp the value of the wl_notificationtimestamp field
-	 * @param bool|null $checkRights DO NOT USE - used internally for backward compatibility
 	 */
 	public function __construct(
 		User $user,
 		LinkTarget $linkTarget,
-		$notificationTimestamp,
-		$checkRights = null
+		$notificationTimestamp
 	) {
 		$this->user = $user;
 		$this->linkTarget = $linkTarget;
 		$this->notificationTimestamp = $notificationTimestamp;
-		if ( $checkRights !== null ) {
-			$this->checkRights = $checkRights;
-		}
 	}
 
 	/**
@@ -113,88 +80,6 @@ class WatchedItem {
 	 * @return bool|null|string
 	 */
 	public function getNotificationTimestamp() {
-		// Back compat for objects constructed using self::fromUserTitle
-		if ( $this->notificationTimestamp === self::DEPRECATED_USAGE_TIMESTAMP ) {
-			// wfDeprecated( __METHOD__, '1.27' );
-			if ( $this->checkRights && !$this->user->isAllowed( 'viewmywatchlist' ) ) {
-				return false;
-			}
-			$item = MediaWikiServices::getInstance()->getWatchedItemStore()
-				->loadWatchedItem( $this->user, $this->linkTarget );
-			if ( $item ) {
-				$this->notificationTimestamp = $item->getNotificationTimestamp();
-			} else {
-				$this->notificationTimestamp = false;
-			}
-		}
 		return $this->notificationTimestamp;
 	}
-
-	/**
-	 * Back compat pre 1.27 with the WatchedItemStore introduction
-	 * @todo remove in 1.28/9
-	 * -------------------------------------------------
-	 */
-
-	/**
-	 * @return Title
-	 * @deprecated Internal class use only
-	 */
-	public function getTitle() {
-		if ( !$this->title ) {
-			$this->title = Title::newFromLinkTarget( $this->linkTarget );
-		}
-		return $this->title;
-	}
-
-	/**
-	 * @deprecated since 1.27 Use the constructor, WatchedItemStore::getWatchedItem()
-	 *             or WatchedItemStore::loadWatchedItem()
-	 */
-	public static function fromUserTitle( $user, $title, $checkRights = User::CHECK_USER_RIGHTS ) {
-		wfDeprecated( __METHOD__, '1.27' );
-		return new self( $user, $title, self::DEPRECATED_USAGE_TIMESTAMP, (bool)$checkRights );
-	}
-
-	/**
-	 * @deprecated since 1.27 Use User::addWatch()
-	 * @return bool
-	 */
-	public function addWatch() {
-		wfDeprecated( __METHOD__, '1.27' );
-		$this->user->addWatch( $this->getTitle(), $this->checkRights );
-		return true;
-	}
-
-	/**
-	 * @deprecated since 1.27 Use User::removeWatch()
-	 * @return bool
-	 */
-	public function removeWatch() {
-		wfDeprecated( __METHOD__, '1.27' );
-		if ( $this->checkRights && !$this->user->isAllowed( 'editmywatchlist' ) ) {
-			return false;
-		}
-		$this->user->removeWatch( $this->getTitle(), $this->checkRights );
-		return true;
-	}
-
-	/**
-	 * @deprecated since 1.27 Use User::isWatched()
-	 * @return bool
-	 */
-	public function isWatched() {
-		wfDeprecated( __METHOD__, '1.27' );
-		return $this->user->isWatched( $this->getTitle(), $this->checkRights );
-	}
-
-	/**
-	 * @deprecated since 1.27 Use WatchedItemStore::duplicateAllAssociatedEntries()
-	 */
-	public static function duplicateEntries( Title $oldTitle, Title $newTitle ) {
-		wfDeprecated( __METHOD__, '1.27' );
-		$store = MediaWikiServices::getInstance()->getWatchedItemStore();
-		$store->duplicateAllAssociatedEntries( $oldTitle, $newTitle );
-	}
-
 }