Merge "Use classes to apply the 'editfont' preference"

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

diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php
index 2a0fde3..ed617fe 100644 (file)
--- a/includes/dao/DBAccessBase.php
+++ b/includes/dao/DBAccessBase.php
@@ -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,9 +68,9 @@ abstract class DBAccessBase implements IDBAccessObject {
         *
         * @since 1.21
         *
-        * @param DatabaseBase $db the database connection to release.
+        * @param Database $db The database connection to release.
         */
-       protected function releaseConnection( DatabaseBase $db ) {
+       protected function releaseConnection( Database $db ) {
                if ( $this->wiki !== false ) {
                        $loadBalancer = $this->getLoadBalancer();
                        $loadBalancer->reuseConnection( $db );