Merge "Fix param type of search terms in search related classes"

diff --combined includes/search/SearchEngine.php
index 31b3a3f,7cc0ba1..fa6e7fd
--- 1/includes/search/SearchEngine.php
--- 2/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@@ -46,7 -46,7 +46,7 @@@ abstract class SearchEngine 
        /** @var int */
        protected $offset = 0;
  
-       /** @var array|string */
+       /** @var string[] */
        protected $searchTerms = [];
  
        /** @var bool */
@@@ -106,7 -106,7 +106,7 @@@
         * be converted to final in 1.34. Override self::doSearchArchiveTitle().
         *
         * @param string $term Raw search term
 -       * @return Status<Title[]>
 +       * @return Status
         * @since 1.29
         */
        public function searchArchiveTitle( $term ) {
@@@ -117,7 -117,7 +117,7 @@@
         * Perform a title search in the article archive.
         *
         * @param string $term Raw search term
 -       * @return Status<Title[]>
 +       * @return Status
         * @since 1.32
         */
        protected function doSearchArchiveTitle( $term ) {

diff --combined includes/search/SearchResult.php
index 7e51432,30d7be7..a27d719
--- 1/includes/search/SearchResult.php
--- 2/includes/search/SearchResult.php
+++ b/includes/search/SearchResult.php
@@@ -86,17 -86,16 +86,17 @@@ class SearchResult 
         */
        protected function initFromTitle( $title ) {
                $this->mTitle = $title;
 +              $services = MediaWikiServices::getInstance();
                if ( !is_null( $this->mTitle ) ) {
                        $id = false;
                        Hooks::run( 'SearchResultInitFromTitle', [ $title, &$id ] );
                        $this->mRevision = Revision::newFromTitle(
                                $this->mTitle, $id, Revision::READ_NORMAL );
                        if ( $this->mTitle->getNamespace() === NS_FILE ) {
 -                              $this->mImage = wfFindFile( $this->mTitle );
 +                              $this->mImage = $services->getRepoGroup()->findFile( $this->mTitle );
                        }
                }
 -              $this->searchEngine = MediaWikiServices::getInstance()->newSearchEngine();
 +              $this->searchEngine = $services->newSearchEngine();
        }
  
        /**
@@@ -147,7 -146,7 +147,7 @@@
        }
  
        /**
-        * @param array $terms Terms to highlight
+        * @param string[] $terms Terms to highlight
         * @return string Highlighted text snippet, null (and not '') if not supported
         */
        function getTextSnippet( $terms ) {

diff --combined includes/search/SqlSearchResultSet.php
index 8ca5bbc,31ac83b..f4e4a23
--- 1/includes/search/SqlSearchResultSet.php
--- 2/includes/search/SqlSearchResultSet.php
+++ b/includes/search/SqlSearchResultSet.php
@@@ -1,22 -1,20 +1,22 @@@
  <?php
  
 -use Wikimedia\Rdbms\ResultWrapper;
 +use Wikimedia\Rdbms\IResultWrapper;
  
  /**
   * This class is used for different SQL-based search engines shipped with MediaWiki
   * @ingroup Search
   */
  class SqlSearchResultSet extends SearchResultSet {
 -      /** @var ResultWrapper Result object from database */
 +      /** @noinspection PhpMissingParentConstructorInspection */
 +
 +      /** @var IResultWrapper Result object from database */
        protected $resultSet;
-       /** @var string Requested search query */
+       /** @var string[] Requested search query */
        protected $terms;
        /** @var int|null Total number of hits for $terms */
        protected $totalHits;
  
 -      function __construct( ResultWrapper $resultSet, $terms, $total = null ) {
 +      function __construct( IResultWrapper $resultSet, $terms, $total = null ) {
                $this->resultSet = $resultSet;
                $this->terms = $terms;
                $this->totalHits = $total;
@@@ -53,7 -51,7 +53,7 @@@
  
        function free() {
                if ( $this->resultSet === false ) {
 -                      return false;
 +                      return;
                }
  
                $this->resultSet->free();

diff --combined includes/widget/search/FullSearchResultWidget.php
index 74d15a4,4d246e4..f648535
--- 1/includes/widget/search/FullSearchResultWidget.php
--- 2/includes/widget/search/FullSearchResultWidget.php
+++ b/includes/widget/search/FullSearchResultWidget.php
@@@ -6,7 -6,6 +6,7 @@@ use Category
  use Hooks;
  use HtmlArmor;
  use MediaWiki\Linker\LinkRenderer;
 +use MediaWiki\MediaWikiServices;
  use SearchResult;
  use SpecialSearch;
  use Title;
@@@ -31,7 -30,7 +31,7 @@@ class FullSearchResultWidget implement
  
        /**
         * @param SearchResult $result The result to render
-        * @param string $terms Terms to be highlighted (@see SearchResult::getTextSnippet)
+        * @param string[] $terms Terms to be highlighted (@see SearchResult::getTextSnippet)
         * @param int $position The result position, including offset
         * @return string HTML
         */
@@@ -48,10 -47,7 +48,10 @@@
                // This is not quite safe, but better than showing excerpts from
                // non-readable pages. Note that hiding the entry entirely would
                // screw up paging (really?).
 -              if ( !$result->getTitle()->userCan( 'read', $this->specialPage->getUser() ) ) {
 +              $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 +              if ( !$permissionManager->userCan(
 +                      'read', $this->specialPage->getUser(), $result->getTitle()
 +              ) ) {
                        return "<li>{$link}</li>";
                }
  
@@@ -121,7 -117,7 +121,7 @@@
         * title with highlighted words).
         *
         * @param SearchResult $result
-        * @param string $terms
+        * @param string[] $terms
         * @param int $position
         * @return string HTML
         */
@@@ -252,8 -248,7 +252,8 @@@
                $descHtml = null;
                $thumbHtml = null;
  
 -              $img = $result->getFile() ?: wfFindFile( $title );
 +              $img = $result->getFile() ?: MediaWikiServices::getInstance()->getRepoGroup()
 +                      ->findFile( $title );
                if ( $img ) {
                        $thumb = $img->transform( [ 'width' => 120, 'height' => 120 ] );
                        if ( $thumb ) {