diocloid/LinkTitles
1
0
Fork 0
mirror of https://github.com/diocloid/LinkTitles.git synced 2025-07-13 01:39:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not use the reserved word default as function name.

Browse Source
This commit is contained in:
Daniel Kraus
2017-09-01 05:39:51 +02:00
parent ac15eb0f5d
commit 96bce45172
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/Linker.php
View File

@ -76,8 +76,8 @@ class Linker {
$limitReached = false;
$newLinks = false; // whether or not new links were added
$newText = $source->getText();
$splitter = Splitter::default( $this->config );
$targets = Targets::default( $source->getTitle(), $this->config );
$splitter = Splitter::singleton( $this->config );
$targets = Targets::singleton( $source->getTitle(), $this->config );
// Iterate through the target page titles
foreach( $targets->queryResult as $row ) {

2
includes/Splitter.php
View File

@ -52,7 +52,7 @@ class Splitter {
*
* @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 ( $config === null ) {
$config = new Config();

4
includes/Targets.php
View File

@ -40,7 +40,7 @@ class Targets {
* @param String $sourceNamespace The namespace of the current page.
* @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() ) ) {
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.
*
* Use this in unit tests which are performed in a single request cycle so that

2
tests/phpunit/SplitterTest.php
View File

@ -34,7 +34,7 @@ class SplitterTest extends MediaWikiTestCase {
$config->skipTemplates = $skipTemplates;
$config->parseHeadings = $parseHeadings;
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( $parseHeadings, $splitter->config->parseHeadings, 'Splitter has incorrect parseHeadings config');
$this->assertSame( $expectedOutput, $splitter->split( $input ) );

2
tests/phpunit/TargetsTest.php
View File

@ -34,7 +34,7 @@ class TargetsTest extends LinkTitles\TestCase {
*/
public function testTargets() {
$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
// script: https://doc.wikimedia.org/mediawiki-core/master/php/updateArticleCount_8php_source.html