From a0fc2000e048d9e97e277c0e36ff2c290e815bfd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thiemo=20M=C3=A4ttig?= Date: Thu, 20 Nov 2014 16:22:11 +0100 Subject: [PATCH] Add array type hints to LoadBalancer classes Change-Id: I3dde038a71da8f775074916d47fa7f34eb37bf3f --- includes/db/LBFactory.php | 14 +++++++------- includes/db/LBFactoryMulti.php | 4 ++-- includes/db/LBFactorySingle.php | 6 +++--- includes/db/LoadBalancer.php | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/includes/db/LBFactory.php b/includes/db/LBFactory.php index 73456e2308..2f93ce70e3 100644 --- a/includes/db/LBFactory.php +++ b/includes/db/LBFactory.php @@ -109,7 +109,7 @@ abstract class LBFactory { * Construct a factory based on a configuration array (typically from $wgLBFactoryConf) * @param array $conf */ - abstract function __construct( $conf ); + abstract function __construct( array $conf ); /** * Create a new load balancer object. The resulting object will be untracked, @@ -156,7 +156,7 @@ abstract class LBFactory { * @param callable $callback * @param array $params */ - abstract function forEachLB( $callback, $params = array() ); + abstract function forEachLB( $callback, array $params = array() ); /** * Prepare all tracked load balancers for shutdown @@ -171,7 +171,7 @@ abstract class LBFactory { * @param string $methodName * @param array $args */ - function forEachLBCallMethod( $methodName, $args = array() ) { + function forEachLBCallMethod( $methodName, array $args = array() ) { $this->forEachLB( array( $this, 'callMethod' ), array( $methodName, $args ) ); } @@ -227,7 +227,7 @@ class LBFactorySimple extends LBFactory { /** @var ChronologyProtector */ protected $chronProt; - function __construct( $conf ) { + function __construct( array $conf ) { $this->chronProt = new ChronologyProtector; } @@ -324,7 +324,7 @@ class LBFactorySimple extends LBFactory { * @param callable $callback * @param array $params */ - function forEachLB( $callback, $params = array() ) { + function forEachLB( $callback, array $params = array() ) { if ( isset( $this->mainLB ) ) { call_user_func_array( $callback, array_merge( array( $this->mainLB ), $params ) ); } @@ -352,7 +352,7 @@ class LBFactorySimple extends LBFactory { * LBFactory::enableBackend() to return to normal behavior */ class LBFactoryFake extends LBFactory { - function __construct( $conf ) { + function __construct( array $conf ) { } function newMainLB( $wiki = false ) { @@ -371,7 +371,7 @@ class LBFactoryFake extends LBFactory { throw new DBAccessError; } - function forEachLB( $callback, $params = array() ) { + function forEachLB( $callback, array $params = array() ) { } } diff --git a/includes/db/LBFactoryMulti.php b/includes/db/LBFactoryMulti.php index bac9652342..7100615694 100644 --- a/includes/db/LBFactoryMulti.php +++ b/includes/db/LBFactoryMulti.php @@ -152,7 +152,7 @@ class LBFactoryMulti extends LBFactory { * @param array $conf * @throws MWException */ - function __construct( $conf ) { + function __construct( array $conf ) { $this->chronProt = new ChronologyProtector; $this->conf = $conf; $required = array( 'sectionsByDB', 'sectionLoads', 'serverTemplate' ); @@ -377,7 +377,7 @@ class LBFactoryMulti extends LBFactory { * @param callable $callback * @param array $params */ - function forEachLB( $callback, $params = array() ) { + function forEachLB( $callback, array $params = array() ) { foreach ( $this->mainLBs as $lb ) { call_user_func_array( $callback, array_merge( array( $lb ), $params ) ); } diff --git a/includes/db/LBFactorySingle.php b/includes/db/LBFactorySingle.php index 3a4d829b3e..03b7fbe9cf 100644 --- a/includes/db/LBFactorySingle.php +++ b/includes/db/LBFactorySingle.php @@ -32,7 +32,7 @@ class LBFactorySingle extends LBFactory { * @param array $conf An associative array with one member: * - connection: The DatabaseBase connection object */ - function __construct( $conf ) { + function __construct( array $conf ) { $this->lb = new LoadBalancerSingle( $conf ); } @@ -74,7 +74,7 @@ class LBFactorySingle extends LBFactory { * @param string|callable $callback * @param array $params */ - function forEachLB( $callback, $params = array() ) { + function forEachLB( $callback, array $params = array() ) { call_user_func_array( $callback, array_merge( array( $this->lb ), $params ) ); } } @@ -89,7 +89,7 @@ class LoadBalancerSingle extends LoadBalancer { /** * @param array $params */ - function __construct( $params ) { + function __construct( array $params ) { $this->db = $params['connection']; parent::__construct( array( 'servers' => array( array( 'type' => $this->db->getType(), diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index 19ef3763ed..4e11af2e24 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -67,7 +67,7 @@ class LoadBalancer { * loadMonitor Name of a class used to fetch server lag and load. * @throws MWException */ - function __construct( $params ) { + function __construct( array $params ) { if ( !isset( $params['servers'] ) ) { throw new MWException( __CLASS__ . ': missing servers parameter' ); } @@ -144,7 +144,7 @@ class LoadBalancer { * @param array $weights * @return bool|int|string */ - function pickRandom( $weights ) { + function pickRandom( array $weights ) { return ArrayUtils::pickRandom( $weights ); } @@ -153,7 +153,7 @@ class LoadBalancer { * @param bool|string $wiki Wiki to get non-lagged for * @return bool|int|string */ - function getRandomNonLagged( $loads, $wiki = false ) { + function getRandomNonLagged( array $loads, $wiki = false ) { # Unset excessively lagged servers $lags = $this->getLagTimes( $wiki ); foreach ( $lags as $i => $lag ) { @@ -857,7 +857,7 @@ class LoadBalancer { * @param int $i * @param array $serverInfo */ - function setServerInfo( $i, $serverInfo ) { + function setServerInfo( $i, array $serverInfo ) { $this->mServers[$i] = $serverInfo; } @@ -1071,7 +1071,7 @@ class LoadBalancer { * @param callable $callback * @param array $params */ - function forEachOpenConnection( $callback, $params = array() ) { + function forEachOpenConnection( $callback, array $params = array() ) { foreach ( $this->mConns as $conns2 ) { foreach ( $conns2 as $conns3 ) { foreach ( $conns3 as $conn ) { -- 2.20.1