From: Umherirrender <umherirrender_de.wp@web.de>
Date: Mon, 30 Jan 2017 17:51:16 +0000 (+0100)
Subject: registration: Allow properties in "requires" from v2
X-Git-Tag: 1.31.0-rc.0~4185^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=0872063d71e45c89874356b9a487d5ed72b47794;p=lhc%2Fweb%2Fwiklou.git

registration: Allow properties in "requires" from v2

v2 of the schema allows extensions and skins to be definied under
"requires". This is also used by some extensions in extension.json for
v1.
It works, so allow the same properties in v1 as in v2.

Change-Id: I9b5f1986cadbd714d6f3460ac3e1db3bf7aae65d
---

diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index 421ea5c732..3d6eda9ad9 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -55,11 +55,20 @@
 		},
 		"requires": {
 			"type": "object",
-			"description": "Indicates what versions of MediaWiki core are required. This syntax may be extended in the future, for example to check dependencies between other extensions.",
+			"description": "Indicates what versions of MediaWiki core or extensions are required. This syntax may be extended in the future, for example to check dependencies between other services.",
+			"additionalProperties": false,
 			"properties": {
 				"MediaWiki": {
 					"type": "string",
 					"description": "Version constraint string against MediaWiki core."
+				},
+				"extensions": {
+					"type": "object",
+					"description": "Set of version constraint strings against specific extensions."
+				},
+				"skins": {
+					"type": "object",
+					"description": "Set of version constraint strings against specific skins."
 				}
 			}
 		},