Merge "Remove class_alias calls and cleanup Autoloads"

This commit is contained in:
jenkins-bot 2024-11-02 16:41:37 +00:00 committed by Gerrit Code Review
commit da29819ddc
11 changed files with 0 additions and 68 deletions

View file

@ -17,10 +17,6 @@
"i18n/api"
]
},
"AutoloadClasses": {
"FancyCaptcha": "../includes/FancyCaptcha/FancyCaptcha.php",
"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\FancyCaptcha": "../includes/FancyCaptcha/FancyCaptcha.php"
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\": "../includes/FancyCaptcha/"
},

View file

@ -12,10 +12,6 @@
"i18n"
]
},
"AutoloadClasses": {
"QuestyCaptcha": "../includes/QuestyCaptcha/QuestyCaptcha.php",
"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha": "../includes/QuestyCaptcha/QuestyCaptcha.php"
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\": "../includes/QuestyCaptcha/"
},

View file

@ -55,12 +55,6 @@
"ExtensionMessagesFiles": {
"ConfirmEditAlias": "ConfirmEdit.alias.php"
},
"AutoloadClasses": {
"CaptchaCacheStore": "includes/Store/CaptchaCacheStore.php",
"ConfirmEditHooks": "includes/Hooks.php",
"MediaWiki\\Extension\\ConfirmEdit\\Hooks": "includes/Hooks.php",
"MediaWiki\\Extension\\ConfirmEdit\\Store\\CaptchaCacheStore": "includes/Store/CaptchaCacheStore.php"
},
"AutoloadNamespaces": {
"MediaWiki\\Extension\\ConfirmEdit\\": "includes/"
},

View file

@ -516,5 +516,3 @@ class FancyCaptcha extends SimpleCaptcha {
] + $formDescriptor['captchaWord'];
}
}
class_alias( FancyCaptcha::class, 'FancyCaptcha' );

View file

@ -349,5 +349,3 @@ class Hooks implements
}
}
class_alias( Hooks::class, 'ConfirmEditHooks' );

View file

@ -150,5 +150,3 @@ class QuestyCaptcha extends SimpleCaptcha {
$formDescriptor['captchaWord']['label-message'] = null;
}
}
class_alias( QuestyCaptcha::class, 'QuestyCaptcha' );

View file

@ -48,5 +48,3 @@ class CaptchaCacheStore extends CaptchaStore {
return false;
}
}
class_alias( CaptchaCacheStore::class, 'CaptchaCacheStore' );

View file

@ -14,18 +14,6 @@ use MediaWiki\Title\Title;
*/
class HTMLFancyCaptchaFieldTest extends MediaWikiIntegrationTestCase {
public function setUp(): void {
parent::setUp();
$this->mergeMwGlobalArrayValue(
'wgAutoloadClasses',
[
'MediaWiki\\Extension\\ConfirmEdit\\FancyCaptcha\\HTMLFancyCaptchaField'
=> __DIR__ . '/../../includes/FancyCaptcha/HTMLFancyCaptchaField.php'
]
);
}
public function testGetHTML() {
$html = $this->getForm( [ 'imageUrl' => 'https://example.com/' ] )->getHTML( false );
$this->assertMatchesRegularExpression( '/"fancycaptcha-image"/', $html );

View file

@ -12,18 +12,6 @@ use MediaWiki\Title\Title;
*/
class HTMLReCaptchaNoCaptchaFieldTest extends MediaWikiIntegrationTestCase {
public function setUp(): void {
parent::setUp();
$this->mergeMwGlobalArrayValue(
'wgAutoloadClasses',
[
'MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\HTMLReCaptchaNoCaptchaField'
=> __DIR__ . '/../../includes/ReCaptchaNoCaptcha/HTMLReCaptchaNoCaptchaField.php'
]
);
}
public function testSubmit() {
$request = new FauxRequest( [
'foo' => 'abc',

View file

@ -7,16 +7,6 @@ use MediaWiki\Extension\ConfirmEdit\QuestyCaptcha\QuestyCaptcha;
*/
class QuestyCaptchaTest extends MediaWikiIntegrationTestCase {
public function setUp(): void {
parent::setUp();
$this->mergeMwGlobalArrayValue(
'wgAutoloadClasses',
[ 'MediaWiki\\Extension\\ConfirmEdit\\QuestyCaptcha\\QuestyCaptcha'
=> __DIR__ . '/../../includes/QuestyCaptcha/QuestyCaptcha.php' ]
);
}
/**
* @covers \MediaWiki\Extension\ConfirmEdit\QuestyCaptcha\QuestyCaptcha::getCaptcha
* @dataProvider provideGetCaptcha

View file

@ -8,18 +8,6 @@ use MediaWiki\Tests\Auth\AuthenticationRequestTestCase;
*/
class ReCaptchaNoCaptchaAuthenticationRequestTest extends AuthenticationRequestTestCase {
public function setUp(): void {
parent::setUp();
$this->mergeMwGlobalArrayValue(
'wgAutoloadClasses',
[
'MediaWiki\\Extension\\ConfirmEdit\\ReCaptchaNoCaptcha\\ReCaptchaNoCaptchaAuthenticationRequest'
=> __DIR__ . '/../..//includes/ReCaptchaNoCaptcha/ReCaptchaNoCaptchaAuthenticationRequest.php'
]
);
}
protected function getInstance( array $args = [] ) {
return new ReCaptchaNoCaptchaAuthenticationRequest();
}