From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 18 Jun 2019 19:38:39 +0000 (+0000)
Subject: Merge "Update type of PermissionManager::resultToError"
X-Git-Tag: 1.34.0-rc.0~1360
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27user%27%2C%20userid=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=7426d04a703580552fe27d06d3566f1ae63ae92f;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Update type of PermissionManager::resultToError"
---

7426d04a703580552fe27d06d3566f1ae63ae92f
diff --combined includes/Title.php
index cf81b98e22,0e957912e3..f69f1a4503
--- a/includes/Title.php
+++ b/includes/Title.php
@@@ -1979,7 -1979,7 +1979,7 @@@ class Title implements LinkTarget, IDBA
  	 *
  	 * @param string|string[] $query An optional query string,
  	 *   not used for interwiki links. Can be specified as an associative array as well,
 -	 *   e.g., array( 'action' => 'edit' ) (keys and values will be URL-escaped).
 +	 *   e.g., [ 'action' => 'edit' ] (keys and values will be URL-escaped).
  	 *   Some query patterns will trigger various shorturl path replacements.
  	 * @param string|string[]|bool $query2 An optional secondary query array. This one MUST
  	 *   be an array. If a string is passed it will be interpreted as a deprecated
@@@ -2256,7 -2256,7 +2256,7 @@@
  	 * Add the resulting error code to the errors array
  	 *
  	 * @param array $errors List of current errors
- 	 * @param array $result Result of errors
+ 	 * @param array|string|MessageSpecifier|false $result Result of errors
  	 *
  	 * @return array List of errors
  	 */
@@@ -3584,8 -3584,7 +3584,8 @@@
  
  		# Is it an existing file?
  		if ( $nt->getNamespace() == NS_FILE ) {
 -			$file = wfLocalFile( $nt );
 +			$file = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
 +				->newFile( $nt );
  			$file->load( File::READ_LATEST );
  			if ( $file->exists() ) {
  				wfDebug( __METHOD__ . ": file exists\n" );
@@@ -4057,15 -4056,15 +4057,15 @@@
  			return true; // any interwiki link might be viewable, for all we know
  		}
  
 +		$services = MediaWikiServices::getInstance();
  		switch ( $this->mNamespace ) {
  			case NS_MEDIA:
  			case NS_FILE:
  				// file exists, possibly in a foreign repo
 -				return (bool)wfFindFile( $this );
 +				return (bool)$services->getRepoGroup()->findFile( $this );
  			case NS_SPECIAL:
  				// valid special page
 -				return MediaWikiServices::getInstance()->getSpecialPageFactory()->
 -					exists( $this->mDbkeyform );
 +				return $services->getSpecialPageFactory()->exists( $this->mDbkeyform );
  			case NS_MAIN:
  				// selflink, possibly with fragment
  				return $this->mDbkeyform == '';