wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-12-18 02:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove unused return values and reduce code complexity"

Browse source
This commit is contained in:
jenkins-bot 2020-02-09 17:27:11 +00:00 committed by Gerrit Code Review
parent 14bdf0dfb8 0dfd1f4ed1
commit f5f9c0971d
5 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SimpleCaptcha/SimpleCaptcha.php
View file

@ -750,7 +750,7 @@ class SimpleCaptcha {
} }
foreach ( $build as $key => $value ) { foreach ( $build as $key => $value ) {
$regexes[] = $regexStart[$key] . $regexes[] = $regexStart[$key] .
str_replace( '/', '\/', preg_replace( '|\\\*/|', '/', $build[$key] ) ) . str_replace( '/', '\/', preg_replace( '|\\\*/|', '/', $value ) ) .
$regexEnd[$key]; $regexEnd[$key];
} }
return $regexes; return $regexes;
@ -1112,7 +1112,7 @@ class SimpleCaptcha {
* Extract a list of all recognized HTTP links in the text. * Extract a list of all recognized HTTP links in the text.
* @param Title $title * @param Title $title
* @param string $text * @param string $text
* @return array of strings * @return string[]
*/ */
private function findLinks( $title, $text ) { private function findLinks( $title, $text ) {
$parser = MediaWikiServices::getInstance()->getParser(); $parser = MediaWikiServices::getInstance()->getParser();

5
includes/ConfirmEditHooks.php
View file

@ -14,12 +14,9 @@ class ConfirmEditHooks {
public static function getInstance() { public static function getInstance() {
global $wgCaptcha, $wgCaptchaClass; global $wgCaptcha, $wgCaptchaClass;
$class = $wgCaptchaClass;
if ( $class == null ) {
$class = 'SimpleCaptcha';
}
if ( !static::$instanceCreated ) { if ( !static::$instanceCreated ) {
static::$instanceCreated = true; static::$instanceCreated = true;
$class = $wgCaptchaClass ?: SimpleCaptcha::class;
$wgCaptcha = new $class; $wgCaptcha = new $class;
} }

3
includes/auth/CaptchaAuthenticationRequest.php
View file

@ -83,8 +83,7 @@ class CaptchaAuthenticationRequest extends AuthenticationRequest {
} }
public function getMetadata() { public function getMetadata() {
$captcha = ConfirmEditHooks::getInstance(); return ( ConfirmEditHooks::getInstance() )->describeCaptchaType();
return $captcha->describeCaptchaType();
} }
public static function __set_state( $data ) { public static function __set_state( $data ) {

13
includes/specials/SpecialCaptcha.php
View file

@ -10,16 +10,13 @@ class SpecialCaptcha extends UnlistedSpecialPage {
$instance = ConfirmEditHooks::getInstance(); $instance = ConfirmEditHooks::getInstance();
switch ( $par ) { if ( $par === 'image' && method_exists( $instance, 'showImage' ) ) {
case "image":
if ( method_exists( $instance, 'showImage' ) ) {
// @todo: Do this in a more OOP way // @todo: Do this in a more OOP way
/** @phan-suppress-next-line PhanUndeclaredMethod */ /** @phan-suppress-next-line PhanUndeclaredMethod */
return $instance->showImage(); $instance->showImage();
} return;
case "help":
default:
return $instance->showHelp();
} }
$instance->showHelp();
} }
} }

7
includes/store/CaptchaCacheStore.php
View file

@ -25,12 +25,7 @@ class CaptchaCacheStore extends CaptchaStore {
public function retrieve( $index ) { public function retrieve( $index ) {
$cache = $this->cache; $cache = $this->cache;
$info = $cache->get( $cache->makeKey( 'captcha', $index ) ); return $cache->get( $cache->makeKey( 'captcha', $index ) ) ?: false;
if ( $info ) {
return $info;
} else {
return false;
}
} }
public function clear( $index ) { public function clear( $index ) {