5f06efb318
This reverts commit 9335363789.
Reason for revert: It's full of code accessing AbstractBlock::mReason
out there, see [1]. Also, it was never hard deprecated. While that may
be acceptable under some circumstances, it's definitely not OK to remove
code when there are consumers around. I'd have fixed it right now without
reverting if it were a single repo, but there's just too many.
[1] - https://codesearch.wmflabs.org/search/?q=-%3EmReason&i=nope&files=&repos=
Change-Id: I8669f502b50cff89e28dada0f65fe2b130ae9b37
188 lines
4.3 KiB
PHP
188 lines
4.3 KiB
PHP
<?php
|
|
|
|
use MediaWiki\Block\CompositeBlock;
|
|
use MediaWiki\Block\DatabaseBlock;
|
|
use MediaWiki\Block\SystemBlock;
|
|
use MediaWiki\MediaWikiServices;
|
|
|
|
/**
|
|
* @group Blocking
|
|
* @coversDefaultClass \MediaWiki\Block\BlockErrorFormatter
|
|
*/
|
|
class BlockErrorFormatterTest extends MediaWikiLangTestCase {
|
|
/**
|
|
* @dataProvider provideTestGetMessage
|
|
* @covers ::getMessage
|
|
* @covers ::getBlockErrorMessageParams
|
|
* @covers ::getBlockErrorInfo
|
|
* @covers ::getFormattedBlockErrorInfo
|
|
* @covers ::getBlockErrorMessageKey
|
|
*/
|
|
public function testGetMessage( $block, $expectedKey, $expectedParams ) {
|
|
$context = new DerivativeContext( RequestContext::getMain() );
|
|
$request = $this->getMockBuilder( FauxRequest::class )
|
|
->setMethods( [ 'getIP' ] )
|
|
->getMock();
|
|
$request->method( 'getIP' )
|
|
->willReturn( '1.2.3.4' );
|
|
$context->setRequest( $request );
|
|
|
|
$formatter = MediaWikiServices::getInstance()->getBlockErrorFormatter();
|
|
$message = $formatter->getMessage(
|
|
$block,
|
|
$context->getUser(),
|
|
$context->getLanguage(),
|
|
$context->getRequest()->getIP()
|
|
);
|
|
|
|
$this->assertSame( $expectedKey, $message->getKey() );
|
|
$this->assertSame( $expectedParams, $message->getParams() );
|
|
}
|
|
|
|
public static function provideTestGetMessage() {
|
|
$timestamp = '20000101000000';
|
|
$expiry = '20010101000000';
|
|
|
|
$databaseBlock = new DatabaseBlock( [
|
|
'timestamp' => $timestamp,
|
|
'expiry' => $expiry,
|
|
] );
|
|
|
|
$systemBlock = new SystemBlock( [
|
|
'timestamp' => $timestamp,
|
|
'systemBlock' => 'test',
|
|
] );
|
|
|
|
$compositeBlock = new CompositeBlock( [
|
|
'timestamp' => $timestamp,
|
|
'originalBlocks' => [
|
|
$databaseBlock,
|
|
$systemBlock
|
|
]
|
|
] );
|
|
|
|
return [
|
|
'Database block' => [
|
|
$databaseBlock,
|
|
'blockedtext',
|
|
[
|
|
'',
|
|
'no reason given',
|
|
'1.2.3.4',
|
|
'',
|
|
null, // Block not inserted
|
|
'00:00, 1 January 2001',
|
|
'',
|
|
'00:00, 1 January 2000',
|
|
],
|
|
],
|
|
'Database block (autoblock)' => [
|
|
new DatabaseBlock( [
|
|
'timestamp' => $timestamp,
|
|
'expiry' => $expiry,
|
|
'auto' => true,
|
|
] ),
|
|
'autoblockedtext',
|
|
[
|
|
'',
|
|
'no reason given',
|
|
'1.2.3.4',
|
|
'',
|
|
null,
|
|
'00:00, 1 January 2001',
|
|
'',
|
|
'00:00, 1 January 2000',
|
|
],
|
|
],
|
|
'Database block (partial block)' => [
|
|
new DatabaseBlock( [
|
|
'timestamp' => $timestamp,
|
|
'expiry' => $expiry,
|
|
'sitewide' => false,
|
|
] ),
|
|
'blockedtext-partial',
|
|
[
|
|
'',
|
|
'no reason given',
|
|
'1.2.3.4',
|
|
'',
|
|
null,
|
|
'00:00, 1 January 2001',
|
|
'',
|
|
'00:00, 1 January 2000',
|
|
],
|
|
],
|
|
'System block (type \'test\')' => [
|
|
$systemBlock,
|
|
'systemblockedtext',
|
|
[
|
|
'',
|
|
'no reason given',
|
|
'1.2.3.4',
|
|
'',
|
|
'test',
|
|
'infinite',
|
|
'',
|
|
'00:00, 1 January 2000',
|
|
],
|
|
],
|
|
'Composite block (original blocks not inserted)' => [
|
|
$compositeBlock,
|
|
'blockedtext-composite',
|
|
[
|
|
'',
|
|
'no reason given',
|
|
'1.2.3.4',
|
|
'',
|
|
'Your IP address appears in multiple blacklists',
|
|
'infinite',
|
|
'',
|
|
'00:00, 1 January 2000',
|
|
],
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideTestGetMessageCompositeBlocks
|
|
* @covers ::getMessage
|
|
* @covers ::getBlockErrorMessageParams
|
|
*/
|
|
public function testGetMessageCompositeBlocks( $ids, $expected ) {
|
|
$block = $this->getMockBuilder( CompositeBlock::class )
|
|
->setMethods( [ 'getIdentifier', 'getBlockErrorParams' ] )
|
|
->getMock();
|
|
$block->method( 'getIdentifier' )
|
|
->willReturn( $ids );
|
|
|
|
$context = RequestContext::getMain();
|
|
|
|
$formatter = MediaWikiServices::getInstance()->getBlockErrorFormatter();
|
|
$this->assertContains(
|
|
$expected,
|
|
$formatter->getMessage(
|
|
$block,
|
|
$context->getUser(),
|
|
$context->getLanguage(),
|
|
$context->getRequest()->getIP()
|
|
)->getParams()
|
|
);
|
|
}
|
|
|
|
public static function provideTestGetMessageCompositeBlocks() {
|
|
return [
|
|
'All original blocks are system blocks' => [
|
|
[ 'test', 'test' ],
|
|
'Your IP address appears in multiple blacklists',
|
|
],
|
|
'One original block is a database block' => [
|
|
[ 100, 'test' ],
|
|
'Relevant block IDs: #100 (your IP address may also be blacklisted)',
|
|
],
|
|
'Several original blocks are database blocks' => [
|
|
[ 100, 101, 102 ],
|
|
'Relevant block IDs: #100, #101, #102 (your IP address may also be blacklisted)',
|
|
],
|
|
];
|
|
}
|
|
}
|