wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-12-01 01:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Rename CiteParserTagHooks::initialize to register"

Browse source
This commit is contained in:
jenkins-bot 2019-12-11 15:35:32 +00:00 committed by Gerrit Code Review
parent 5d5fd30a3c 01bcfa773d
commit 0dafe64305
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Hooks/CiteParserHooks.php
View file

@ -18,7 +18,7 @@ class CiteParserHooks {
*/ */
public static function onParserFirstCallInit( Parser $parser ) { public static function onParserFirstCallInit( Parser $parser ) {
$parser->extCite = new Cite(); $parser->extCite = new Cite();
CiteParserTagHooks::initialize( $parser ); CiteParserTagHooks::register( $parser );
} }
/** /**
@ -44,7 +44,7 @@ class CiteParserHooks {
$cite = $parser->extCite; $cite = $parser->extCite;
$cite->clearState( 'force' ); $cite->clearState( 'force' );
CiteParserTagHooks::initialize( $parser ); CiteParserTagHooks::register( $parser );
} }
/** /**

10
src/Hooks/CiteParserTagHooks.php
View file

@ -16,9 +16,9 @@ class CiteParserTagHooks {
* *
* @param Parser $parser * @param Parser $parser
*/ */
public static function initialize( Parser $parser ) { public static function register( Parser $parser ) {
$parser->setHook( 'ref', __CLASS__ . '::ref' ); $parser->setHook( 'ref', [ __CLASS__, 'ref' ] );
$parser->setHook( 'references', __CLASS__ . '::references' ); $parser->setHook( 'references', [ __CLASS__, 'references' ] );
} }
/** /**
@ -34,7 +34,6 @@ class CiteParserTagHooks {
public static function ref( $content, array $attributes, Parser $parser, PPFrame $frame ) { public static function ref( $content, array $attributes, Parser $parser, PPFrame $frame ) {
/** @var Cite $cite */ /** @var Cite $cite */
$cite = $parser->extCite; $cite = $parser->extCite;
// @phan-suppress-next-line SecurityCheck-XSS False positive
$result = $cite->ref( $content, $attributes, $parser ); $result = $cite->ref( $content, $attributes, $parser );
if ( $result === false ) { if ( $result === false ) {
@ -46,6 +45,7 @@ class CiteParserTagHooks {
$parserOutput->addModuleStyles( 'ext.cite.styles' ); $parserOutput->addModuleStyles( 'ext.cite.styles' );
$frame->setVolatile(); $frame->setVolatile();
// @phan-suppress-next-line SecurityCheck-XSS False positive
return $result; return $result;
} }
@ -62,7 +62,6 @@ class CiteParserTagHooks {
public static function references( $content, array $attributes, Parser $parser, PPFrame $frame ) { public static function references( $content, array $attributes, Parser $parser, PPFrame $frame ) {
/** @var Cite $cite */ /** @var Cite $cite */
$cite = $parser->extCite; $cite = $parser->extCite;
// @phan-suppress-next-line SecurityCheck-XSS False positive
$result = $cite->references( $content, $attributes, $parser ); $result = $cite->references( $content, $attributes, $parser );
if ( $result === false ) { if ( $result === false ) {
@ -73,6 +72,7 @@ class CiteParserTagHooks {
} }
$frame->setVolatile(); $frame->setVolatile();
// @phan-suppress-next-line SecurityCheck-XSS False positive
return $result; return $result;
} }

6
tests/phpunit/unit/CiteParserTagHooksTest.php
View file

@ -16,9 +16,9 @@ use PPFrame;
class CiteParserTagHooksTest extends \MediaWikiUnitTestCase { class CiteParserTagHooksTest extends \MediaWikiUnitTestCase {
/** /**
* @covers ::initialize * @covers ::register
*/ */
public function testInitialize() { public function testRegister() {
$parser = $this->createMock( Parser::class ); $parser = $this->createMock( Parser::class );
$parser->expects( $this->exactly( 2 ) ) $parser->expects( $this->exactly( 2 ) )
->method( 'setHook' ) ->method( 'setHook' )
@ -27,7 +27,7 @@ class CiteParserTagHooksTest extends \MediaWikiUnitTestCase {
[ 'references', $this->isType( 'callable' ) ] [ 'references', $this->isType( 'callable' ) ]
); );
CiteParserTagHooks::initialize( $parser ); CiteParserTagHooks::register( $parser );
} }
/** /**