From 980e67d338b6ecdf02e94dca0c31d0997ca240bf Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Sun, 19 May 2019 13:14:05 +0200
Subject: [PATCH] build: Upgrade mediawiki/mediawiki-phan-config from 0.5.0 to
 0.6.0 and make pass

Change-Id: Ifc83427ccdcfc34d33a667ffde5e0cec98a0a609
---
 composer.json                 | 2 +-
 includes/api/ApiCrossWiki.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 9231db727..b8be2a73b 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 		"mediawiki/mediawiki-codesniffer": "24.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.1",
-		"mediawiki/mediawiki-phan-config": "0.5.0"
+		"mediawiki/mediawiki-phan-config": "0.6.0"
 	},
 	"scripts": {
 		"test": [
diff --git a/includes/api/ApiCrossWiki.php b/includes/api/ApiCrossWiki.php
index c96205139..4c9171cbf 100644
--- a/includes/api/ApiCrossWiki.php
+++ b/includes/api/ApiCrossWiki.php
@@ -32,7 +32,7 @@ trait ApiCrossWiki {
 		$foreignReq = new EchoForeignWikiRequest(
 			$this->getUser(),
 			$paramOverrides + $this->getForeignQueryParams(),
-			$wikis !== null ? $wikis : $this->getRequestedForeignWikis(),
+			$wikis,
 			$this->getModulePrefix() . 'wikis',
 			$tokenType !== false ? $tokenType : null
 		);