Merge "Replace DatabaseBase:: with Database:: and update type hints"

diff --combined includes/db/DatabaseMssql.php
index 6c87a00,45ea54c..6d07216
--- 1/includes/db/DatabaseMssql.php
--- 2/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@@ -737,15 -737,15 +737,15 @@@ class DatabaseMssql extends DatabaseBas
         * UPDATE wrapper. Takes a condition array and a SET array.
         *
         * @param string $table Name of the table to UPDATE. This will be passed through
-        *                DatabaseBase::tableName().
+        *                Database::tableName().
         *
         * @param array $values An array of values to SET. For each array element,
         *                the key gives the field name, and the value gives the data
         *                to set that field to. The data will be quoted by
-        *                DatabaseBase::addQuotes().
+        *                Database::addQuotes().
         *
         * @param array $conds An array of conditions (WHERE). See
-        *                DatabaseBase::select() for the details of the format of
+        *                Database::select() for the details of the format of
         *                condition arrays. Use '*' to update all rows.
         *
         * @param string $fname The function name of the caller (from __METHOD__),
@@@ -771,7 -771,7 +771,7 @@@
  
                $this->mScrollableCursor = false;
                try {
 -                      $ret = $this->query( $sql );
 +                      $this->query( $sql );
                } catch ( Exception $e ) {
                        $this->mScrollableCursor = true;
                        throw $e;
@@@ -786,7 -786,7 +786,7 @@@
         * @param int $mode Constant
         *      - LIST_COMMA:          comma separated, no field names
         *      - LIST_AND:            ANDed WHERE clause (without the WHERE). See
-        *        the documentation for $conds in DatabaseBase::select().
+        *        the documentation for $conds in Database::select().
         *      - LIST_OR:             ORed WHERE clause (without the WHERE)
         *      - LIST_SET:            comma separated with field names, like a SET clause
         *      - LIST_NAMES:          comma separated field names