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

diff --cc includes/search/SearchEngine.php
Simple merge

diff --cc includes/search/SearchResult.php
Simple merge

diff --cc includes/search/SqlSearchResultSet.php
index 8ca5bbc,31ac83b..f4e4a23
--- 1/includes/search/SqlSearchResultSet.php
--- 2/includes/search/SqlSearchResultSet.php
+++ b/includes/search/SqlSearchResultSet.php
@@@ -7,11 -7,9 +7,11 @@@ use Wikimedia\Rdbms\IResultWrapper
   * @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;

diff --cc includes/widget/search/FullSearchResultWidget.php
Simple merge