From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 10 Apr 2018 19:39:45 +0000 (+0000)
Subject: Merge "Refactor ApiTestCase to get token from ApiQueryTokens"
X-Git-Tag: 1.31.0-rc.0~130
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=79aa5a3fe4946959a03f931451f80a629ef94bbd;p=lhc%2Fweb%2Fwiklou.git

Merge "Refactor ApiTestCase to get token from ApiQueryTokens"
---

79aa5a3fe4946959a03f931451f80a629ef94bbd
diff --cc tests/phpunit/includes/api/ApiTestCase.php
index 7ecb7299eb,8e53b55940..d5078bff2e
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@@ -67,8 -69,9 +69,10 @@@ abstract class ApiTestCase extends Medi
  	 * @param array|null $session
  	 * @param bool $appendModule
  	 * @param User|null $user
+ 	 * @param string|null $tokenType Set to a string like 'csrf' to send an
+ 	 *   appropriate token
  	 *
 +	 * @throws ApiUsageException
  	 * @return array
  	 */
  	protected function doApiRequest( array $params, array $session = null,