diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 2a0f0808a98c..c270bad30c31 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -61,6 +61,7 @@
  * @param string $server_socket
  * @param int    $client_flags
  * @param bool   $persistent
+ *
  * @return bool
  */
 function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags = null, $persistent = false)
@@ -105,6 +106,7 @@ function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_p
  * @param bool   $is_controluser
  * @param array  $server               host/port/socket
  * @param bool   $auxiliary_connection (when true, don't go back to login if connection fails)
+ *
  * @return mixed false on error or a mysqli object on success
  */
 function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false)
@@ -213,6 +215,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
  *
  * @param string $dbname database name to select
  * @param mysqli $link   the mysqli object
+ *
  * @return boolean
  */
 function PMA_DBI_select_db($dbname, $link = null)
@@ -233,6 +236,7 @@ function PMA_DBI_select_db($dbname, $link = null)
  * @param string $query   query to execute
  * @param mysqli $link    mysqli object
  * @param int    $options
+ *
  * @return mysqli_result|bool
  */
 function PMA_DBI_real_query($query, $link, $options)
@@ -252,6 +256,7 @@ function PMA_DBI_real_query($query, $link, $options)
  * returns array of rows with associative and numeric keys from $result
  *
  * @param mysqli_result $result result set identifier
+ *
  * @return array
  */
 function PMA_DBI_fetch_array($result)
@@ -263,6 +268,7 @@ function PMA_DBI_fetch_array($result)
  * returns array of rows with associative keys from $result
  *
  * @param mysqli_result $result result set identifier
+ *
  * @return array
  */
 function PMA_DBI_fetch_assoc($result)
@@ -274,6 +280,7 @@ function PMA_DBI_fetch_assoc($result)
  * returns array of rows with numeric keys from $result
  *
  * @param mysqli_result $result result set identifier
+ *
  * @return array
  */
 function PMA_DBI_fetch_row($result)
@@ -286,6 +293,7 @@ function PMA_DBI_fetch_row($result)
  *
  * @param $result
  * @param $offset
+ *
  * @return bool true on success, false on failure
  */
 function PMA_DBI_data_seek($result, $offset)
@@ -309,6 +317,7 @@ function PMA_DBI_free_result($result)
  * Check if there are any more query results from a multi query
  *
  * @param mysqli $link the mysqli object
+ *
  * @return bool true or false
  */
 function PMA_DBI_more_results($link = null)
@@ -327,6 +336,7 @@ function PMA_DBI_more_results($link = null)
  * Prepare next result from multi_query
  *
  * @param mysqli $link the mysqli object
+ *
  * @return bool true or false
  */
 function PMA_DBI_next_result($link = null)
@@ -345,6 +355,7 @@ function PMA_DBI_next_result($link = null)
  * Returns a string representing the type of connection used
  *
  * @param resource $link mysql link
+ *
  * @return string type of connection used
  */
 function PMA_DBI_get_host_info($link = null)
@@ -363,6 +374,7 @@ function PMA_DBI_get_host_info($link = null)
  * Returns the version of the MySQL protocol used
  *
  * @param resource $link mysql link
+ *
  * @return integer version of the MySQL protocol used
  */
 function PMA_DBI_get_proto_info($link = null)
@@ -391,6 +403,7 @@ function PMA_DBI_get_client_info()
  * returns last error message or false if no errors occured
  *
  * @param resource $link mysql link
+ *
  * @return string|bool $error or false
  */
 function PMA_DBI_getError($link = null)
@@ -431,6 +444,7 @@ function PMA_DBI_getError($link = null)
  * returns the number of rows returned by last query
  *
  * @param mysqli_result $result result set identifier
+ *
  * @return string|int
  */
 function PMA_DBI_num_rows($result)
@@ -447,6 +461,7 @@ function PMA_DBI_num_rows($result)
  * returns last inserted auto_increment id for given $link or $GLOBALS['userlink']
  *
  * @param mysqli $link the mysqli object
+ *
  * @return string|int
  */
 function PMA_DBI_insert_id($link = null)
@@ -472,6 +487,7 @@ function PMA_DBI_insert_id($link = null)
  *
  * @param mysqli  $link           the mysqli object
  * @param boolean $get_from_cache
+ *
  * @return string|int
  */
 function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
@@ -494,6 +510,7 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
  * returns metainfo for fields in $result
  *
  * @param mysqli_result $result result set identifier
+ *
  * @return array meta info for fields in $result
  */
 function PMA_DBI_get_fields_meta($result)
@@ -574,6 +591,7 @@ function PMA_DBI_get_fields_meta($result)
  * return number of fields in given $result
  *
  * @param mysqli_result $result result set identifier
+ *
  * @return int field count
  */
 function PMA_DBI_num_fields($result)
@@ -586,6 +604,7 @@ function PMA_DBI_num_fields($result)
  *
  * @param mysqli_result $result result set identifier
  * @param int           $i      field
+ *
  * @return int length of field
  */
 function PMA_DBI_field_len($result, $i)
@@ -598,6 +617,7 @@ function PMA_DBI_field_len($result, $i)
  *
  * @param mysqli_result $result result set identifier
  * @param int           $i      field
+ *
  * @return string name of $i. field in $result
  */
 function PMA_DBI_field_name($result, $i)
@@ -610,6 +630,7 @@ function PMA_DBI_field_name($result, $i)
  *
  * @param mysqli_result $result result set identifier
  * @param int           $i      field
+ *
  * @return string field flags
  */
 function PMA_DBI_field_flags($result, $i)