[MediaWiki-commits] [Gerrit] registration: Add support for $wgGrantPermissions & $wgGrant... - change (mediawiki/core)

2016-06-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: registration: Add support for $wgGrantPermissions & 
$wgGrantPermissionGroups
..


registration: Add support for $wgGrantPermissions & $wgGrantPermissionGroups

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

Approvals:
  Anomie: Looks good to me, but someone else must approve
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 1d2b2f0..1fccf17 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 78f9370..2205f95 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -15,6 +15,8 @@
'HiddenPrefs',
'GroupPermissions',
'RevokePermissions',
+   'GrantPermissions',
+   'GrantPermissionGroups',
'ImplicitGroups',
'GroupsAddToSelf',
'GroupsRemoveFromSelf',
@@ -61,6 +63,7 @@
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',

-- 
To view, visit https://gerrit.wikimedia.org/r/293806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If336aa351ee5dc4dc07f63cfac2a5d236e501718
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] registration: Add support for $wgGrantPermissions & $wgGrant... - change (mediawiki/core)

2016-06-10 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293806

Change subject: registration: Add support for $wgGrantPermissions & 
$wgGrantPermissionGroups
..

registration: Add support for $wgGrantPermissions & $wgGrantPermissionGroups

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/293806/1

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 1d2b2f0..1fccf17 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 78f9370..2205f95 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -15,6 +15,8 @@
'HiddenPrefs',
'GroupPermissions',
'RevokePermissions',
+   'GrantPermissions',
+   'GrantPermissionGroups',
'ImplicitGroups',
'GroupsAddToSelf',
'GroupsRemoveFromSelf',
@@ -61,6 +63,7 @@
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',

-- 
To view, visit https://gerrit.wikimedia.org/r/293806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If336aa351ee5dc4dc07f63cfac2a5d236e501718
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits