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
Replace call_user_func_array(), part 1
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
ForeignDBRepo.php
diff --git
a/includes/filerepo/ForeignDBRepo.php
b/includes/filerepo/ForeignDBRepo.php
index
3e88508
..
4b33138
100644
(file)
--- a/
includes/filerepo/ForeignDBRepo.php
+++ b/
includes/filerepo/ForeignDBRepo.php
@@
-21,6
+21,9
@@
* @ingroup FileRepo
*/
* @ingroup FileRepo
*/
+use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
+
/**
* A foreign repository with an accessible MediaWiki database
*
/**
* A foreign repository with an accessible MediaWiki database
*
@@
-55,9
+58,9
@@
class ForeignDBRepo extends LocalRepo {
protected $dbConn;
/** @var callable */
protected $dbConn;
/** @var callable */
- protected $fileFactory = [
'ForeignDBFile'
, 'newFromTitle' ];
+ protected $fileFactory = [
ForeignDBFile::class
, 'newFromTitle' ];
/** @var callable */
/** @var callable */
- protected $fileFromRowFactory = [
'ForeignDBFile'
, 'newFromRow' ];
+ protected $fileFromRowFactory = [
ForeignDBFile::class
, 'newFromRow' ];
/**
* @param array|null $info
/**
* @param array|null $info
@@
-129,9
+132,8
@@
class ForeignDBRepo extends LocalRepo {
function getSharedCacheKey( /*...*/ ) {
if ( $this->hasSharedCache() ) {
$args = func_get_args();
function getSharedCacheKey( /*...*/ ) {
if ( $this->hasSharedCache() ) {
$args = func_get_args();
- array_unshift( $args, $this->dbName, $this->tablePrefix );
- return
call_user_func_array( 'wfForeignMemcKey',
$args );
+ return
wfForeignMemcKey( $this->dbName, $this->tablePrefix, ...
$args );
} else {
return false;
}
} else {
return false;
}