Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / db / DBConnRef.php

diff --git a/includes/db/DBConnRef.php b/includes/db/DBConnRef.php
index f09de4f..d73ba85 100644 (file)
--- a/includes/db/DBConnRef.php
+++ b/includes/db/DBConnRef.php
@@ -36,7 +36,7 @@ class DBConnRef implements IDatabase {
                        $this->conn = $this->lb->getConnection( $db, $groups, $wiki );
                }
 
-               return call_user_func_array( array( $this->conn, $name ), $arguments );
+               return call_user_func_array( [ $this->conn, $name ], $arguments );
        }
 
        public function getServerInfo() {
@@ -212,46 +212,46 @@ class DBConnRef implements IDatabase {
        }
 
        public function selectField(
-               $table, $var, $cond = '', $fname = __METHOD__, $options = array()
+               $table, $var, $cond = '', $fname = __METHOD__, $options = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
        public function selectFieldValues(
-               $table, $var, $cond = '', $fname = __METHOD__, $options = array()
+               $table, $var, $cond = '', $fname = __METHOD__, $options = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
        public function select(
                $table, $vars, $conds = '', $fname = __METHOD__,
-               $options = array(), $join_conds = array()
+               $options = [], $join_conds = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
        public function selectSQLText(
                $table, $vars, $conds = '', $fname = __METHOD__,
-               $options = array(), $join_conds = array()
+               $options = [], $join_conds = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
        public function selectRow(
                $table, $vars, $conds, $fname = __METHOD__,
-               $options = array(), $join_conds = array()
+               $options = [], $join_conds = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
        public function estimateRowCount(
-               $table, $vars = '*', $conds = '', $fname = __METHOD__, $options = array()
+               $table, $vars = '*', $conds = '', $fname = __METHOD__, $options = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
        public function selectRowCount(
-               $tables, $vars = '*', $conds = '', $fname = __METHOD__, $options = array(), $join_conds = array()
+               $tables, $vars = '*', $conds = '', $fname = __METHOD__, $options = [], $join_conds = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
@@ -272,11 +272,11 @@ class DBConnRef implements IDatabase {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
-       public function insert( $table, $a, $fname = __METHOD__, $options = array() ) {
+       public function insert( $table, $a, $fname = __METHOD__, $options = [] ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
-       public function update( $table, $values, $conds, $fname = __METHOD__, $options = array() ) {
+       public function update( $table, $values, $conds, $fname = __METHOD__, $options = [] ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
@@ -305,7 +305,7 @@ class DBConnRef implements IDatabase {
        }
 
        public function buildGroupConcatField(
-               $delim, $table, $field, $conds = '', $join_conds = array()
+               $delim, $table, $field, $conds = '', $join_conds = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
@@ -364,7 +364,7 @@ class DBConnRef implements IDatabase {
 
        public function insertSelect(
                $destTable, $srcTable, $varMap, $conds,
-               $fname = __METHOD__, $insertOptions = array(), $selectOptions = array()
+               $fname = __METHOD__, $insertOptions = [], $selectOptions = []
        ) {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
@@ -505,6 +505,10 @@ class DBConnRef implements IDatabase {
                return $this->__call( __FUNCTION__, func_get_args() );
        }
 
+       public function getScopedLockAndFlush( $lockKey, $fname, $timeout ) {
+               return $this->__call( __FUNCTION__, func_get_args() );
+       }
+
        public function namedLocksEnqueue() {
                return $this->__call( __FUNCTION__, func_get_args() );
        }