From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 5 Aug 2017 22:07:59 +0000 (+0000)
Subject: Merge "Fix and make some types in PHPDoc and JSDoc tags more specific"
X-Git-Tag: 1.31.0-rc.0~2455
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=fb79f30319b9ad2a7eb0f5f4d1668143ec8f963e

Merge "Fix and make some types in PHPDoc and JSDoc tags more specific"
---

fb79f30319b9ad2a7eb0f5f4d1668143ec8f963e
diff --cc includes/api/ApiBase.php
index 034d24360f,44a2280087..500f4324df
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@@ -2860,10 -2857,9 +2860,10 @@@ abstract class ApiBase extends ContextS
  	 * Return the error message related to a certain array
  	 * @deprecated since 1.29
  	 * @param array|string|MessageSpecifier $error Element of a getUserPermissionsErrors()-style array
- 	 * @return [ 'code' => code, 'info' => info ]
+ 	 * @return array [ 'code' => code, 'info' => info ]
  	 */
  	public function parseMsg( $error ) {
 +		wfDeprecated( __METHOD__, '1.29' );
  		// Check whether someone passed the whole array, instead of one element as
  		// documented. This breaks if it's actually an array of fallback keys, but
  		// that's long-standing misbehavior introduced in r87627 to incorrectly