From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 16 Jun 2019 22:13:02 +0000 (+0100)
Subject: search: clean up some type hints in search classes
X-Git-Tag: 1.34.0-rc.0~1386^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=a15be13371d8da46d22f389216db2e84e659a68f;p=lhc%2Fweb%2Fwiklou.git

search: clean up some type hints in search classes

Change-Id: I357a78b42ea02a63c3b64e8982f04314cbbfdf9f
---

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 9771e8881e..31b3a3f69a 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -106,7 +106,7 @@ abstract class SearchEngine {
 	 * 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 @@ abstract class SearchEngine {
 	 * 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 --git a/includes/search/SqlSearchResultSet.php b/includes/search/SqlSearchResultSet.php
index 022dc0a643..8ca5bbc2b9 100644
--- a/includes/search/SqlSearchResultSet.php
+++ b/includes/search/SqlSearchResultSet.php
@@ -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 */
 	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;
@@ -51,7 +53,7 @@ class SqlSearchResultSet extends SearchResultSet {
 
 	function free() {
 		if ( $this->resultSet === false ) {
-			return false;
+			return;
 		}
 
 		$this->resultSet->free();