From 78a7c5745a20a6f4556ba2e31b420305060d04e1 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Fri, 10 Jun 2016 13:10:27 -0700
Subject: [PATCH] registration: Add support for $wgGrantPermissions &
 $wgGrantPermissionGroups

Change-Id: If336aa351ee5dc4dc07f63cfac2a5d236e501718
---
 docs/extension.schema.json                   | 23 ++++++++++++++++++++
 includes/registration/ExtensionProcessor.php |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 1d2b2f0568..1fccf17d28 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -630,6 +630,29 @@
 				}
 			}
 		},
+		"GrantPermissions": {
+			"type": "object",
+			"description": "Map of permissions granted to authorized consumers to their bundles, called 'grants'",
+			"patternProperties": {
+				"^[a-z]+$": {
+					"type": "object",
+					"patternProperties": {
+						"^[a-z]+$": {
+							"type": "boolean"
+						}
+					}
+				}
+			}
+		},
+		"GrantPermissionGroups": {
+			"type": "object",
+			"description": "Map of grants to their UI grouping",
+			"patternProperties": {
+				"^[a-z]+$": {
+					"type": "string"
+				}
+			}
+		},
 		"ImplicitGroups": {
 			"type": "array",
 			"description": "Implicit groups"
diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 78f9370845..2205f9538f 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -15,6 +15,8 @@ class ExtensionProcessor implements Processor {
 		'HiddenPrefs',
 		'GroupPermissions',
 		'RevokePermissions',
+		'GrantPermissions',
+		'GrantPermissionGroups',
 		'ImplicitGroups',
 		'GroupsAddToSelf',
 		'GroupsRemoveFromSelf',
@@ -61,6 +63,7 @@ class ExtensionProcessor implements Processor {
 	protected static $mergeStrategies = [
 		'wgGroupPermissions' => 'array_plus_2d',
 		'wgRevokePermissions' => 'array_plus_2d',
+		'wgGrantPermissions' => 'array_plus_2d',
 		'wgHooks' => 'array_merge_recursive',
 		'wgExtensionCredits' => 'array_merge_recursive',
 		'wgExtraGenderNamespaces' => 'array_plus',
-- 
2.20.1