d6727856fd
Support migration stages when reading and writing blocks. I tried to set it up for an easy next stage, in which support for the old schema is removed. I tried to avoid factoring out of shared code between the two schemas, so that the old schema cases can simply be deleted without the need to revert unnecessary abstractions. However, I added HideUserUtils to factor out ipb_deleted queries. Code review showed that this was already quite complex, with multiple approaches to the problem, so it benefits from refactoring even without the schema abstraction. HideUserUtils is a service rather than a standalone class to support unit tests, since unit tests do not allow global config access. When the migration stage config is removed, it will be a service with no constructor parameters -- an unnecessary abstraction which should ideally be resolved at that time. When interpreting result rows, it is possible to share code by using field aliases. But when constructing WHERE conditions, the actual field names need to be used, so the migration is more intrusive in ApiQueryBlocks and SpecialBlockList, where complex conditions are used. Bug: T346293 Bug: T51504 Bug: T349883 Change-Id: I408acf7a57b0100fe18c455fc13141277a598925
75 lines
2 KiB
PHP
75 lines
2 KiB
PHP
<?php
|
|
|
|
use MediaWiki\Block\CompositeBlock;
|
|
use MediaWiki\Block\DatabaseBlock;
|
|
use MediaWiki\Block\SystemBlock;
|
|
use MediaWiki\Tests\Unit\DummyServicesTrait;
|
|
use Wikimedia\TestingAccessWrapper;
|
|
|
|
/**
|
|
* @covers ApiBlockInfoTrait
|
|
*/
|
|
class ApiBlockInfoTraitTest extends MediaWikiIntegrationTestCase {
|
|
use DummyServicesTrait;
|
|
|
|
protected function setUp(): void {
|
|
parent::setUp();
|
|
|
|
$this->setService( 'DBLoadBalancerFactory', $this->getDummyDBLoadBalancerFactory() );
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideGetBlockDetails
|
|
*/
|
|
public function testGetBlockDetails( $block, $expectedInfo ) {
|
|
$language = $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'en' );
|
|
$mock = $this->getMockForTrait( ApiBlockInfoTrait::class );
|
|
$mock->method( 'getLanguage' )->willReturn( $language );
|
|
$info = TestingAccessWrapper::newFromObject( $mock )->getBlockDetails( $block );
|
|
$subset = array_merge( [
|
|
'blockid' => null,
|
|
'blockedby' => '',
|
|
'blockedbyid' => 0,
|
|
'blockreason' => '',
|
|
'blockexpiry' => 'infinite',
|
|
'blockemail' => false,
|
|
'blockowntalk' => true,
|
|
], $expectedInfo );
|
|
$this->assertArraySubmapSame( $subset, $info, "Matching block details" );
|
|
}
|
|
|
|
public static function provideGetBlockDetails() {
|
|
return [
|
|
'Sitewide block' => [
|
|
new DatabaseBlock(),
|
|
[ 'blockpartial' => false ],
|
|
],
|
|
'Partial block' => [
|
|
new DatabaseBlock( [ 'sitewide' => false ] ),
|
|
[ 'blockpartial' => true ],
|
|
],
|
|
'Email block' => [
|
|
new DatabaseBlock( [ 'blockEmail' => true ] ),
|
|
[ 'blockemail' => true ]
|
|
],
|
|
'System block' => [
|
|
new SystemBlock( [ 'systemBlock' => 'proxy' ] ),
|
|
[ 'systemblocktype' => 'proxy' ]
|
|
],
|
|
'Composite block' => [
|
|
CompositeBlock::createFromBlocks(
|
|
new DatabaseBlock( [ 'blockEmail' => false ] ),
|
|
new DatabaseBlock( [ 'blockEmail' => true ] )
|
|
),
|
|
[
|
|
'blockemail' => true,
|
|
'blockreason' => 'There are multiple blocks against your account and/or IP address',
|
|
'blockcomponents' => [
|
|
[ 'blockemail' => false ],
|
|
[ 'blockemail' => true ],
|
|
],
|
|
],
|
|
],
|
|
];
|
|
}
|
|
}
|