Merge "Update type of PermissionManager::resultToError"

diff --combined includes/Title.php
index cf81b98,0e95791..f69f1a4
--- 1/includes/Title.php
--- 2/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 == '';