From: James D. Forrester <jforrester@wikimedia.org>
Date: Sat, 9 Feb 2019 01:32:42 +0000 (-0800)
Subject: Drop EventRelayerGroup::singleton(), deprecated in 1.27 and unused
X-Git-Tag: 1.34.0-rc.0~2885^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=fb0831d742fcdf29dbb14653d69b55e13a6a23f3;p=lhc%2Fweb%2Fwiklou.git

Drop EventRelayerGroup::singleton(), deprecated in 1.27 and unused

Change-Id: I9e63fc255a575086a6c0934e51e593b5ee0a31d8
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index c07042d263..eb55a88773 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -213,6 +213,8 @@ because of Phabricator reports.
   Instead, use Language->formatSize() with the relevant Language object.
 * Linker::formatTemplates, deprecated in 1.28, has been removed (along with the
   version in DummyLinker). You can use TemplatesOnThisPageFormatter directly.
+* EventRelayerGroup::singleton(), deprecated in 1.27, has been removed. You can
+  use MediaWikiServices::getInstance()->getEventRelayerGroup() directly.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/EventRelayerGroup.php b/includes/EventRelayerGroup.php
index 95d11d99e6..091a5cae68 100644
--- a/includes/EventRelayerGroup.php
+++ b/includes/EventRelayerGroup.php
@@ -18,8 +18,6 @@
  * @file
  */
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * Factory class for spawning EventRelayer objects using configuration
  *
@@ -39,15 +37,6 @@ class EventRelayerGroup {
 		$this->configByChannel = $config;
 	}
 
-	/**
-	 * @deprecated since 1.27 Use MediaWikiServices::getInstance()->getEventRelayerGroup()
-	 * @return EventRelayerGroup
-	 */
-	public static function singleton() {
-		wfDeprecated( __METHOD__, '1.27' );
-		return MediaWikiServices::getInstance()->getEventRelayerGroup();
-	}
-
 	/**
 	 * @param string $channel
 	 * @return EventRelayer Relayer instance that handles the given channel