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 "rdbms: split out private LoadBalancer::openLocalConnection method"
[lhc/web/wiklou.git]
/
includes
/
libs
/
lockmanager
/
RedisLockManager.php
diff --git
a/includes/libs/lockmanager/RedisLockManager.php
b/includes/libs/lockmanager/RedisLockManager.php
index
ea9dde7
..
a624f0a
100644
(file)
--- a/
includes/libs/lockmanager/RedisLockManager.php
+++ b/
includes/libs/lockmanager/RedisLockManager.php
@@
-76,7
+76,7
@@
class RedisLockManager extends QuorumLockManager {
protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
$status = StatusValue::newGood();
protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
$status = StatusValue::newGood();
- $pathList =
call_user_func_array( 'array_merge',
array_values( $pathsByType ) );
+ $pathList =
array_merge( ...
array_values( $pathsByType ) );
$server = $this->lockServers[$lockSrv];
$conn = $this->redisPool->getConnection( $server, $this->logger );
$server = $this->lockServers[$lockSrv];
$conn = $this->redisPool->getConnection( $server, $this->logger );
@@
-171,7
+171,7
@@
LUA;
protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
$status = StatusValue::newGood();
protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
$status = StatusValue::newGood();
- $pathList =
call_user_func_array( 'array_merge',
array_values( $pathsByType ) );
+ $pathList =
array_merge( ...
array_values( $pathsByType ) );
$server = $this->lockServers[$lockSrv];
$conn = $this->redisPool->getConnection( $server, $this->logger );
$server = $this->lockServers[$lockSrv];
$conn = $this->redisPool->getConnection( $server, $this->logger );