From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 tests/phpunit/includes/api/ApiTestCase.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'tests/phpunit/includes/api/ApiTestCase.php')

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index cd141947..da62bb0a 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -8,6 +8,11 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	 */
 	protected $apiContext;
 
+	/**
+	 * @var array
+	 */
+	protected $tablesUsed = array( 'user', 'user_groups', 'user_properties' );
+
 	protected function setUp() {
 		global $wgServer;
 
@@ -41,6 +46,17 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		$this->apiContext = new ApiTestContext();
 	}
 
+	protected function tearDown() {
+		// Avoid leaking session over tests
+		if ( session_id() != '' ) {
+			global $wgUser;
+			$wgUser->logout();
+			session_destroy();
+		}
+
+		parent::tearDown();
+	}
+
 	/**
 	 * Edits or creates a page/revision
 	 * @param string $pageName Page title
@@ -100,7 +116,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
 		// construct result
 		$results = array(
-			$module->getResultData(),
+			$module->getResult()->getResultData( null, array( 'Strip' => 'all' ) ),
 			$context->getRequest(),
 			$context->getRequest()->getSessionArray()
 		);
@@ -134,10 +150,14 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		}
 
 		if ( isset( $session['wsToken'] ) && $session['wsToken'] ) {
+			// @todo Why does this directly mess with the session? Fix that.
 			// add edit token to fake session
 			$session['wsEditToken'] = $session['wsToken'];
 			// add token to request parameters
-			$params['token'] = md5( $session['wsToken'] ) . User::EDIT_TOKEN_SUFFIX;
+			$timestamp = wfTimestamp();
+			$params['token'] = hash_hmac( 'md5', $timestamp, $session['wsToken'] ) .
+				dechex( $timestamp ) .
+				User::EDIT_TOKEN_SUFFIX;
 
 			return $this->doApiRequest( $params, $session, false, $user );
 		} else {
-- 
cgit v1.2.2