From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 10 Jun 2019 20:18:53 +0000 (+0000)
Subject: Merge "Fix documentation of Maintenance::updateSearchIndex"
X-Git-Tag: 1.34.0-rc.0~1472
X-Git-Url: http://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=f444e41fb513123952f53a83eb438beec8370339;hp=3d3198f4b0ab4d070e65e3c2c8706b73f2dbddbb;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix documentation of Maintenance::updateSearchIndex"
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 1b17e8c355..6beda4e3e3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -26,6 +26,7 @@ require_once __DIR__ . '/../includes/PHPVersionCheck.php';
 wfEntryPointCheck( 'text' );
 
 use MediaWiki\Shell\Shell;
+use Wikimedia\Rdbms\IResultWrapper;
 
 /**
  * @defgroup MaintenanceArchive Maintenance archives
@@ -1478,9 +1479,9 @@ abstract class Maintenance {
 	/**
 	 * Perform a search index update with locking
 	 * @param int $maxLockTime The maximum time to keep the search index locked.
-	 * @param string $callback The function that will update the function.
+	 * @param callable $callback The function that will update the function.
 	 * @param IMaintainableDatabase $dbw
-	 * @param array $results
+	 * @param array|IResultWrapper $results
 	 */
 	public function updateSearchIndex( $maxLockTime, $callback, $dbw, $results ) {
 		$lockTime = time();