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 ChangeTags functions after split of definedTags from tagUsageStatistics"
[lhc/web/wiklou.git]
/
includes
/
db
/
LBFactorySingle.php
diff --git
a/includes/db/LBFactorySingle.php
b/includes/db/LBFactorySingle.php
index
66e9d12
..
a41dadf
100644
(file)
--- a/
includes/db/LBFactorySingle.php
+++ b/
includes/db/LBFactorySingle.php
@@
-26,13
+26,13
@@
*/
class LBFactorySingle extends LBFactory {
/** @var LoadBalancerSingle */
*/
class LBFactorySingle extends LBFactory {
/** @var LoadBalancerSingle */
- pr
otected
$lb;
+ pr
ivate
$lb;
/**
* @param array $conf An associative array with one member:
* - connection: The DatabaseBase connection object
*/
/**
* @param array $conf An associative array with one member:
* - connection: The DatabaseBase connection object
*/
-
function __construct(
$conf ) {
+
public function __construct( array
$conf ) {
$this->lb = new LoadBalancerSingle( $conf );
}
$this->lb = new LoadBalancerSingle( $conf );
}
@@
-40,7
+40,7
@@
class LBFactorySingle extends LBFactory {
* @param bool|string $wiki
* @return LoadBalancerSingle
*/
* @param bool|string $wiki
* @return LoadBalancerSingle
*/
- function newMainLB( $wiki = false ) {
+
public
function newMainLB( $wiki = false ) {
return $this->lb;
}
return $this->lb;
}
@@
-48,7
+48,7
@@
class LBFactorySingle extends LBFactory {
* @param bool|string $wiki
* @return LoadBalancerSingle
*/
* @param bool|string $wiki
* @return LoadBalancerSingle
*/
- function getMainLB( $wiki = false ) {
+
public
function getMainLB( $wiki = false ) {
return $this->lb;
}
return $this->lb;
}
@@
-57,24
+57,24
@@
class LBFactorySingle extends LBFactory {
* @param bool|string $wiki Wiki ID, or false for the current wiki
* @return LoadBalancerSingle
*/
* @param bool|string $wiki Wiki ID, or false for the current wiki
* @return LoadBalancerSingle
*/
- function newExternalLB( $cluster, $wiki = false ) {
+
protected
function newExternalLB( $cluster, $wiki = false ) {
return $this->lb;
}
/**
return $this->lb;
}
/**
- * @param string $cluster
e
xternal storage cluster, or false for core
+ * @param string $cluster
E
xternal storage cluster, or false for core
* @param bool|string $wiki Wiki ID, or false for the current wiki
* @return LoadBalancerSingle
*/
* @param bool|string $wiki Wiki ID, or false for the current wiki
* @return LoadBalancerSingle
*/
- function &getExternalLB( $cluster, $wiki = false ) {
+
public
function &getExternalLB( $cluster, $wiki = false ) {
return $this->lb;
}
/**
return $this->lb;
}
/**
- * @param string|
array
$callback
+ * @param string|
callable
$callback
* @param array $params
*/
* @param array $params
*/
-
function forEachLB( $callback,
$params = array() ) {
+
public function forEachLB( $callback, array
$params = array() ) {
call_user_func_array( $callback, array_merge( array( $this->lb ), $params ) );
}
}
call_user_func_array( $callback, array_merge( array( $this->lb ), $params ) );
}
}
@@
-84,12
+84,12
@@
class LBFactorySingle extends LBFactory {
*/
class LoadBalancerSingle extends LoadBalancer {
/** @var DatabaseBase */
*/
class LoadBalancerSingle extends LoadBalancer {
/** @var DatabaseBase */
- pr
otected
$db;
+ pr
ivate
$db;
/**
/**
- * @param
$params array
+ * @param
array $params
*/
*/
-
function __construct(
$params ) {
+
public function __construct( array
$params ) {
$this->db = $params['connection'];
parent::__construct( array( 'servers' => array( array(
'type' => $this->db->getType(),
$this->db = $params['connection'];
parent::__construct( array( 'servers' => array( array(
'type' => $this->db->getType(),
@@
-106,7
+106,7
@@
class LoadBalancerSingle extends LoadBalancer {
*
* @return DatabaseBase
*/
*
* @return DatabaseBase
*/
- function reallyOpenConnection( $server, $dbNameOverride = false ) {
+
protected
function reallyOpenConnection( $server, $dbNameOverride = false ) {
return $this->db;
}
}
return $this->db;
}
}