jenkins-bot has submitted this change and it was merged.

Change subject: Convert to globals and add composer support
......................................................................


Convert to globals and add composer support

Bug: T86476
Change-Id: I262180f9d658b06d72a67325e3d152ae6f8ac956
---
M ConfirmAccount.php
A composer.json
2 files changed, 34 insertions(+), 7 deletions(-)

Approvals:
  MarkAHershberger: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ConfirmAccount.php b/ConfirmAccount.php
index 608ef35..085bed1 100644
--- a/ConfirmAccount.php
+++ b/ConfirmAccount.php
@@ -23,7 +23,7 @@
        exit( 1 ) ;
 }
 
-$wgExtensionCredits['specialpage'][] = array(
+$GLOBALS['wgExtensionCredits']['specialpage'][] = array(
        'path'           => __FILE__,
        'name'           => 'Confirm User Accounts',
        'descriptionmsg' => 'confirmedit-desc',
@@ -42,9 +42,9 @@
 ConfirmAccountUISetup::defineResourceModules( $wgResourceModules );
 
 # Let some users confirm account requests and view credentials for created 
accounts
-$wgAvailableRights[] = 'confirmaccount'; // user can confirm account requests
-$wgAvailableRights[] = 'requestips'; // user can see IPs in request queue
-$wgAvailableRights[] = 'lookupcredentials'; // user can lookup info on 
confirmed users
+$GLOBALS['wgAvailableRights'][] = 'confirmaccount'; // user can confirm 
account requests
+$GLOBALS['wgAvailableRights'][] = 'requestips'; // user can see IPs in request 
queue
+$GLOBALS['wgAvailableRights'][] = 'lookupcredentials'; // user can lookup info 
on confirmed users
 
 # Actually register special pages
 ConfirmAccountUISetup::defineSpecialPages( $wgSpecialPages, 
$wgSpecialPageGroups );
@@ -55,15 +55,15 @@
 ConfirmAccountUISetup::defineHookHandlers( $wgHooks );
 
 # Check for account name collisions
-$wgHooks['AbortNewAccount'][] = 
'ConfirmAccountUIHooks::checkIfAccountNameIsPending';
+$GLOBALS['wgHooks']['AbortNewAccount'][] = 
'ConfirmAccountUIHooks::checkIfAccountNameIsPending';
 
 # Schema changes
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'ConfirmAccountUpdaterHooks::addSchemaUpdates';
+$GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] = 
'ConfirmAccountUpdaterHooks::addSchemaUpdates';
 
 # ####### END HOOK CALLBACK FUNCTIONS #########
 
 # Load the extension after setup is finished
-$wgExtensionFunctions[] = 'efLoadConfirmAccount';
+$GLOBALS['wgExtensionFunctions'][] = 'efLoadConfirmAccount';
 
 /**
  * This function is for setup that has to happen in Setup.php
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..0bb8b34
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+       "name"       : "mediawiki/confirmaccount",
+       "type"       : "mediawiki-extension",
+       "description": "Gives bureaucrats the ability to confirm account 
requests",
+       "keywords"   : [
+               "wiki",
+               "MediaWiki",
+               "extension"
+       ],
+       "homepage"   : 
"https://www.mediawiki.org/wiki/Extension:ConfirmAccount";,
+       "authors"    : [
+               {
+                       "name" : "Aaron Schulz"
+               }
+       ],
+       "support"    : {
+               "wiki"  : 
"https://www.mediawiki.org/wiki/Extension:ConfirmAccount";,
+               "forum" : 
"https://www.mediawiki.org/wiki/Extension_talk:ConfirmAccount";,
+               "source": 
"https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FConfirmAccount";,
+               "issues": 
"https://www.mediawiki.org/wiki/Extension_talk:ConfirmAccount";,
+               "irc"   : "irc://irc.freenode.org/mediawiki"
+       },
+       "require"    : {
+               "php"                : ">=5.3.0",
+               "composer/installers": "1.*,>=1.0.1"
+       }
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I262180f9d658b06d72a67325e3d152ae6f8ac956
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to