Merge "registration: Support Change/RemoveCredentialsBlacklist in extension.json"

diff --combined docs/extension.schema.json
index 1fccf17,4eb3135..c69cbe3
--- 1/docs/extension.schema.json
--- 2/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@@ -535,6 -535,14 +535,14 @@@
                        "type": "object",
                        "description": "Central ID lookup providers"
                },
+               "ChangeCredentialsBlacklist": {
+                       "type": "object",
+                       "description": "AuthenticationRequest classes which can only be used internally for credentials change"
+               },
+               "RemoveCredentialsBlacklist": {
+                       "type": "object",
+                       "description": "AuthenticationRequest classes which can only be used internally for credentials removal"
+               },
                "namespaces": {
                        "type": "array",
                        "description": "Method to add extra namespaces",
@@@ -630,29 -638,6 +638,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 --combined includes/registration/ExtensionProcessor.php
index 2205f95,ac9b526..f1f7c2e
--- 1/includes/registration/ExtensionProcessor.php
--- 2/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@@ -15,8 -15,6 +15,8 @@@ class ExtensionProcessor implements Pro
                'HiddenPrefs',
                'GroupPermissions',
                'RevokePermissions',
 +              'GrantPermissions',
 +              'GrantPermissionGroups',
                'ImplicitGroups',
                'GroupsAddToSelf',
                'GroupsRemoveFromSelf',
@@@ -28,6 -26,8 +28,8 @@@
                'SessionProviders',
                'AuthManagerAutoConfig',
                'CentralIdLookupProviders',
+               'ChangeCredentialsBlacklist',
+               'RemoveCredentialsBlacklist',
                'RateLimits',
                'RecentChangesFlags',
                'MediaHandlers',
@@@ -63,7 -63,6 +65,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',