From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Tue, 28 Jun 2016 15:16:38 +0000 (-0400)
Subject: API: Some raw message cleanup
X-Git-Tag: 1.31.0-rc.0~5867^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=a6d6f2ee38a0dc8d90b06e93fd07ca8119d790e1;p=lhc%2Fweb%2Fwiklou.git

API: Some raw message cleanup

* Set an indexed tag name in ApiParamInfo and ApiAuthManagerHelper.
* Use 'key' instead of 'message' for the (not yet used) non-BC
  ApiErrorFormatter.

Change-Id: I07f0a690e263b34e09210673241af8bf750cbd1b
---

diff --git a/includes/api/ApiAuthManagerHelper.php b/includes/api/ApiAuthManagerHelper.php
index a4f54ee6d8..8e57f93a08 100644
--- a/includes/api/ApiAuthManagerHelper.php
+++ b/includes/api/ApiAuthManagerHelper.php
@@ -85,6 +85,7 @@ class ApiAuthManagerHelper {
 					'key' => $message->getKey(),
 					'params' => $message->getParams(),
 				];
+				ApiResult::setIndexedTagName( $res[$key]['params'], 'param' );
 				break;
 		}
 	}
diff --git a/includes/api/ApiErrorFormatter.php b/includes/api/ApiErrorFormatter.php
index c19926a6fd..6d9184f781 100644
--- a/includes/api/ApiErrorFormatter.php
+++ b/includes/api/ApiErrorFormatter.php
@@ -202,7 +202,7 @@ class ApiErrorFormatter {
 
 			case 'raw':
 				$value += [
-					'message' => $msg->getKey(),
+					'key' => $msg->getKey(),
 					'params' => $msg->getParams(),
 				];
 				ApiResult::setIndexedTagName( $value['params'], 'param' );
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index c3c9e2176c..25e1a7f8e1 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -162,6 +162,7 @@ class ApiParamInfo extends ApiBase {
 						'key' => $m->getKey(),
 						'params' => $m->getParams(),
 					];
+					ApiResult::setIndexedTagName( $a['params'], 'param' );
 					if ( $m instanceof ApiHelpParamValueMessage ) {
 						$a['forvalue'] = $m->getParamValue();
 					}
diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
index 18da5afd64..d13b00be2e 100644
--- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php
+++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
@@ -132,7 +132,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'err' => [
 							[
 								'code' => 'mainpage',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ]
 							],
 							$I => 'error',
@@ -142,7 +142,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'string' => [
 							[
 								'code' => 'mainpage',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ]
 							],
 							$I => 'warning',
@@ -154,7 +154,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'errWithData' => [
 							[
 								'code' => 'overriddenCode',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ],
 								'overriddenData' => true
 							],
@@ -165,7 +165,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'messageWithData' => [
 							[
 								'code' => 'overriddenCode',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ],
 								'overriddenData' => true
 							],
@@ -174,7 +174,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'message' => [
 							[
 								'code' => 'mainpage',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ]
 							],
 							$I => 'warning',
@@ -182,12 +182,12 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'foo' => [
 							[
 								'code' => 'mainpage',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ]
 							],
 							[
 								'code' => 'parentheses',
-								'message' => 'parentheses',
+								'key' => 'parentheses',
 								'params' => [ 'foobar', $I => 'param' ]
 							],
 							$I => 'warning',
@@ -199,12 +199,12 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'status' => [
 							[
 								'code' => 'mainpage',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ]
 							],
 							[
 								'code' => 'parentheses',
-								'message' => 'parentheses',
+								'key' => 'parentheses',
 								'params' => [ 'foobar', $I => 'param' ]
 							],
 							$I => 'error',
@@ -214,17 +214,17 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 						'status' => [
 							[
 								'code' => 'mainpage',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ]
 							],
 							[
 								'code' => 'parentheses',
-								'message' => 'parentheses',
+								'key' => 'parentheses',
 								'params' => [ 'foobar', $I => 'param' ]
 							],
 							[
 								'code' => 'overriddenCode',
-								'message' => 'mainpage',
+								'key' => 'mainpage',
 								'params' => [ $I => 'param' ],
 								'overriddenData' => true
 							],