X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=includes%2FEventRelayerGroup.php;h=9360693a4b8e368635d624a02d2b0dd16a98630b;hb=af6efc3b06d9f1bc6d72baa0b608f0e42d213787;hp=3af756dccbea244ec74059aa7663ad4002969e61;hpb=42fe7284cd78988f745a2f0f6a33e4921699b8dc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EventRelayerGroup.php b/includes/EventRelayerGroup.php
index 3af756dccb..9360693a4b 100644
--- a/includes/EventRelayerGroup.php
+++ b/includes/EventRelayerGroup.php
@@ -1,4 +1,6 @@
 <?php
+use MediaWiki\MediaWikiServices;
+
 /**
  * Factory class for spawning EventRelayer objects using configuration
  *
@@ -7,30 +9,24 @@
  */
 class EventRelayerGroup {
 	/** @var array[] */
-	protected $configByChannel = array();
+	protected $configByChannel = [];
 
 	/** @var EventRelayer[] */
-	protected $relayers = array();
-
-	/** @var EventRelayerGroup */
-	protected static $instance = null;
+	protected $relayers = [];
 
 	/**
-	 * @param Config $config
+	 * @param array[] $config Channel configuration
 	 */
-	protected function __construct( Config $config ) {
-		$this->configByChannel = $config->get( 'EventRelayerConfig' );
+	public function __construct( array $config ) {
+		$this->configByChannel = $config;
 	}
 
 	/**
+	 * @deprecated since 1.27 Use MediaWikiServices::getInstance()->getEventRelayerGroup()
 	 * @return EventRelayerGroup
 	 */
 	public static function singleton() {
-		if ( !self::$instance ) {
-			self::$instance = new self( RequestContext::getMain()->getConfig() );
-		}
-
-		return self::$instance;
+		return MediaWikiServices::getInstance()->getEventRelayerGroup();
 	}
 
 	/**