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

Merge "Attempt to flatten out PHP files in sub extensions"

Browse source
This commit is contained in:
jenkins-bot 2024-11-02 15:58:57 +00:00 committed by Gerrit Code Review
parent a1ddb3bd85 9f2e976f10
commit ce6f151791
39 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.phan/config.php
View file

@ -5,11 +5,6 @@ $cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.
$cfg['directory_list'] = array_merge(
$cfg['directory_list'],
[
'FancyCaptcha/',
'hCaptcha/',
'QuestyCaptcha/',
'ReCaptchaNoCaptcha/',
'SimpleCaptcha/',
'../../extensions/AbuseFilter',
]
);

8
FancyCaptcha/extension.json
View file

@ -18,11 +18,11 @@
]
},
"AutoloadClasses": {
"FancyCaptcha": "includes/FancyCaptcha.php",
"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\FancyCaptcha": "includes/FancyCaptcha.php"
"FancyCaptcha": "../includes/FancyCaptcha/FancyCaptcha.php",
"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\FancyCaptcha": "../includes/FancyCaptcha/FancyCaptcha.php"
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\": "includes/"
"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\": "../includes/FancyCaptcha/"
},
"ResourceModules": {
"ext.confirmEdit.fancyCaptcha.styles": {
@ -38,7 +38,7 @@
},
"ResourceFileModulePaths": {
"localBasePath": "resources",
"remoteExtPath": "ConfirmEdit/FancyCaptcha/resources"
"remoteExtPath": "ConfirmEdit/resources"
},
"callback": "MediaWiki\\Extension\\ConfirmEdit\\Hooks::onFancyCaptchaSetup",
"config": {

6
QuestyCaptcha/extension.json
View file

@ -13,11 +13,11 @@
]
},
"AutoloadClasses": {
"QuestyCaptcha": "includes/QuestyCaptcha.php",
"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha": "includes/QuestyCaptcha.php"
"QuestyCaptcha": "../includes/QuestyCaptcha/QuestyCaptcha.php",
"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha": "../includes/QuestyCaptcha/QuestyCaptcha.php"
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\": "includes/"
"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\": "../includes/QuestyCaptcha/"
},
"config": {
"CaptchaClass": {

4
ReCaptchaNoCaptcha/extension.json
View file

@ -14,7 +14,7 @@
]
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\": "includes/"
"MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\": "../includes/ReCaptchaNoCaptcha/"
},
"config": {
"CaptchaClass": {
@ -32,7 +32,7 @@
},
"ResourceFileModulePaths": {
"localBasePath": "resources",
"remoteExtPath": "ConfirmEdit/ReCaptchaNoCaptcha/resources"
"remoteExtPath": "ConfirmEdit/resources"
},
"ResourceModules": {
"ext.confirmEdit.reCaptchaNoCaptcha.visualEditor": {

4
Turnstile/extension.json
View file

@ -15,7 +15,7 @@
]
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\Turnstile\\": "includes/"
"MediaWiki\\Extension\\ConfirmEdit\\Turnstile\\": "../includes/Turnstile/"
},
"config": {
"CaptchaClass": {
@ -33,7 +33,7 @@
},
"ResourceFileModulePaths": {
"localBasePath": "resources",
"remoteExtPath": "ConfirmEdit/Turnstile/resources"
"remoteExtPath": "ConfirmEdit/resources"
},
"ResourceModules": {
"ext.confirmEdit.turnstile.visualEditor": {

5
extension.json
View file

@ -62,8 +62,7 @@
"MediaWiki\\Extension\\ConfirmEdit\\Store\\CaptchaCacheStore": "includes/Store/CaptchaCacheStore.php"
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\": "includes/",
"MediaWiki\\Extension\\ConfirmEdit\\SimpleCaptcha\\": "SimpleCaptcha/"
"MediaWiki\\Extension\\ConfirmEdit\\": "includes/"
},
"ResourceModules": {
"ext.confirmEdit.editPreview.ipwhitelist.styles": {
@ -74,7 +73,7 @@
"dependencies": "ext.confirmEdit.CaptchaInputWidget"
},
"ext.confirmEdit.simpleCaptcha": {
"styles": "../SimpleCaptcha/resources/ext.confirmEdit.simpleCaptcha.css"
"styles": "ext.confirmEdit.simpleCaptcha.css"
}
},
"attributes": {

4
hCaptcha/extension.json
View file

@ -14,7 +14,7 @@
]
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\hCaptcha\\": "includes/"
"MediaWiki\\Extension\\ConfirmEdit\\hCaptcha\\": "../includes/hCaptcha/"
},
"config": {
"CaptchaClass": {
@ -42,7 +42,7 @@
},
"ResourceFileModulePaths": {
"localBasePath": "resources",
"remoteExtPath": "ConfirmEdit/hCaptcha/resources"
"remoteExtPath": "ConfirmEdit/resources/hCaptcha"
},
"ResourceModules": {
"ext.confirmEdit.hCaptcha.visualEditor": {

0
FancyCaptcha/includes/ApiFancyCaptchaReload.php → includes/FancyCaptcha/ApiFancyCaptchaReload.php
View file

0
FancyCaptcha/includes/FancyCaptcha.php → includes/FancyCaptcha/FancyCaptcha.php
View file

0
FancyCaptcha/includes/HTMLFancyCaptchaField.php → includes/FancyCaptcha/HTMLFancyCaptchaField.php
View file

0
QuestyCaptcha/includes/QuestyCaptcha.php → includes/QuestyCaptcha/QuestyCaptcha.php
View file

0
ReCaptchaNoCaptcha/includes/HTMLReCaptchaNoCaptchaField.php → includes/ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php
View file

0
ReCaptchaNoCaptcha/includes/Hooks.php → includes/ReCaptchaNoCaptcha/Hooks.php
View file

0
ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptcha.php → includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptcha.php
View file

0
ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptchaAuthenticationRequest.php → includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptchaAuthenticationRequest.php
View file

0
SimpleCaptcha/SimpleCaptcha.php → includes/SimpleCaptcha/SimpleCaptcha.php
View file

0
Turnstile/includes/HTMLTurnstileField.php → includes/Turnstile/HTMLTurnstileField.php
View file

0
Turnstile/includes/Hooks.php → includes/Turnstile/Hooks.php
View file

0
Turnstile/includes/Turnstile.php → includes/Turnstile/Turnstile.php
View file

0
Turnstile/includes/TurnstileAuthenticationRequest.php → includes/Turnstile/TurnstileAuthenticationRequest.php
View file

0
hCaptcha/includes/HCaptcha.php → includes/hCaptcha/HCaptcha.php
View file

0
hCaptcha/includes/HCaptchaAuthenticationRequest.php → includes/hCaptcha/HCaptchaAuthenticationRequest.php
View file

0
hCaptcha/includes/HTMLHCaptchaField.php → includes/hCaptcha/HTMLHCaptchaField.php
View file

0
hCaptcha/includes/Hooks/ResourceLoaderHooks.php → includes/hCaptcha/Hooks/ResourceLoaderHooks.php
View file

0
FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js → resources/ext.confirmEdit.fancyCaptcha.js
View file

0
FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.less → resources/ext.confirmEdit.fancyCaptcha.less
View file

0
SimpleCaptcha/resources/ext.confirmEdit.simpleCaptcha.css → resources/ext.confirmEdit.simpleCaptcha.css
View file

0
FancyCaptcha/resources/images/ajax-loader-10x10.gif → resources/images/ajax-loader-10x10.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 6 KiB

0
FancyCaptcha/resources/images/refresh.svg → resources/images/refresh.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

0
ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/.eslintrc.json → resources/ve-confirmedit-hCaptcha/.eslintrc.json
View file

0
hCaptcha/resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js → resources/ve-confirmedit-hCaptcha/ve.init.mw.HCaptchaSaveErrorHandler.js
View file

0
Turnstile/resources/ve-confirmedit-turnstile/.eslintrc.json → resources/ve-confirmedit-reCaptchaNoCaptcha/.eslintrc.json
View file

0
ReCaptchaNoCaptcha/resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js → resources/ve-confirmedit-reCaptchaNoCaptcha/ve.init.mw.NoCaptchaReCaptchaSaveErrorHandler.js
View file

0
hCaptcha/resources/ve-confirmedit-hCaptcha/.eslintrc.json → resources/ve-confirmedit-turnstile/.eslintrc.json
View file

0
Turnstile/resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js → resources/ve-confirmedit-turnstile/ve.init.mw.TurnstileSaveErrorHandler.js
View file

2
tests/phpunit/HTMLFancyCaptchaFieldTest.php
View file

@ -21,7 +21,7 @@ class HTMLFancyCaptchaFieldTest extends MediaWikiIntegrationTestCase {
'wgAutoloadClasses',
[
'MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\HTMLFancyCaptchaField'
=> __DIR__ . '/../../FancyCaptcha/includes/HTMLFancyCaptchaField.php'
=> __DIR__ . '/../../includes/FancyCaptcha/HTMLFancyCaptchaField.php'
]
);
}

2
tests/phpunit/HTMLReCaptchaNoCaptchaFieldTest.php
View file

@ -19,7 +19,7 @@ class HTMLReCaptchaNoCaptchaFieldTest extends MediaWikiIntegrationTestCase {
'wgAutoloadClasses',
[
'MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\HTMLReCaptchaNoCaptchaField'
=> __DIR__ . '/../../ReCaptchaNoCaptcha/includes/HTMLReCaptchaNoCaptchaField.php'
=> __DIR__ . '/../../includes/ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php'
]
);
}

2
tests/phpunit/QuestyCaptchaTest.php
View file

@ -13,7 +13,7 @@ class QuestyCaptchaTest extends MediaWikiIntegrationTestCase {
$this->mergeMwGlobalArrayValue(
'wgAutoloadClasses',
[ 'MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha'
=> __DIR__ . '/../../QuestyCaptcha/includes/QuestyCaptcha.php' ]
=> __DIR__ . '/../../includes/QuestyCaptcha/QuestyCaptcha.php' ]
);
}

2
tests/phpunit/ReCaptchaNoCaptchaAuthenticationRequestTest.php
View file

@ -15,7 +15,7 @@ class ReCaptchaNoCaptchaAuthenticationRequestTest extends AuthenticationRequestT
'wgAutoloadClasses',
[
'MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\ReCaptchaNoCaptchaAuthenticationRequest'
=> __DIR__ . '/../../ReCaptchaNoCaptcha/includes/ReCaptchaNoCaptchaAuthenticationRequest.php'
=> __DIR__ . '/../..//includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptchaAuthenticationRequest.php'
]
);
}