From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 17 Jun 2019 07:54:27 +0000 (+0000)
Subject: Merge "Fix param type of search terms in search related classes"
X-Git-Tag: 1.34.0-rc.0~1384
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%22http:/wikimediafoundation.org/fundraising/%7B%7B%20url_for%28%27user_settings%27%2C%20userid=session.userid%29%20%7D%7D?a=commitdiff_plain;h=8ffabe23a195e47af2a117a2a917a280b3459255;p=lhc%2Fweb%2Fwiklou.git

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

8ffabe23a195e47af2a117a2a917a280b3459255
diff --cc includes/search/SqlSearchResultSet.php
index 8ca5bbc2b9,31ac83b688..f4e4a23abe
--- a/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;