X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEventRelayerGroup.php;h=18b1cd3f51d8dcf436127fcc94f6c82c0557d50a;hb=387bfb4f8e82fd94d1e43016ea2c6e54062dd169;hp=9dfac795a6a4ce59c1cb97363ad24bacb897e200;hpb=734ca2b4d2a1246fb0ea1e54b861ab423ab5e257;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EventRelayerGroup.php b/includes/EventRelayerGroup.php
index 9dfac795a6..18b1cd3f51 100644
--- a/includes/EventRelayerGroup.php
+++ b/includes/EventRelayerGroup.php
@@ -1,8 +1,28 @@
 <?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+use MediaWiki\MediaWikiServices;
+
 /**
  * Factory class for spawning EventRelayer objects using configuration
  *
- * @author Aaron Schulz
  * @since 1.27
  */
 class EventRelayerGroup {
@@ -12,25 +32,19 @@ class EventRelayerGroup {
 	/** @var EventRelayer[] */
 	protected $relayers = [];
 
-	/** @var EventRelayerGroup */
-	protected static $instance = null;
-
 	/**
-	 * @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();
 	}
 
 	/**