wikimedia / mediawiki

includes/db/DatabaseMysqlBase.php

Doc Comments +11 added lines, -5 removed lines

@@ -241,7 +241,7 @@ 
 
 	/**
 	 * @param ResultWrapper|resource $res
-	 * @return stdClass|bool
+	 * @return stdClass
 	 * @throws DBUnexpectedError
 	 */
 	function fetchObject( $res ) {
@@ -376,7 +376,7 @@ 
 	/**
 	 * Get the name of the specified field in a result
 	 *
-	 * @param ResultWrapper|resource $res
+	 * @param resource $res
 	 * @param int $n
 	 * @return string
 	 */
@@ -399,7 +399,7 @@ 
 	/**
 	 * Get the type of the specified field in a result
 	 *
-	 * @param ResultWrapper|resource $res
+	 * @param resource $res
 	 * @param int $n
 	 * @return string
 	 */
@@ -421,7 +421,7 @@ 
 	/**
 	 * Move internal result pointer
 	 *
-	 * @param ResultWrapper|resource $res
+	 * @param resource $res
 	 * @param int $row
 	 * @return bool
 	 */
@@ -835,7 +835,7 @@ 
 	/**
 	 * Get the position of the master from SHOW SLAVE STATUS
 	 *
-	 * @return MySQLMasterPos|bool
+	 * @return DBMasterPos
 	 */
 	function getSlavePos() {
 		$res = $this->query( 'SHOW SLAVE STATUS', __METHOD__ );
@@ -1016,6 +1016,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $lockName
+	 */
 	private function makeLockName( $lockName ) {
 		// http://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock
 		// Newer version enforce a 64 char length limit.
@@ -1371,6 +1374,9 @@ 
 		$is_pk, $is_unique, $is_multiple, $is_key, $type, $binary,
 		$is_numeric, $is_blob, $is_unsigned, $is_zerofill;
 
+	/**
+	 * @param stdClass $info
+	 */
 	function __construct( $info ) {
 		$this->name = $info->name;
 		$this->tablename = $info->table;