Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/phpunit/includes/api/MockApiQueryBase.php b/tests/phpunit/includes/api/MockApiQueryBase.php
index 4bede519..f5b50e5a 100644
--- a/tests/phpunit/includes/api/MockApiQueryBase.php
+++ b/tests/phpunit/includes/api/MockApiQueryBase.php
@@ -1,11 +1,15 @@
 <?php
 class MockApiQueryBase extends ApiQueryBase {
+	private $name;
+
 	public function execute() {
 	}
 
-	public function getVersion() {
+	public function __construct( $name = 'mock' ) {
+		$this->name = $name;
 	}
 
-	public function __construct() {
+	public function getModuleName() {
+		return $this->name;
 	}
 }