From 1bf8e81cdd80d5c6ef816bd2e1ec813bce2d9bbf Mon Sep 17 00:00:00 2001
From: Victor Barbu <victorbarbu08@gmail.com>
Date: Wed, 28 Dec 2016 23:41:30 +0200
Subject: [PATCH] Remove WebRequest::checkSessionCookie() method as being
 deprecated

Bug: T61113
Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
---
 RELEASE-NOTES-1.29             |  2 ++
 includes/DerivativeRequest.php |  4 ----
 includes/WebRequest.php        | 16 ----------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254ce0f..9e3cfac055 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,8 @@ changes to languages because of Phabricator reports.
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. Use
+\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() instead.
 
 == Compatibility ==
 
diff --git a/includes/DerivativeRequest.php b/includes/DerivativeRequest.php
index 4c149ae3ef..487e86c8d0 100644
--- a/includes/DerivativeRequest.php
+++ b/includes/DerivativeRequest.php
@@ -49,10 +49,6 @@ class DerivativeRequest extends FauxRequest {
 		return $this->base->getCookie( $key, $prefix, $default );
 	}
 
-	public function checkSessionCookie() {
-		return $this->base->checkSessionCookie();
-	}
-
 	public function getHeader( $name, $flags = 0 ) {
 		return $this->base->getHeader( $name, $flags );
 	}
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index e7c9b83849..3bbdc3f312 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -757,22 +757,6 @@ class WebRequest {
 		return $this->sessionId;
 	}
 
-	/**
-	 * Returns true if the request has a persistent session.
-	 * This does not necessarily mean that the user is logged in!
-	 *
-	 * @deprecated since 1.27, use
-	 *  \MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
-	 *  instead.
-	 * @return bool
-	 */
-	public function checkSessionCookie() {
-		global $wgInitialSessionId;
-		wfDeprecated( __METHOD__, '1.27' );
-		return $wgInitialSessionId !== null &&
-			$this->getSession()->getId() === (string)$wgInitialSessionId;
-	}
-
 	/**
 	 * Get a cookie from the $_COOKIE jar
 	 *
-- 
2.20.1