dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix documentation of Maintenance::updateSearchIndex"
[lhc/web/wiklou.git]
/
maintenance
/
Maintenance.php
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
c0dd7f8
..
6beda4e
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-26,6
+26,7
@@
require_once __DIR__ . '/../includes/PHPVersionCheck.php';
wfEntryPointCheck( 'text' );
use MediaWiki\Shell\Shell;
wfEntryPointCheck( 'text' );
use MediaWiki\Shell\Shell;
+use Wikimedia\Rdbms\IResultWrapper;
/**
* @defgroup MaintenanceArchive Maintenance archives
/**
* @defgroup MaintenanceArchive Maintenance archives
@@
-358,7
+359,7
@@
abstract class Maintenance {
wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
}
wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
}
- return $this->
hasArg( $argId ) ? $this->mArgs[$argId] :
$default;
+ return $this->
mArgs[$argId] ??
$default;
}
/**
}
/**
@@
-721,7
+722,7
@@
abstract class Maintenance {
}
/**
}
/**
- * @var
$child Maintenance
+ * @var
Maintenance $child
*/
$child = new $maintClass();
$child->loadParamsAndArgs( $this->mSelf, $this->mOptions, $this->mArgs );
*/
$child = new $maintClass();
$child->loadParamsAndArgs( $this->mSelf, $this->mOptions, $this->mArgs );
@@
-1195,7
+1196,7
@@
abstract class Maintenance {
if ( $wgDBservers ) {
/**
if ( $wgDBservers ) {
/**
- * @var
$wgDBservers array
+ * @var
array $wgDBservers
*/
foreach ( $wgDBservers as $i => $server ) {
$wgDBservers[$i]['user'] = $wgDBuser;
*/
foreach ( $wgDBservers as $i => $server ) {
$wgDBservers[$i]['user'] = $wgDBuser;
@@
-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.
/**
* 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 IMaintainableDatabase $dbw
- * @param array $results
+ * @param array
|IResultWrapper
$results
*/
public function updateSearchIndex( $maxLockTime, $callback, $dbw, $results ) {
$lockTime = time();
*/
public function updateSearchIndex( $maxLockTime, $callback, $dbw, $results ) {
$lockTime = time();
@@
-1724,7
+1725,7
@@
abstract class LoggedUpdateMaintenance extends Maintenance {
return false;
}
return false;
}
- $db->insert( 'updatelog', [ 'ul_key' => $key ], __METHOD__,
'IGNORE'
);
+ $db->insert( 'updatelog', [ 'ul_key' => $key ], __METHOD__,
[ 'IGNORE' ]
);
return true;
}
return true;
}