Migrate all callers of Hooks::run() to use the new HookContainer/HookRunner system. General principles: * Use DI if it is already used. We're not changing the way state is managed in this patch. * HookContainer is always injected, not HookRunner. HookContainer is a service, it's a more generic interface, it is the only thing that provides isRegistered() which is needed in some cases, and a HookRunner can be efficiently constructed from it (confirmed by benchmark). Because HookContainer is needed for object construction, it is also needed by all factories. * "Ask your friendly local base class". Big hierarchies like SpecialPage and ApiBase have getHookContainer() and getHookRunner() methods in the base class, and classes that extend that base class are not expected to know or care where the base class gets its HookContainer from. * ProtectedHookAccessorTrait provides protected getHookContainer() and getHookRunner() methods, getting them from the global service container. The point of this is to ease migration to DI by ensuring that call sites ask their local friendly base class rather than getting a HookRunner from the service container directly. * Private $this->hookRunner. In some smaller classes where accessor methods did not seem warranted, there is a private HookRunner property which is accessed directly. Very rarely (two cases), there is a protected property, for consistency with code that conventionally assumes protected=private, but in cases where the class might actually be overridden, a protected accessor is preferred over a protected property. * The last resort: Hooks::runner(). Mostly for static, file-scope and global code. In a few cases it was used for objects with broken construction schemes, out of horror or laziness. Constructors with new required arguments: * AuthManager * BadFileLookup * BlockManager * ClassicInterwikiLookup * ContentHandlerFactory * ContentSecurityPolicy * DefaultOptionsManager * DerivedPageDataUpdater * FullSearchResultWidget * HtmlCacheUpdater * LanguageFactory * LanguageNameUtils * LinkRenderer * LinkRendererFactory * LocalisationCache * MagicWordFactory * MessageCache * NamespaceInfo * PageEditStash * PageHandlerFactory * PageUpdater * ParserFactory * PermissionManager * RevisionStore * RevisionStoreFactory * SearchEngineConfig * SearchEngineFactory * SearchFormWidget * SearchNearMatcher * SessionBackend * SpecialPageFactory * UserNameUtils * UserOptionsManager * WatchedItemQueryService * WatchedItemStore Constructors with new optional arguments: * DefaultPreferencesFactory * Language * LinkHolderArray * MovePage * Parser * ParserCache * PasswordReset * Router setHookContainer() now required after construction: * AuthenticationProvider * ResourceLoaderModule * SearchEngine Change-Id: Id442b0dbe43aba84bd5cf801d86dedc768b082c7
396 lines
13 KiB
PHP
396 lines
13 KiB
PHP
<?php
|
|
|
|
use MediaWiki\Content\ContentHandlerFactory;
|
|
use MediaWiki\MediaWikiServices;
|
|
use Wikimedia\ObjectFactory;
|
|
|
|
/**
|
|
* @group ContentHandlerFactory
|
|
*/
|
|
class ContentHandlerFactoryTest extends MediaWikiUnitTestCase {
|
|
|
|
public function provideHandlerSpecs() {
|
|
return [
|
|
'typical list' => [
|
|
[
|
|
'ExistClassName' => DummyContentHandlerForTesting::class,
|
|
'ExistCallbackWithExistClassName' => function ( $modelID ) {
|
|
return new DummyContentHandlerForTesting( $modelID );
|
|
},
|
|
],
|
|
DummyContentHandlerForTesting::class,
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createForModelID
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createContentHandlerFromHandlerSpec
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::validateContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::__construct
|
|
*
|
|
* @param array $handlerSpecs
|
|
* @param string $contentHandlerClass
|
|
*
|
|
* @throws MWException
|
|
* @throws MWUnknownContentModelException
|
|
* @dataProvider provideHandlerSpecs $handlerSpecs
|
|
*/
|
|
public function testGetContentHandler_callWithProvider_same(
|
|
array $handlerSpecs, string $contentHandlerClass
|
|
): void {
|
|
$contentHandlerExpected = new $contentHandlerClass( 'dummy' );
|
|
$objectFactory = $this->createMockObjectFactory();
|
|
$hookContainer = $this->getHookContainer();
|
|
|
|
$factory = new ContentHandlerFactory( $handlerSpecs, $objectFactory, $hookContainer );
|
|
$i = 0;
|
|
foreach ( $handlerSpecs as $modelID => $handlerSpec ) {
|
|
$objectFactory
|
|
->expects( $this->at( $i++ ) )
|
|
->method( 'createObject' )
|
|
->with( $handlerSpec,
|
|
[
|
|
'assertClass' => ContentHandler::class,
|
|
'allowCallable' => true,
|
|
'allowClassName' => true,
|
|
'extraArgs' => [ $modelID ],
|
|
] )
|
|
->willReturn( $contentHandlerExpected );
|
|
}
|
|
|
|
foreach ( $handlerSpecs as $modelID => $handlerSpec ) {
|
|
$this->assertSame( $contentHandlerExpected, $factory->getContentHandler( $modelID ) );
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createForModelID
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createContentHandlerFromHook
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::validateContentHandler
|
|
*
|
|
* @param array $handlerSpecs
|
|
* @param string $contentHandlerClass
|
|
*
|
|
* @throws MWException
|
|
* @throws MWUnknownContentModelException
|
|
* @dataProvider provideHandlerSpecs $handlerSpecs
|
|
*/
|
|
public function testGetContentHandler_hookWithProvider_same(
|
|
array $handlerSpecs,
|
|
string $contentHandlerClass
|
|
): void {
|
|
$contentHandlerExpected = new $contentHandlerClass( 'dummy' );
|
|
$factory = new ContentHandlerFactory( [], $this->createMockObjectFactory(),
|
|
$this->getHookContainer() );
|
|
|
|
foreach ( $handlerSpecs as $modelID => $handlerSpec ) {
|
|
$this->assertFalse( $factory->isDefinedModel( $modelID ) );
|
|
$contentHandler = null;
|
|
$this->setTemporaryHook( 'ContentHandlerForModelID',
|
|
function ( $handlerSpec, &$contentHandler ) use (
|
|
$contentHandlerExpected
|
|
) {
|
|
$contentHandler = $contentHandlerExpected;
|
|
|
|
return true;
|
|
} );
|
|
|
|
$contentHandler = $factory->getContentHandler( $modelID );
|
|
$this->assertSame( $contentHandlerExpected, $contentHandler, $modelID );
|
|
$this->assertTrue( $factory->isDefinedModel( $modelID ), $modelID );
|
|
}
|
|
}
|
|
|
|
public function provideHandlerSpecsWithMWException(): array {
|
|
return [
|
|
'MWException expected' => [
|
|
[
|
|
'ExistCallbackWithWrongType' => function () {
|
|
return true;
|
|
},
|
|
'ExistCallbackWithNull' => function () {
|
|
return null;
|
|
},
|
|
'ExistCallbackWithEmptyString' => function () {
|
|
return '';
|
|
},
|
|
'WrongClassName' => self::class,
|
|
'WrongType' => true,
|
|
'NullType' => null,
|
|
|
|
],
|
|
MWException::class,
|
|
],
|
|
'Error expected' => [
|
|
[
|
|
'WrongClassNameNotExist' => 'ClassNameNotExist',
|
|
'ExistCallbackWithNotExistClassName' => function () {
|
|
return ClassNameNotExist();
|
|
},
|
|
'EmptyString' => '',
|
|
],
|
|
Error::class,
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createForModelID
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createContentHandlerFromHandlerSpec
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::validateContentHandler
|
|
*
|
|
* @dataProvider provideHandlerSpecsWithMWException
|
|
*
|
|
* @param array $handlerSpecs
|
|
* @param string $exceptionClassName
|
|
*/
|
|
public function testCreateContentHandlerForModelID_callWithProvider_throwsException(
|
|
array $handlerSpecs,
|
|
string $exceptionClassName
|
|
): void {
|
|
/**
|
|
* @var Exception $exceptionExpected
|
|
*/
|
|
$objectFactory = $this->createMockObjectFactory();
|
|
$objectFactory->method( 'createObject' )
|
|
->willThrowException( $this->createMock( $exceptionClassName ) );
|
|
$factory = new ContentHandlerFactory( $handlerSpecs, $objectFactory,
|
|
$this->getHookContainer() );
|
|
|
|
foreach ( $handlerSpecs as $modelID => $handlerSpec ) {
|
|
try {
|
|
$factory->getContentHandler( $modelID );
|
|
$this->assertTrue( false );
|
|
}
|
|
catch ( \Throwable $exception ) {
|
|
$this->assertInstanceOf( $exceptionClassName, $exception );
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createForModelID
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createContentHandlerFromHandlerSpec
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::validateContentHandler
|
|
*/
|
|
public function testCreateContentHandlerForModelID_callNotExist_throwMWUCMException() {
|
|
$this->expectException( MWUnknownContentModelException::class );
|
|
$factory = new ContentHandlerFactory( [], $this->createMockObjectFactory(),
|
|
$this->getHookContainer() );
|
|
$factory->getContentHandler( 'ModelNameNotExist' );
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::defineContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createForModelID
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createContentHandlerFromHandlerSpec
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::validateContentHandler
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::isDefinedModel
|
|
*/
|
|
public function testDefineContentHandler_flow_throwsException() {
|
|
$objectFactory = $this->createMockObjectFactory();
|
|
$objectFactory
|
|
->method( 'createObject' )
|
|
->willReturn( $this->createMock( DummyContentHandlerForTesting::class ) );
|
|
$factory = new ContentHandlerFactory( [], $objectFactory, $this->getHookContainer() );
|
|
$this->assertFalse( $factory->isDefinedModel( 'define test' ) );
|
|
|
|
$factory->defineContentHandler( 'define test', DummyContentHandlerForTesting::class );
|
|
$this->assertTrue( $factory->isDefinedModel( 'define test' ) );
|
|
$this->assertInstanceOf(
|
|
DummyContentHandlerForTesting::class,
|
|
$factory->getContentHandler( 'define test' )
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getContentModels
|
|
*
|
|
* @dataProvider provideValidDummySpecList
|
|
*
|
|
* @param string $name1
|
|
* @param string $name2
|
|
* @param string $name3
|
|
* @param string $name4
|
|
* @throws FatalError
|
|
* @throws MWException
|
|
*/
|
|
public function testGetContentModels_flow_same(
|
|
string $name1, string $name2, string $name3, string $name4
|
|
): void {
|
|
$factory = new ContentHandlerFactory( [
|
|
$name1 => DummyContentHandlerForTesting::class,
|
|
$name2 => DummyContentHandlerForTesting::class,
|
|
], $this->createMockObjectFactory(), $this->getHookContainer() );
|
|
$this->assertArrayEquals(
|
|
[ $name1, $name2, ],
|
|
$factory->getContentModels() );
|
|
|
|
$factory->defineContentHandler(
|
|
$name3,
|
|
function () {
|
|
}
|
|
);
|
|
|
|
$this->assertArrayEquals(
|
|
[ $name1, $name2, $name3, ],
|
|
$factory->getContentModels()
|
|
);
|
|
|
|
$this->setTemporaryHook( 'GetContentModels',
|
|
function ( &$models ) use ( $name4 ) {
|
|
$models[] = $name4;
|
|
} );
|
|
$this->assertArrayEquals(
|
|
[ $name1, $name2, $name3, $name4, ],
|
|
$factory->getContentModels()
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::isDefinedModel
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::createContentHandlerFromHook
|
|
* @dataProvider provideValidDummySpecList
|
|
*
|
|
* @param string $name1
|
|
* @param string $name2
|
|
* @param string $name3
|
|
* @param string $name4
|
|
* @throws MWException
|
|
*/
|
|
public function testIsDefinedModel_flow_same(
|
|
string $name1, string $name2, string $name3, string $name4
|
|
): void {
|
|
$factory = new ContentHandlerFactory( [
|
|
$name1 => DummyContentHandlerForTesting::class,
|
|
$name2 => DummyContentHandlerForTesting::class,
|
|
], $this->createMockObjectFactory(), $this->getHookContainer() );
|
|
|
|
$this->assertTrue( $factory->isDefinedModel( $name1 ) );
|
|
$this->assertTrue( $factory->isDefinedModel( $name2 ) );
|
|
$this->assertFalse( $factory->isDefinedModel( $name3 ) );
|
|
$this->assertFalse( $factory->isDefinedModel( $name4 ) );
|
|
$this->assertFalse( $factory->isDefinedModel( 'not exist name' ) );
|
|
|
|
$factory->defineContentHandler(
|
|
$name3,
|
|
function () {
|
|
}
|
|
);
|
|
|
|
$this->assertTrue( $factory->isDefinedModel( $name1 ) );
|
|
$this->assertTrue( $factory->isDefinedModel( $name2 ) );
|
|
$this->assertTrue( $factory->isDefinedModel( $name3 ) );
|
|
$this->assertFalse( $factory->isDefinedModel( $name4 ) );
|
|
$this->assertFalse( $factory->isDefinedModel( 'not exist name' ) );
|
|
|
|
$this->setTemporaryHook(
|
|
'GetContentModels',
|
|
function ( &$models ) use ( $name4 ) {
|
|
$models[] = $name4;
|
|
} );
|
|
|
|
$this->assertTrue( $factory->isDefinedModel( $name1 ) );
|
|
$this->assertTrue( $factory->isDefinedModel( $name2 ) );
|
|
$this->assertTrue( $factory->isDefinedModel( $name3 ) );
|
|
$this->assertTrue( $factory->isDefinedModel( $name4 ) );
|
|
$this->assertFalse( $factory->isDefinedModel( 'not exist name' ) );
|
|
}
|
|
|
|
public function provideValidDummySpecList() {
|
|
return [
|
|
'1-0-3' => [
|
|
'mock name 1',
|
|
'mock name 0',
|
|
'mock name 3',
|
|
'mock name 4',
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getContentModels
|
|
*/
|
|
public function testGetContentModels_empty_empty() {
|
|
$factory = new ContentHandlerFactory( [], $this->createMockObjectFactory(),
|
|
$this->getHookContainer() );
|
|
|
|
$this->assertArrayEquals( [], $factory->getContentModels() );
|
|
}
|
|
|
|
/**
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::getAllContentFormats
|
|
* @covers \MediaWiki\Content\ContentHandlerFactory::defineContentHandler
|
|
*/
|
|
public function testGetAllContentFormats_flow_same() {
|
|
$contentHandler1 = $this->createMock( DummyContentHandlerForTesting::class );
|
|
$contentHandler1->method( 'getSupportedFormats' )->willReturn( [ 'format 1' ] );
|
|
|
|
$contentHandler2 = $this->createMock( DummyContentHandlerForTesting::class );
|
|
$contentHandler2->method( 'getSupportedFormats' )->willReturn( [ 'format 0' ] );
|
|
|
|
$contentHandler3 = $this->createMock( DummyContentHandlerForTesting::class );
|
|
$contentHandler3->method( 'getSupportedFormats' )->willReturn( [ 'format 3' ] );
|
|
|
|
$objectFactory = $this->createMockObjectFactory();
|
|
$objectFactory->expects( $this->at( 0 ) )
|
|
->method( 'createObject' )
|
|
->willReturn( $contentHandler1 );
|
|
$objectFactory->expects( $this->at( 1 ) )
|
|
->method( 'createObject' )
|
|
->willReturn( $contentHandler2 );
|
|
$objectFactory->expects( $this->at( 2 ) )
|
|
->method( 'createObject' )
|
|
->willReturn( $contentHandler3 );
|
|
|
|
$factory = new ContentHandlerFactory( [
|
|
'mock name 1' => function () {
|
|
// return new DummyContentHandlerForTesting( 'mock 1', [ 'format 1' ] );
|
|
},
|
|
'mock name 2' => function () {
|
|
// return new DummyContentHandlerForTesting( 'mock 0', [ 'format 0' ] );
|
|
},
|
|
], $objectFactory, $this->getHookContainer() );
|
|
|
|
$this->assertArrayEquals( [
|
|
'format 1',
|
|
'format 0',
|
|
],
|
|
$factory->getAllContentFormats() );
|
|
|
|
$factory->defineContentHandler( 'some new name',
|
|
function () {
|
|
// return new DummyContentHandlerForTesting( 'mock defined', [ 'format defined' ] );
|
|
} );
|
|
|
|
$this->assertArrayEquals( [
|
|
'format 1',
|
|
'format 0',
|
|
'format 3',
|
|
],
|
|
$factory->getAllContentFormats() );
|
|
}
|
|
|
|
/**
|
|
* @return ObjectFactory|\PHPUnit\Framework\MockObject\MockObject
|
|
*/
|
|
private function createMockObjectFactory(): ObjectFactory {
|
|
return $this->createMock( ObjectFactory::class );
|
|
}
|
|
|
|
/**
|
|
* Get a HookContainer
|
|
*
|
|
* @fixme This gets an actual integrated HookContainer to support setTemporaryHook().
|
|
* In the future it should create an empty HookContainer and register temporary hooks
|
|
* directly in that object rather than globally.
|
|
*/
|
|
private function getHookContainer() {
|
|
return MediaWikiServices::getInstance()->getHookContainer();
|
|
}
|
|
}
|