X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fdatabase%2FIDatabase.php;h=befc80ce9c2eca0ea2901a38439a37c2565f6d97;hb=5a451fd01be397db3209c1881a335423706da5c2;hp=b4eb89aff4e265bffded7e5e2ae2333b3b30436f;hpb=786524a94a5dd8f34c10b183bc59c91e2ad96589;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php index b4eb89aff4..befc80ce9c 100644 --- a/includes/libs/rdbms/database/IDatabase.php +++ b/includes/libs/rdbms/database/IDatabase.php @@ -460,10 +460,12 @@ interface IDatabase { * aside from read-only automatic transactions (assuming no callbacks are registered). * If a transaction is still open anyway, it will be rolled back. * + * @param string $fname Caller name + * @param int|null $owner ID of the calling instance (e.g. the LBFactory ID) * @return bool Success * @throws DBError */ - public function close(); + public function close( $fname = __METHOD__, $owner = null ); /** * Run an SQL query and return the result @@ -902,7 +904,7 @@ interface IDatabase { * that field to. The data will be quoted by IDatabase::addQuotes(). * Values with integer keys form unquoted SET statements, which can be used for * things like "field = field + 1" or similar computed values. - * @param array $conds An array of conditions (WHERE). See + * @param array|string $conds An array of conditions (WHERE). See * IDatabase::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__), @@ -959,7 +961,7 @@ interface IDatabase { * @param array $valuedata * @param string $valuename * - * @return string + * @return array|string * @deprecated Since 1.33 */ public function aggregateValue( $valuedata, $valuename = 'value' ); @@ -1287,7 +1289,7 @@ interface IDatabase { * @param string $joinTable The other table. * @param string $delVar The variable to join on, in the first table. * @param string $joinVar The variable to join on, in the second table. - * @param array $conds Condition array of field names mapped to variables, + * @param array|string $conds Condition array of field names mapped to variables, * ANDed together in the WHERE clause * @param string $fname Calling function name (use __METHOD__) for logs/profiling * @throws DBError If an error occurs, see IDatabase::query()