From: James D. Forrester <jforrester@wikimedia.org>
Date: Wed, 20 Feb 2019 12:55:51 +0000 (+0000)
Subject: resourceloader: Tolerate string as deps for test suites
X-Git-Tag: 1.34.0-rc.0~2775^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=7545ee16c49550b2b804baa37b283a075b59bfe9;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Tolerate string as deps for test suites

Change-Id: I53a5fd0f3716e50abd10e4cae1de6329e7b0f6e8
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 1a232583f6..415808212d 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -423,6 +423,11 @@ class ResourceLoader implements LoggerAwareInterface {
 
 		// Add the QUnit testrunner as implicit dependency to extension test suites.
 		foreach ( $testModules['qunit'] as &$module ) {
+			// Shuck any single-module dependency as an array
+			if ( is_string( $module['dependencies'] ) ) {
+				$module['dependencies'] = [ $module['dependencies'] ];
+			}
+
 			$module['dependencies'][] = 'test.mediawiki.qunit.testrunner';
 		}