From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 24 Apr 2016 12:31:13 +0000 (+0000)
Subject: Merge "Namespace LinkTarget under MediaWiki\Linker"
X-Git-Tag: 1.31.0-rc.0~7199
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=47e2941bcda6b30ca2fca2c34e4f7dfba9d06647;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Namespace LinkTarget under MediaWiki\Linker"
---

47e2941bcda6b30ca2fca2c34e4f7dfba9d06647
diff --combined autoload.php
index d3b7ba7432,946503cc3b..9b155bb57e
--- a/autoload.php
+++ b/autoload.php
@@@ -357,7 -357,7 +357,7 @@@ $wgAutoloadLocalClasses = 
  	'DoubleRedirectJob' => __DIR__ . '/includes/jobqueue/jobs/DoubleRedirectJob.php',
  	'DoubleRedirectsPage' => __DIR__ . '/includes/specials/SpecialDoubleRedirects.php',
  	'DoubleReplacer' => __DIR__ . '/includes/libs/replacers/DoubleReplacer.php',
 -	'DummyLinker' => __DIR__ . '/includes/Linker.php',
 +	'DummyLinker' => __DIR__ . '/includes/DummyLinker.php',
  	'DummyTermColorer' => __DIR__ . '/maintenance/term/MWTerm.php',
  	'Dump7ZipOutput' => __DIR__ . '/includes/export/Dump7ZipOutput.php',
  	'DumpBZip2Output' => __DIR__ . '/includes/export/DumpBZip2Output.php',
@@@ -397,7 -397,6 +397,7 @@@
  	'ErrorPageError' => __DIR__ . '/includes/exception/ErrorPageError.php',
  	'EventRelayer' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
  	'EventRelayerGroup' => __DIR__ . '/includes/EventRelayerGroup.php',
 +	'EventRelayerKafka' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerKafka.php',
  	'EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerNull.php',
  	'Exif' => __DIR__ . '/includes/media/Exif.php',
  	'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php',
@@@ -697,7 -696,6 +697,6 @@@
  	'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
  	'LinkHolderArray' => __DIR__ . '/includes/parser/LinkHolderArray.php',
  	'LinkSearchPage' => __DIR__ . '/includes/specials/SpecialLinkSearch.php',
- 	'LinkTarget' => __DIR__ . '/includes/LinkTarget.php',
  	'Linker' => __DIR__ . '/includes/Linker.php',
  	'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksDeletionUpdate.php',
  	'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php',
@@@ -780,6 -778,7 +779,7 @@@
  	'MediaWikiVersionFetcher' => __DIR__ . '/includes/MediaWikiVersionFetcher.php',
  	'MediaWiki\\Languages\\Data\\Names' => __DIR__ . '/languages/data/Names.php',
  	'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ . '/languages/data/ZhConversion.php',
+ 	'MediaWiki\\Linker\\LinkTarget' => __DIR__ . '/includes/linker/LinkTarget.php',
  	'MediaWiki\\Logger\\LegacyLogger' => __DIR__ . '/includes/debug/logger/LegacyLogger.php',
  	'MediaWiki\\Logger\\LegacySpi' => __DIR__ . '/includes/debug/logger/LegacySpi.php',
  	'MediaWiki\\Logger\\LoggerFactory' => __DIR__ . '/includes/debug/logger/LoggerFactory.php',
diff --combined includes/Linker.php
index 346ae28a29,977d71efb6..ccf948adb6
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@@ -19,6 -19,7 +19,7 @@@
   *
   * @file
   */
+ use MediaWiki\Linker\LinkTarget;
  
  /**
   * Some internal bits split of from Skin.php. These functions are used
@@@ -2360,3 -2361,20 +2361,3 @@@ class Linker 
  
  }
  
 -/**
 - * @since 1.18
 - */
 -class DummyLinker {
 -
 -	/**
 -	 * Use PHP's magic __call handler to transform instance calls to a dummy instance
 -	 * into static calls to the new Linker for backwards compatibility.
 -	 *
 -	 * @param string $fname Name of called method
 -	 * @param array $args Arguments to the method
 -	 * @return mixed
 -	 */
 -	public function __call( $fname, $args ) {
 -		return call_user_func_array( [ 'Linker', $fname ], $args );
 -	}
 -}