wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 02:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make AbuseFilterVariableHolder::mVars private"

Browse source
This commit is contained in:
jenkins-bot 2019-07-09 08:42:16 +00:00 committed by Gerrit Code Review
parent 69bebbb4ff 304b58d46a
commit 6f0905541a
6 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/AbuseFilter.php
View file

@ -1683,7 +1683,7 @@ class AbuseFilter {
$obj->setVar( $key, $value );
}
// If old variable names are used, make sure to keep them
if ( count( array_intersect_key( self::getDeprecatedVariables(), $obj->mVars ) ) !== 0 ) {
if ( count( array_intersect_key( self::getDeprecatedVariables(), $obj->getVars() ) ) !== 0 ) {
$obj->mVarsVersion = 1;
}
}

11
includes/AbuseFilterVariableHolder.php
View file

@ -2,7 +2,7 @@
class AbuseFilterVariableHolder {
/** @var (AFPData|AFComputedVariable)[] */
public $mVars = [];
private $mVars = [];
/** @var bool Whether this object is being used for an ongoing action being filtered */
public $forFilter = false;
@ -26,6 +26,15 @@ class AbuseFilterVariableHolder {
$this->mVars[$variable] = $datum;
}
/**
* Get all variables stored in this object
*
* @return (AFPData|AFComputedVariable)[]
*/
public function getVars() {
return $this->mVars;
}
/**
* @param string $variable
* @param string $method

8
includes/parser/AbuseFilterCachingParser.php
View file

@ -35,7 +35,7 @@ class AbuseFilterCachingParser extends AbuseFilterParser {
* Resets the state of the parser
*/
public function resetState() {
$this->mVars = new AbuseFilterVariableHolder;
$this->mVariables = new AbuseFilterVariableHolder;
$this->mCur = new AFPToken();
$this->mCondCount = 0;
}
@ -250,10 +250,10 @@ class AbuseFilterCachingParser extends AbuseFilterParser {
case AFPTreeNode::INDEX_ASSIGNMENT:
list( $varName, $offset, $value ) = $node->children;
if ( !$this->mVars->varIsSet( $varName ) ) {
if ( !$this->mVariables->varIsSet( $varName ) ) {
throw new AFPUserVisibleException( 'unrecognisedvar', $node->position, [ $varName ] );
}
$array = $this->mVars->getVar( $varName );
$array = $this->mVariables->getVar( $varName );
if ( $array->type !== AFPData::DARRAY ) {
throw new AFPUserVisibleException( 'notarray', $node->position, [] );
}
@ -273,7 +273,7 @@ class AbuseFilterCachingParser extends AbuseFilterParser {
case AFPTreeNode::ARRAY_APPEND:
list( $varName, $value ) = $node->children;
$array = $this->mVars->getVar( $varName );
$array = $this->mVariables->getVar( $varName );
if ( $array->type !== AFPData::DARRAY ) {
throw new AFPUserVisibleException( 'notarray', $node->position, [] );
}

16
includes/parser/AbuseFilterParser.php
View file

@ -28,7 +28,7 @@ class AbuseFilterParser {
/**
* @var AbuseFilterVariableHolder
*/
public $mVars;
public $mVariables;
/**
* @var int The current amount of conditions being consumed
@ -103,7 +103,7 @@ class AbuseFilterParser {
public function __construct( $vars = null ) {
$this->resetState();
if ( $vars instanceof AbuseFilterVariableHolder ) {
$this->mVars = $vars;
$this->mVariables = $vars;
}
}
@ -149,7 +149,7 @@ class AbuseFilterParser {
*/
public function resetState() {
$this->mTokens = [];
$this->mVars = new AbuseFilterVariableHolder;
$this->mVariables = new AbuseFilterVariableHolder;
$this->mPos = 0;
$this->mShortCircuit = false;
$this->mAllowShort = true;
@ -314,13 +314,13 @@ class AbuseFilterParser {
return;
} elseif ( $this->mCur->type === AFPToken::TSQUAREBRACKET && $this->mCur->value === '[' ) {
if ( !$this->mVars->varIsSet( $varname ) ) {
if ( !$this->mVariables->varIsSet( $varname ) ) {
throw new AFPUserVisibleException( 'unrecognisedvar',
$this->mCur->pos,
[ $varname ]
);
}
$array = $this->mVars->getVar( $varname );
$array = $this->mVariables->getVar( $varname );
if ( $array->type !== AFPData::DARRAY ) {
throw new AFPUserVisibleException( 'notarray', $this->mCur->pos, [] );
}
@ -923,7 +923,7 @@ class AbuseFilterParser {
$var = $deprecatedVars[$var];
}
if ( !( array_key_exists( $var, $builderValues['vars'] )
|| $this->mVars->varIsSet( $var ) )
|| $this->mVariables->varIsSet( $var ) )
) {
$msg = array_key_exists( $var, AbuseFilter::$disabledVars ) ?
'disabledvar' :
@ -938,7 +938,7 @@ class AbuseFilterParser {
[ $var ]
);
} else {
return $this->mVars->getVar( $var );
return $this->mVariables->getVar( $var );
}
}
@ -956,7 +956,7 @@ class AbuseFilterParser {
) {
throw new AFPUserVisibleException( 'overridebuiltin', $this->mCur->pos, [ $name ] );
}
$this->mVars->setVar( $name, $value );
$this->mVariables->setVar( $name, $value );
}
/**

2
tests/phpunit/AbuseFilterConsequencesTest.php
View file

@ -1335,7 +1335,7 @@ class AbuseFilterConsequencesTest extends MediaWikiTestCase {
[ 'ORDER BY' => 'afl_timestamp DESC' ]
);
$vars = AbuseFilter::loadVarDump( $dumpID )->mVars;
$vars = AbuseFilter::loadVarDump( $dumpID )->getVars();
$interestingVars = array_intersect_key( $vars, array_fill_keys( $usedVars, true ) );

2
tests/phpunit/AbuseFilterTest.php
View file

@ -1237,7 +1237,7 @@ class AbuseFilterTest extends MediaWikiTestCase {
$vars->addHolders( AbuseFilter::getEditVars( $title, $page ) );
$actualVariables = [];
foreach ( array_keys( $vars->mVars ) as $varName ) {
foreach ( array_keys( $vars->getVars() ) as $varName ) {
$actualVariables[$varName] = $vars->getVar( $varName )->toNative();
}