More resources

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Apr 15, 2015 · f15f67e · f15f67e
1 parent 266588e
commit f15f67e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/libraries/dbi/DBIDrizzle.class.php b/libraries/dbi/DBIDrizzle.class.php
@@ -184,8 +184,8 @@ public function realQuery($query, $link, $options)
     /**
      * Run the multi query and output the results
      *
-     * @param object $link  connection object
-     * @param string $query multi query statement to execute
+     * @param resource $link  connection object
+     * @param string   $query multi query statement to execute
      *
      * @return result collection | boolean(false)
      */
@@ -260,7 +260,7 @@ public function freeResult($result)
     /**
      * Check if there are any more query results from a multi query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return bool false
      */
@@ -276,7 +276,7 @@ public function moreResults($link)
     /**
      * Prepare next result from multi_query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return bool false
      */

diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
@@ -568,8 +568,8 @@ public function connect(
     /**
      * selects given database
      *
-     * @param string $dbname name of db to select
-     * @param object $link   mysql link resource
+     * @param string   $dbname name of db to select
+     * @param resource $link   mysql link resource
      *
      * @return bool
      */
@@ -582,9 +582,9 @@ public function selectDb($dbname, $link)
     /**
      * runs a query and returns the result
      *
-     * @param string $query   query to run
-     * @param object $link    mysql link resource
-     * @param int    $options query options
+     * @param string   $query   query to run
+     * @param resource $link    mysql link resource
+     * @param int      $options query options
      *
      * @return mixed
      */
@@ -610,8 +610,8 @@ public function realQuery($query, $link = null, $options = 0)
     /**
      * Run the multi query and output the results
      *
-     * @param object $link  connection object
-     * @param string $query multi query statement to execute
+     * @param resource $link  connection object
+     * @param string   $query multi query statement to execute
      *
      * @return result collection | boolean(false)
      */
@@ -728,7 +728,7 @@ public function freeResult($result)
     /**
      * Check if there are any more query results from a multi query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return bool false
      */
@@ -740,7 +740,7 @@ public function moreResults($link)
     /**
      * Prepare next result from multi_query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return boolean false
      */
@@ -752,7 +752,7 @@ public function nextResult($link)
     /**
      * Store the result returned from multi query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return mixed false when empty results / result set when not empty
      */
@@ -764,7 +764,7 @@ public function storeResult($link)
     /**
      * Returns a string representing the type of connection used
      *
-     * @param object $link mysql link
+     * @param resource $link mysql link
      *
      * @return string type of connection used
      */
@@ -776,7 +776,7 @@ public function getHostInfo($link)
     /**
      * Returns the version of the MySQL protocol used
      *
-     * @param object $link mysql link
+     * @param resource $link mysql link
      *
      * @return integer version of the MySQL protocol used
      */
@@ -798,7 +798,7 @@ public function getClientInfo()
     /**
      * returns last error message or false if no errors occurred
      *
-     * @param object $link connection link
+     * @param resource $link connection link
      *
      * @return string|bool $error or false
      */
@@ -826,8 +826,8 @@ public function numRows($result)
     /**
      * returns the number of rows affected by last query
      *
-     * @param object $link           the mysql object
-     * @param bool   $get_from_cache whether to retrieve from cache
+     * @param resource $link           the mysql object
+     * @param bool     $get_from_cache whether to retrieve from cache
      *
      * @return string|int
      */

diff --git a/libraries/dbi/DBIExtension.int.php b/libraries/dbi/DBIExtension.int.php
@@ -35,8 +35,8 @@ public function connect(
     /**
      * selects given database
      *
-     * @param string $dbname database name to select
-     * @param object $link   connection object
+     * @param string   $dbname database name to select
+     * @param resource $link   connection object
      *
      * @return boolean
      */
@@ -45,9 +45,9 @@ public function selectDb($dbname, $link);
     /**
      * runs a query and returns the result
      *
-     * @param string $query   query to execute
-     * @param object $link    connection object
-     * @param int    $options query options
+     * @param string   $query   query to execute
+     * @param resource $link    connection object
+     * @param int      $options query options
      *
      * @return object|bool result
      */
@@ -56,8 +56,8 @@ public function realQuery($query, $link, $options);
     /**
      * Run the multi query and output the results
      *
-     * @param object $link  connection object
-     * @param string $query multi query statement to execute
+     * @param resource $link  connection object
+     * @param string   $query multi query statement to execute
      *
      * @return result collection | boolean(false)
      */
@@ -112,7 +112,7 @@ public function freeResult($result);
     /**
      * Check if there are any more query results from a multi query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return bool true or false
      */
@@ -121,7 +121,7 @@ public function moreResults($link);
     /**
      * Prepare next result from multi_query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return bool true or false
      */
@@ -130,7 +130,7 @@ public function nextResult($link);
     /**
      * Store the result returned from multi query
      *
-     * @param object $link mysql link
+     * @param resource $link mysql link
      *
      * @return mixed false when empty results / result set when not empty
      */
@@ -139,7 +139,7 @@ public function storeResult($link);
     /**
      * Returns a string representing the type of connection used
      *
-     * @param object $link mysql link
+     * @param resource $link mysql link
      *
      * @return string type of connection used
      */
@@ -148,7 +148,7 @@ public function getHostInfo($link);
     /**
      * Returns the version of the MySQL protocol used
      *
-     * @param object $link mysql link
+     * @param resource $link mysql link
      *
      * @return integer version of the MySQL protocol used
      */
@@ -164,7 +164,7 @@ public function getClientInfo();
     /**
      * returns last error message or false if no errors occurred
      *
-     * @param object $link connection link
+     * @param resource $link connection link
      *
      * @return string|bool $error or false
      */
@@ -182,7 +182,7 @@ public function numRows($result);
     /**
      * returns the number of rows affected by last query
      *
-     * @param object $link the connection object
+     * @param resource $link the connection object
      *
      * @return int
      */