From 7bb16a14ce0e1423e3510ca47321a6a404a93a30 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Fri, 21 Jun 2019 14:17:06 -0700 Subject: [PATCH] Drop wfGetLBFactory, deprecated in 1.27 Change-Id: I53b5611edc9443f6a684192e5a03bb0100cb448d --- RELEASE-NOTES-1.34 | 2 ++ includes/GlobalFunctions.php | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 8dab974089..f111a8ac92 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -241,6 +241,8 @@ because of Phabricator reports. * The UserLoadFromSession hook, deprecated in 1.27, has been removed. * The wfResetSessionID global function, deprecated in 1.27, has been removed. Use MediaWiki\Session\SessionManager instead. +* The wfGetLBFactory global function, deprecated in 1.27, has been removed. + Use MediaWikiServices::getInstance()->getDBLoadBalancerFactory(). * … === Deprecations in 1.34 === diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 0f0a93bfc3..05c4655b87 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2577,19 +2577,6 @@ function wfGetLB( $wiki = false ) { } } -/** - * Get the load balancer factory object - * - * @deprecated since 1.27, use MediaWikiServices::getInstance()->getDBLoadBalancerFactory() instead. - * TODO: Remove in MediaWiki 1.35 - * - * @return \Wikimedia\Rdbms\LBFactory - */ -function wfGetLBFactory() { - wfDeprecated( __METHOD__, '1.27' ); - return MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); -} - /** * Find a file. * @deprecated since 1.34, use MediaWikiServices -- 2.20.1