X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=maintenance%2FMaintenance.php;h=6beda4e3e308553423419ae670191e32c859fe78;hb=d1401ab5f1a189c4895468344a5febda70bc47ee;hp=c88a1a02044353dadff369f7c20380fece69532c;hpb=19fe64a134233613126cdbd8e4db7f24b693116d;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index c88a1a0204..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 @@ -358,7 +359,7 @@ abstract class Maintenance { wfDeprecated( __METHOD__ . ' without an $argId', '1.33' ); } - return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default; + return $this->mArgs[$argId] ?? $default; } /** @@ -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(); @@ -1724,7 +1725,7 @@ abstract class LoggedUpdateMaintenance extends Maintenance { return false; } - $db->insert( 'updatelog', [ 'ul_key' => $key ], __METHOD__, 'IGNORE' ); + $db->insert( 'updatelog', [ 'ul_key' => $key ], __METHOD__, [ 'IGNORE' ] ); return true; }