[MediaWiki-commits] [Gerrit] mediawiki...GoogleLogin[master]: Use PSR-4 autoloader of extension registration for class loa...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401197 ) Change subject: Use PSR-4 autoloader of extension registration for class loading .. Use PSR-4 autoloader of extension registration for class loading This became available in MediaWiki 1.31 and removes the requirement of maintaining a class names to file map in extension.json, as long as the classes are placed according to their name and namespace. Change-Id: I1a50eb8e24e7253ad31b7e0962186707431ddf6e --- M extension.json R includes/AllowedDomains/AllowedDomainsStore.php R includes/AllowedDomains/ArrayAllowedDomainsStore.php R includes/AllowedDomains/CachedAllowedDomainsStore.php R includes/AllowedDomains/DBAllowedDomainsStore.php R includes/AllowedDomains/EmailDomain.php R includes/AllowedDomains/MutableAllowedDomainsStore.php R includes/Api/ApiGoogleLoginInfo.php R includes/Api/ApiGoogleLoginManageAllowedDomains.php R includes/Auth/GoogleAuthenticationRequest.php R includes/Auth/GooglePrimaryAuthenticationProvider.php R includes/Auth/GoogleRemoveAuthenticationRequest.php R includes/Auth/GoogleServerAuthenticationRequest.php R includes/Auth/GoogleUserInfoAuthenticationRequest.php M includes/Constants.php M includes/EchoGoogleLoginPresentationModel.php R includes/GoogleLogin.php R includes/GoogleLoginHooks.php R includes/HtmlForm/HTMLGoogleLoginButtonField.php R includes/Specials/SpecialGoogleLogin.php R includes/Specials/SpecialGoogleLoginAllowedDomains.php R includes/Specials/SpecialGoogleLoginReturn.php R includes/Specials/SpecialManageGoogleLogin.php 23 files changed, 13 insertions(+), 34 deletions(-) Approvals: Umherirrender: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index f23cbdd..c1a6ddb 100644 --- a/extension.json +++ b/extension.json @@ -12,7 +12,7 @@ } }, "requires": { - "MediaWiki": ">= 1.28.0" + "MediaWiki": ">= 1.31.0" }, "AvailableRights": [ "managegooglelogin", @@ -32,7 +32,7 @@ "echo-subscriptions-email-change-googlelogin": true }, "APIModules": { - "googleplusprofileinfo": "ApiGoogleLoginInfo", + "googleplusprofileinfo": "GoogleLogin\\Api\\ApiGoogleLoginInfo", "googleloginmanagealloweddomain": "GoogleLogin\\Api\\ApiGoogleLoginManageAllowedDomains" }, "MessagesDirs": { @@ -43,30 +43,8 @@ "ExtensionMessagesFiles": { "GoogleLoginAlias": "GoogleLogin.alias.php" }, - "AutoloadClasses": { - "GoogleLogin\\GoogleLogin": "includes/GoogleLogin.body.php", - "GoogleLogin\\EchoGoogleLoginPresentationModel": "includes/EchoGoogleLoginPresentationModel.php", - "GoogleLogin\\HTMLGoogleLoginButtonField": "includes/htmlform/HTMLGoogleLoginButtonField.php", - "GoogleLogin\\Specials\\SpecialGoogleLogin": "includes/specials/SpecialGoogleLogin.php", - "GoogleLogin\\Specials\\SpecialGoogleLoginReturn": "includes/specials/SpecialGoogleLoginReturn.php", - "GoogleLogin\\Specials\\SpecialManageGoogleLogin": "includes/specials/SpecialManageGoogleLogin.php", - "GoogleLogin\\Specials\\SpecialGoogleLoginAllowedDomains": "includes/specials/SpecialGoogleLoginAllowedDomains.php", - "GoogleLogin\\GoogleLoginHooks": "includes/GoogleLogin.hooks.php", - "GoogleLogin\\GoogleUser": "includes/GoogleUser.php", - "GoogleLogin\\Constants": "includes/Constants.php", - "GoogleLogin\\Auth\\GooglePrimaryAuthenticationProvider": "includes/auth/GooglePrimaryAuthenticationProvider.php", - "GoogleLogin\\Auth\\GoogleServerAuthenticationRequest": "includes/auth/GoogleServerAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleAuthenticationRequest": "includes/auth/GoogleAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleRemoveAuthenticationRequest": "includes/auth/GoogleRemoveAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleUserInfoAuthenticationRequest": "includes/auth/GoogleUserInfoAuthenticationRequest.php", - "GoogleLogin\\AllowedDomains\\AllowedDomainsStore": "includes/alloweddomains/AllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\MutableAllowedDomainsStore": "includes/alloweddomains/MutableAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\ArrayAllowedDomainsStore": "includes/alloweddomains/ArrayAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\DBAllowedDomainsStore": "includes/alloweddomains/DBAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\CachedAllowedDomainsStore":
[MediaWiki-commits] [Gerrit] mediawiki...GoogleLogin[master]: Use PSR-4 autoloader of extension registration for class loa...
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401197 ) Change subject: Use PSR-4 autoloader of extension registration for class loading .. Use PSR-4 autoloader of extension registration for class loading This became available in MediaWiki 1.31 and removes the requirement of maintaining a class names to file map in extension.json, as long as the classes are placed according to their name and namespace. Change-Id: I1a50eb8e24e7253ad31b7e0962186707431ddf6e --- M extension.json R includes/AllowedDomains/AllowedDomainsStore.php R includes/AllowedDomains/ArrayAllowedDomainsStore.php R includes/AllowedDomains/CachedAllowedDomainsStore.php R includes/AllowedDomains/DBAllowedDomainsStore.php R includes/AllowedDomains/EmailDomain.php R includes/AllowedDomains/MutableAllowedDomainsStore.php R includes/Api/ApiGoogleLoginInfo.php R includes/Api/ApiGoogleLoginManageAllowedDomains.php R includes/Auth/GoogleAuthenticationRequest.php R includes/Auth/GooglePrimaryAuthenticationProvider.php R includes/Auth/GoogleRemoveAuthenticationRequest.php R includes/Auth/GoogleServerAuthenticationRequest.php R includes/Auth/GoogleUserInfoAuthenticationRequest.php M includes/Constants.php M includes/EchoGoogleLoginPresentationModel.php R includes/GoogleLogin.php R includes/GoogleLoginHooks.php R includes/HtmlForm/HTMLGoogleLoginButtonField.php R includes/Specials/SpecialGoogleLogin.php R includes/Specials/SpecialGoogleLoginAllowedDomains.php R includes/Specials/SpecialGoogleLoginReturn.php R includes/Specials/SpecialManageGoogleLogin.php 23 files changed, 13 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin refs/changes/97/401197/1 diff --git a/extension.json b/extension.json index f23cbdd..c1a6ddb 100644 --- a/extension.json +++ b/extension.json @@ -12,7 +12,7 @@ } }, "requires": { - "MediaWiki": ">= 1.28.0" + "MediaWiki": ">= 1.31.0" }, "AvailableRights": [ "managegooglelogin", @@ -32,7 +32,7 @@ "echo-subscriptions-email-change-googlelogin": true }, "APIModules": { - "googleplusprofileinfo": "ApiGoogleLoginInfo", + "googleplusprofileinfo": "GoogleLogin\\Api\\ApiGoogleLoginInfo", "googleloginmanagealloweddomain": "GoogleLogin\\Api\\ApiGoogleLoginManageAllowedDomains" }, "MessagesDirs": { @@ -43,30 +43,8 @@ "ExtensionMessagesFiles": { "GoogleLoginAlias": "GoogleLogin.alias.php" }, - "AutoloadClasses": { - "GoogleLogin\\GoogleLogin": "includes/GoogleLogin.body.php", - "GoogleLogin\\EchoGoogleLoginPresentationModel": "includes/EchoGoogleLoginPresentationModel.php", - "GoogleLogin\\HTMLGoogleLoginButtonField": "includes/htmlform/HTMLGoogleLoginButtonField.php", - "GoogleLogin\\Specials\\SpecialGoogleLogin": "includes/specials/SpecialGoogleLogin.php", - "GoogleLogin\\Specials\\SpecialGoogleLoginReturn": "includes/specials/SpecialGoogleLoginReturn.php", - "GoogleLogin\\Specials\\SpecialManageGoogleLogin": "includes/specials/SpecialManageGoogleLogin.php", - "GoogleLogin\\Specials\\SpecialGoogleLoginAllowedDomains": "includes/specials/SpecialGoogleLoginAllowedDomains.php", - "GoogleLogin\\GoogleLoginHooks": "includes/GoogleLogin.hooks.php", - "GoogleLogin\\GoogleUser": "includes/GoogleUser.php", - "GoogleLogin\\Constants": "includes/Constants.php", - "GoogleLogin\\Auth\\GooglePrimaryAuthenticationProvider": "includes/auth/GooglePrimaryAuthenticationProvider.php", - "GoogleLogin\\Auth\\GoogleServerAuthenticationRequest": "includes/auth/GoogleServerAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleAuthenticationRequest": "includes/auth/GoogleAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleRemoveAuthenticationRequest": "includes/auth/GoogleRemoveAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleUserInfoAuthenticationRequest": "includes/auth/GoogleUserInfoAuthenticationRequest.php", - "GoogleLogin\\AllowedDomains\\AllowedDomainsStore": "includes/alloweddomains/AllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\MutableAllowedDomainsStore": "includes/alloweddomains/MutableAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\ArrayAllowedDomainsStore": "includes/alloweddomains/ArrayAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\DBAllowedDomainsStore": "includes/alloweddomains/DBAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\CachedAllowedDomainsStore": "includes/alloweddomains/CachedAllowedDomainsStore.php", -