X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ffilerepo%2FForeignDBRepo.php;h=4b331389b7b954c31c9c89289c4b60cedc09cfae;hb=8085c58a4b675c0c11c6454bdf15b3ba61022283;hp=3e8850823ef5464af7fb02e2ca12f0da3b23e87e;hpb=c584722cc2e3d33edae58d46c2149063b3fc6d72;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filerepo/ForeignDBRepo.php b/includes/filerepo/ForeignDBRepo.php index 3e8850823e..4b331389b7 100644 --- a/includes/filerepo/ForeignDBRepo.php +++ b/includes/filerepo/ForeignDBRepo.php @@ -21,6 +21,9 @@ * @ingroup FileRepo */ +use Wikimedia\Rdbms\Database; +use Wikimedia\Rdbms\IDatabase; + /** * A foreign repository with an accessible MediaWiki database * @@ -55,9 +58,9 @@ class ForeignDBRepo extends LocalRepo { protected $dbConn; /** @var callable */ - protected $fileFactory = [ 'ForeignDBFile', 'newFromTitle' ]; + protected $fileFactory = [ ForeignDBFile::class, 'newFromTitle' ]; /** @var callable */ - protected $fileFromRowFactory = [ 'ForeignDBFile', 'newFromRow' ]; + protected $fileFromRowFactory = [ ForeignDBFile::class, 'newFromRow' ]; /** * @param array|null $info @@ -129,9 +132,8 @@ class ForeignDBRepo extends LocalRepo { 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; }