From: Tim Starling <tstarling@wikimedia.org>
Date: Mon, 18 May 2020 04:18:14 +0000 (+1000)
Subject: Backport docs/extension.schema.v2.json fixes
X-Git-Tag: 1.34.2~10
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=7ac10d4b6b1f04715a737964c4fd0202d4ebbc39

Backport docs/extension.schema.v2.json fixes

* Fix the type of "Hooks" to not accept string (it never would've
  worked)
* Fixed the lack of "services" from RestRoutes ObjectFactory specs,
  since RestRoutes and HookHandlers is supposed to be the same.

Bug: T240307
Change-Id: I1a8657ff9fd14618c6709dbab62c3b4ee9f659a5
---

diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index 56d274bbc4..35e557081f 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -726,7 +726,7 @@
 			"type": "object"
 		},
 		"Hooks": {
-			"type": [ "string", "object" ],
+			"type": "object",
 			"description": "Hooks this extension uses (mapping of hook name to callback)"
 		},
 		"JobClasses": {
@@ -950,6 +950,10 @@
 					"args": {
 						"type": "array",
 						"description": "The arguments passed to the handler constructor or factory"
+					},
+					"services": {
+						"type": "array",
+						"description": "If supplied and non-empty, the named services are requested from the service container and prepended before 'args'."
 					}
 				}
 			}