From a38fe6cd7d953426ff586849d66e395c48c561c8 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Sat, 9 Feb 2019 12:59:00 -0800
Subject: [PATCH] Drop b/c reading of wgSessionsInObjectCache and
 wgSessionHandler, deprecated in 1.27

Depends-On: I0d861a24b6cfd5c881112f15c682d97cef715cf0
Change-Id: I6b69d9ad3863512879f287f960828c1fdf7b214c
---
 RELEASE-NOTES-1.33           |  3 +++
 includes/DefaultSettings.php | 10 ----------
 includes/Setup.php           | 15 ---------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index da87d1e67b..35c70c8169 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -228,6 +228,9 @@ because of Phabricator reports.
 * User::getGroupName() and ::getGroupMember(), both deprecated in 1.29, have
   been removed. Instead, please use UserGroupMembership::getGroupName() and
   UserGroupMembership::getGroupMemberName().
+* Backwards compatibility for setting wgSessionsInObjectCache to false or using
+  wgSessionHandler, both of which were deprecated in 1.27 with the introduction
+  of SessionManager, has been removed.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e6b44edd66..dc8f1e86e4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2512,21 +2512,11 @@ $wgMainStash = 'db-replicated';
  */
 $wgParserCacheExpireTime = 86400;
 
-/**
- * @deprecated since 1.27, session data is always stored in object cache.
- */
-$wgSessionsInObjectCache = true;
-
 /**
  * The expiry time to use for session storage, in seconds.
  */
 $wgObjectCacheSessionExpiry = 3600;
 
-/**
- * @deprecated since 1.27, MediaWiki\Session\SessionManager doesn't use PHP session storage.
- */
-$wgSessionHandler = null;
-
 /**
  * Whether to use PHP session handling ($_SESSION and session_*() functions)
  *
diff --git a/includes/Setup.php b/includes/Setup.php
index 516937e35c..b4b6ce6e9c 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -580,21 +580,6 @@ if ( $wgMaximalPasswordLength !== false ) {
 	$wgPasswordPolicy['policies']['default']['MaximalPasswordLength'] = $wgMaximalPasswordLength;
 }
 
-// Backwards compatibility warning
-if ( !$wgSessionsInObjectCache ) {
-	wfDeprecated( '$wgSessionsInObjectCache = false', '1.27' );
-	if ( $wgSessionHandler ) {
-		wfDeprecated( '$wgSessionsHandler', '1.27' );
-	}
-	$cacheType = get_class( ObjectCache::getInstance( $wgSessionCacheType ) );
-	wfDebugLog(
-		'caches',
-		"Session data will be stored in \"$cacheType\" cache with " .
-			"expiry $wgObjectCacheSessionExpiry seconds"
-	);
-}
-$wgSessionsInObjectCache = true;
-
 if ( $wgPHPSessionHandling !== 'enable' &&
 	$wgPHPSessionHandling !== 'warn' &&
 	$wgPHPSessionHandling !== 'disable'
-- 
2.20.1