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

[lhc/web/wiklou.git] / includes / dao / DBAccessBase.php

diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php
index a9f7b7f..01814c1 100644 (file)
--- a/includes/dao/DBAccessBase.php
+++ b/includes/dao/DBAccessBase.php
@@ -2,7 +2,7 @@
 
 /**
  * Base class for objects that allow access to other wiki's databases using
- * the foreign database access mechanism implemented by LBFactory_multi.
+ * the foreign database access mechanism implemented by LBFactoryMulti.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
  */
 abstract class DBAccessBase implements IDBAccessObject {
        /**
-        * @var String|bool $wiki The target wiki's name. This must be an ID
+        * @var string|bool $wiki The target wiki's name. This must be an ID
         * that LBFactory can understand.
         */
        protected $wiki = false;
@@ -55,7 +55,7 @@ abstract class DBAccessBase implements IDBAccessObject {
         *
         * @return DatabaseBase
         */
-       protected function getConnection( $id, $groups = array() ) {
+       protected function getConnection( $id, $groups = [] ) {
                $loadBalancer = wfGetLB( $this->wiki );
 
                return $loadBalancer->getConnection( $id, $groups, $this->wiki );
@@ -68,7 +68,7 @@ abstract class DBAccessBase implements IDBAccessObject {
         *
         * @since 1.21
         *
-        * @param DatabaseBase $db the database connection to release.
+        * @param DatabaseBase $db The database connection to release.
         */
        protected function releaseConnection( DatabaseBase $db ) {
                if ( $this->wiki !== false ) {