wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-23 10:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use MediaWiki\Block\DatabaseBlock instead of Block

Browse source 
This follows the rename of the Block class in I6d96b63ca0.

Change-Id: I44cf9eb68c23a8299316effa4dee7f732486dd84
This commit is contained in:
Thalia 2019-05-31 16:08:19 +01:00
parent ba856e51fd
commit 22ceae7e23
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

@ -11,7 +11,7 @@
"license-name": "GPL-2.0-or-later",
"type": "antispam",
"requires": {
"MediaWiki": ">= 1.33.0"
"MediaWiki": ">= 1.34.0"
},
"AvailableRights": [
"abusefilter-modify",

3
includes/AbuseFilter.php
View file

@ -1,5 +1,6 @@
<?php
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Revision\RevisionRecord;
@ -1910,7 +1911,7 @@ class AbuseFilter {
$rule['desc'], $rule['number']
)->inContentLanguage()->text();
$block = new Block();
$block = new DatabaseBlock();
$block->setTarget( $target );
$block->setBlocker( $filterUser );
$block->mReason = $reason;

3
includes/Views/AbuseFilterViewRevert.php
View file

@ -1,5 +1,6 @@
<?php
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\MediaWikiServices;
class AbuseFilterViewRevert extends AbuseFilterView {
@ -278,7 +279,7 @@ class AbuseFilterViewRevert extends AbuseFilterView {
public function revertAction( $action, $result ) {
switch ( $action ) {
case 'block':
$block = Block::newFromTarget( $result['user'] );
$block = DatabaseBlock::newFromTarget( $result['user'] );
if ( !( $block && $block->getBy() === AbuseFilter::getFilterUser()->getId() ) ) {
// Not blocked by abuse filter
return false;

3
tests/phpunit/AbuseFilterConsequencesTest.php
View file

@ -1,5 +1,6 @@
<?php
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Session\SessionManager;
use MediaWiki\MediaWikiServices;
use MediaWiki\Storage\NameTableAccessException;
@ -319,7 +320,7 @@ class AbuseFilterConsequencesTest extends MediaWikiTestCase {
$user = User::newFromName( 'FilteredUser' );
$user->addToDatabase();
$user->addGroup( 'sysop' );
$block = Block::newFromTarget( $user );
$block = DatabaseBlock::newFromTarget( $user );
if ( $block ) {
$block->delete();
}

3
tests/phpunit/AbuseFilterTest.php
View file

@ -1,5 +1,6 @@
<?php
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\MutableRevisionRecord;
use MediaWiki\Revision\RevisionRecord;
@ -161,7 +162,7 @@ class AbuseFilterTest extends MediaWikiTestCase {
$result = array_merge( $rights, $previous );
break;
case 'user_blocked':
$block = new Block();
$block = new DatabaseBlock();
$block->setTarget( $user );
$block->setBlocker( 'UTSysop' );
$block->mReason = 'Testing AbuseFilter variable user_blocked';