mirror of
https://github.com/diocloid/LinkTitles.git
synced 2025-07-13 01:39:30 +02:00
Do not use the reserved word default as function name.
This commit is contained in:
@ -76,8 +76,8 @@ class Linker {
|
|||||||
$limitReached = false;
|
$limitReached = false;
|
||||||
$newLinks = false; // whether or not new links were added
|
$newLinks = false; // whether or not new links were added
|
||||||
$newText = $source->getText();
|
$newText = $source->getText();
|
||||||
$splitter = Splitter::default( $this->config );
|
$splitter = Splitter::singleton( $this->config );
|
||||||
$targets = Targets::default( $source->getTitle(), $this->config );
|
$targets = Targets::singleton( $source->getTitle(), $this->config );
|
||||||
|
|
||||||
// Iterate through the target page titles
|
// Iterate through the target page titles
|
||||||
foreach( $targets->queryResult as $row ) {
|
foreach( $targets->queryResult as $row ) {
|
||||||
|
@ -52,7 +52,7 @@ class Splitter {
|
|||||||
*
|
*
|
||||||
* @param Config|null $config LinkTitles configuration.
|
* @param Config|null $config LinkTitles configuration.
|
||||||
*/
|
*/
|
||||||
public static function default( Config &$config = null ) {
|
public static function singleton( Config &$config = null ) {
|
||||||
if ( self::$instance === null ) {
|
if ( self::$instance === null ) {
|
||||||
if ( $config === null ) {
|
if ( $config === null ) {
|
||||||
$config = new Config();
|
$config = new Config();
|
||||||
|
@ -40,7 +40,7 @@ class Targets {
|
|||||||
* @param String $sourceNamespace The namespace of the current page.
|
* @param String $sourceNamespace The namespace of the current page.
|
||||||
* @param Config $config LinkTitles configuration.
|
* @param Config $config LinkTitles configuration.
|
||||||
*/
|
*/
|
||||||
public static function default( \Title $title, Config $config ) {
|
public static function singleton( \Title $title, Config $config ) {
|
||||||
if ( ( self::$instance === null ) || ( self::$instance->sourceNamespace != $title->getNamespace() ) ) {
|
if ( ( self::$instance === null ) || ( self::$instance->sourceNamespace != $title->getNamespace() ) ) {
|
||||||
self::$instance = new Targets( $title, $config );
|
self::$instance = new Targets( $title, $config );
|
||||||
}
|
}
|
||||||
@ -48,7 +48,7 @@ class Targets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Invalidates the cache; the next call of Targets::default() will trigger
|
* Invalidates the cache; the next call of Targets::singleton() will trigger
|
||||||
* a database query.
|
* a database query.
|
||||||
*
|
*
|
||||||
* Use this in unit tests which are performed in a single request cycle so that
|
* Use this in unit tests which are performed in a single request cycle so that
|
||||||
|
@ -34,7 +34,7 @@ class SplitterTest extends MediaWikiTestCase {
|
|||||||
$config->skipTemplates = $skipTemplates;
|
$config->skipTemplates = $skipTemplates;
|
||||||
$config->parseHeadings = $parseHeadings;
|
$config->parseHeadings = $parseHeadings;
|
||||||
LinkTitles\Splitter::invalidate();
|
LinkTitles\Splitter::invalidate();
|
||||||
$splitter = LinkTitles\Splitter::default( $config );
|
$splitter = LinkTitles\Splitter::singleton( $config );
|
||||||
$this->assertSame( $skipTemplates, $splitter->config->skipTemplates, 'Splitter has incorrect skipTemplates config');
|
$this->assertSame( $skipTemplates, $splitter->config->skipTemplates, 'Splitter has incorrect skipTemplates config');
|
||||||
$this->assertSame( $parseHeadings, $splitter->config->parseHeadings, 'Splitter has incorrect parseHeadings config');
|
$this->assertSame( $parseHeadings, $splitter->config->parseHeadings, 'Splitter has incorrect parseHeadings config');
|
||||||
$this->assertSame( $expectedOutput, $splitter->split( $input ) );
|
$this->assertSame( $expectedOutput, $splitter->split( $input ) );
|
||||||
|
@ -34,7 +34,7 @@ class TargetsTest extends LinkTitles\TestCase {
|
|||||||
*/
|
*/
|
||||||
public function testTargets() {
|
public function testTargets() {
|
||||||
$title = \Title::newFromText( 'link target' );
|
$title = \Title::newFromText( 'link target' );
|
||||||
$targets = LinkTitles\Targets::default( $title, new LinkTitles\Config() );
|
$targets = LinkTitles\Targets::singleton( $title, new LinkTitles\Config() );
|
||||||
|
|
||||||
// Count number of articles: Inspired by updateArticleCount.php maintenance
|
// Count number of articles: Inspired by updateArticleCount.php maintenance
|
||||||
// script: https://doc.wikimedia.org/mediawiki-core/master/php/updateArticleCount_8php_source.html
|
// script: https://doc.wikimedia.org/mediawiki-core/master/php/updateArticleCount_8php_source.html
|
||||||
|
Reference in New Issue
Block a user