wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-11-23 15:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use HookHandlers for core hooks

Browse source 
Bug: T269882
Change-Id: I91df459f696e99bb5cce597739b48cbebbf4a88e
This commit is contained in:
Umherirrender 2023-08-15 12:11:58 +02:00
parent 5740fcf8c4
commit 0b0f9e37af
4 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ReCaptchaNoCaptcha/extension.json
View file

@ -43,8 +43,13 @@
]
}
},
"HookHandlers": {
"ReCaptchaHooks": {
"class": "MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\Hooks"
}
},
"Hooks": {
"ResourceLoaderGetConfigVars": "MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\Hooks::onResourceLoaderGetConfigVars"
"ResourceLoaderGetConfigVars": "ReCaptchaHooks"
},
"attributes": {
"VisualEditor": {

12
ReCaptchaNoCaptcha/includes/Hooks.php
View file

@ -2,14 +2,18 @@
namespace MediaWiki\Extension\ConfirmEdit\ReCaptchaNoCaptcha;
class Hooks {
use Config;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook;
class Hooks implements ResourceLoaderGetConfigVarsHook {
/**
* Adds extra variables to the global config
*
* @param array &$vars Global variables object
* @return bool Always true
* @param string $skin
* @param Config $config
*/
public static function onResourceLoaderGetConfigVars( array &$vars ) {
public function onResourceLoaderGetConfigVars( array &$vars, $skin, Config $config ): void {
global $wgReCaptchaSiteKey;
global $wgCaptchaClass;
@ -19,7 +23,5 @@ class Hooks {
'reCaptchaScriptURL' => 'https://www.recaptcha.net/recaptcha/api.js'
];
}
return true;
}
}

8
extension.json
View file

@ -105,10 +105,10 @@
"TitleReadWhitelist": "ConfirmEditHooks",
"AlternateEditPreview": "ConfirmEditHooks",
"ResourceLoaderRegisterModules": "ConfirmEditHooks",
"EditPage::showEditForm:fields": "MediaWiki\\Extension\\ConfirmEdit\\Hooks::showEditFormFields",
"EditFilterMergedContent": "MediaWiki\\Extension\\ConfirmEdit\\Hooks::confirmEditMerged",
"APIGetAllowedParams": "MediaWiki\\Extension\\ConfirmEdit\\Hooks::onAPIGetAllowedParams",
"AuthChangeFormFields": "MediaWiki\\Extension\\ConfirmEdit\\Hooks::onAuthChangeFormFields"
"EditPage::showEditForm:fields": "ConfirmEditHooks",
"EditFilterMergedContent": "ConfirmEditHooks",
"APIGetAllowedParams": "ConfirmEditHooks",
"AuthChangeFormFields": "ConfirmEditHooks"
},
"AuthManagerAutoConfig": {
"preauth": {

24
includes/Hooks.php
View file

@ -1,5 +1,7 @@
<?php
// phpcs:disable MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
namespace MediaWiki\Extension\ConfirmEdit;
use ApiBase;
@ -9,9 +11,12 @@ use Html;
use HTMLForm;
use IContextSource;
use MailAddress;
use MediaWiki\Api\Hook\APIGetAllowedParamsHook;
use MediaWiki\EditPage\EditPage;
use MediaWiki\Extension\ConfirmEdit\SimpleCaptcha\SimpleCaptcha;
use MediaWiki\Hook\AlternateEditPreviewHook;
use MediaWiki\Hook\EditFilterMergedContentHook;
use MediaWiki\Hook\EditPage__showEditForm_fieldsHook;
use MediaWiki\Hook\EditPageBeforeEditButtonsHook;
use MediaWiki\Hook\EmailUserFormHook;
use MediaWiki\Hook\EmailUserHook;
@ -20,6 +25,7 @@ use MediaWiki\Permissions\Hook\TitleReadWhitelistHook;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\SpecialPage\Hook\AuthChangeFormFieldsHook;
use MediaWiki\Storage\EditResult;
use MediaWiki\Storage\Hook\PageSaveCompleteHook;
use MediaWiki\User\UserIdentity;
@ -40,7 +46,11 @@ class Hooks implements
EmailUserHook,
TitleReadWhitelistHook,
ResourceLoaderRegisterModulesHook,
PageSaveCompleteHook
PageSaveCompleteHook,
EditPage__showEditForm_fieldsHook,
EditFilterMergedContentHook,
APIGetAllowedParamsHook,
AuthChangeFormFieldsHook
{
protected static $instanceCreated = false;
@ -71,8 +81,8 @@ class Hooks implements
* @param bool $minorEdit
* @return bool
*/
public static function confirmEditMerged( $context, $content, $status, $summary, $user,
$minorEdit
public function onEditFilterMergedContent( IContextSource $context, Content $content, Status $status,
$summary, User $user, $minorEdit
) {
return self::getInstance()->confirmEditMerged( $context, $content, $status, $summary,
$user, $minorEdit );
@ -121,7 +131,7 @@ class Hooks implements
* @param EditPage $editPage
* @param OutputPage $out
*/
public static function showEditFormFields( EditPage $editPage, OutputPage $out ) {
public function onEditPage__showEditForm_fields( $editPage, $out ) {
self::getInstance()->showEditFormFields( $editPage, $out );
}
@ -158,7 +168,7 @@ class Hooks implements
* @param int $flags
* @return bool
*/
public static function onAPIGetAllowedParams( ApiBase $module, &$params, $flags = 1 ) {
public function onAPIGetAllowedParams( $module, &$params, $flags ) {
return self::getInstance()->apiGetAllowedParams( $module, $params, $flags );
}
@ -168,8 +178,8 @@ class Hooks implements
* @param array &$formDescriptor
* @param string $action
*/
public static function onAuthChangeFormFields(
array $requests, array $fieldInfo, array &$formDescriptor, $action
public function onAuthChangeFormFields(
$requests, $fieldInfo, &$formDescriptor, $action
) {
self::getInstance()->onAuthChangeFormFields( $requests, $fieldInfo, $formDescriptor, $action );
}