Merge "Better dependency injection in ListSubscribers"

zbynek · Jan 7, 2017 · e541d7c · e541d7c
2 parents c9b3161 + bd2ac45
commit e541d7c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
@@ -180,12 +180,15 @@
 	$wgAPIListModules['wbsubscribers'] = [
 		'class' => Wikibase\Repo\Api\ListSubscribers::class,
 		'factory' => function( $mainModule, $moduleName, $modulePrefix = 'wbls' ) {
+			/** @var ApiQuery $mainModule */
 			$wikibaseRepo = \Wikibase\Repo\WikibaseRepo::getDefaultInstance();
 			$mediaWikiServices = \MediaWiki\MediaWikiServices::getInstance();
+			$apiHelper = $wikibaseRepo->getApiHelperFactory( $mainModule->getContext() );
 			return new Wikibase\Repo\Api\ListSubscribers(
 				$mainModule,
 				$moduleName,
 				$modulePrefix,
+				$apiHelper->getErrorReporter( $mainModule ),
 				$wikibaseRepo->getEntityIdParser(),
 				$mediaWikiServices->getSiteLookup()
 			);

diff --git a/repo/includes/Api/ListSubscribers.php b/repo/includes/Api/ListSubscribers.php
@@ -11,7 +11,6 @@
 use stdClass;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\Repo\WikibaseRepo;
 
 /**
  * API module for getting wikis subscribed to changes to given entities.
@@ -42,6 +41,7 @@ class ListSubscribers extends ApiQueryBase {
 	 * @param ApiQuery $mainModule
 	 * @param string $moduleName
 	 * @param string $modulePrefix
+	 * @param ApiErrorReporter $errorReporter
 	 * @param EntityIdParser $idParser
 	 * @param SiteLookup $siteLookup
 	 *
@@ -51,14 +51,13 @@ public function __construct(
 		ApiQuery $mainModule,
 		$moduleName,
 		$modulePrefix,
+		ApiErrorReporter $errorReporter,
 		EntityIdParser $idParser,
 		SiteLookup $siteLookup
 	) {
 		parent::__construct( $mainModule, $moduleName, $modulePrefix );
 
-		$wikibaseRepo = WikibaseRepo::getDefaultInstance();
-		$this->errorReporter = $wikibaseRepo->getApiHelperFactory( $this->getContext() )
-			->getErrorReporter( $this );
+		$this->errorReporter = $errorReporter;
 		$this->idParser = $idParser;
 		$this->siteLookup = $siteLookup;
 	}

diff --git a/repo/tests/phpunit/includes/Api/ListSubscribersTest.php b/repo/tests/phpunit/includes/Api/ListSubscribersTest.php
@@ -5,9 +5,10 @@
 use ApiMain;
 use ApiQuery;
 use FauxRequest;
-use MediaWiki\MediaWikiServices;
+use HashSiteStore;
 use MediaWikiLangTestCase;
 use RequestContext;
+use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\Repo\Api\ListSubscribers;
 use Wikibase\Repo\WikibaseRepo;
 
@@ -86,13 +87,18 @@ private function getQueryModule( array $params ) {
 	 */
 	private function callApiModule( array $params ) {
 		$wikibaseRepo = WikibaseRepo::getDefaultInstance();
-		$mediaWikiServices = MediaWikiServices::getInstance();
+		$apiMain = $this->getQueryModule( $params );
+		$errorReporter = $wikibaseRepo->getApiHelperFactory( $apiMain->getContext() )
+			->getErrorReporter( $apiMain );
+		$idParser = new BasicEntityIdParser();
+		$siteLokup = new HashSiteStore();
 		$module = new ListSubscribers(
-			$this->getQueryModule( $params ),
+			$apiMain,
 			'subscribers',
 			'wbls',
-			$wikibaseRepo->getEntityIdParser(),
-			$mediaWikiServices->getSiteLookup()
+			$errorReporter,
+			$idParser,
+			$siteLokup
 		);
 
 		$module->execute();