Merge "rdbms: fix IDEA warnings in DatabaseMssql.php"

diff --combined includes/libs/rdbms/database/DatabaseMssql.php
index 8d32b12,c55e04a..1246e44
--- 1/includes/libs/rdbms/database/DatabaseMssql.php
--- 2/includes/libs/rdbms/database/DatabaseMssql.php
+++ b/includes/libs/rdbms/database/DatabaseMssql.php
@@@ -77,7 -77,16 +77,7 @@@ class DatabaseMssql extends Database 
                parent::__construct( $params );
        }
  
 -      /**
 -       * Usually aborts on failure
 -       * @param string $server
 -       * @param string $user
 -       * @param string $password
 -       * @param string $dbName
 -       * @throws DBConnectionError
 -       * @return bool|resource|null
 -       */
 -      public function open( $server, $user, $password, $dbName ) {
 +      protected function open( $server, $user, $password, $dbName ) {
                # Test for driver support, to avoid suppressed fatal error
                if ( !function_exists( 'sqlsrv_connect' ) ) {
                        throw new DBConnectionError(
@@@ -121,7 -130,7 +121,7 @@@
  
                $this->opened = true;
  
 -              return $this->conn;
 +              return (bool)$this->conn;
        }
  
        /**
@@@ -234,7 -243,7 +234,7 @@@
        }
  
        /**
-        * @param MssqlResultWrapper $res
+        * @param IResultWrapper $res
         * @return stdClass
         */
        public function fetchObject( $res ) {
@@@ -243,7 -252,7 +243,7 @@@
        }
  
        /**
-        * @param MssqlResultWrapper $res
+        * @param IResultWrapper $res
         * @return array
         */
        public function fetchRow( $res ) {