dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix/suppress misc phan errors (#5)
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
IDatabase.php
diff --git
a/includes/libs/rdbms/database/IDatabase.php
b/includes/libs/rdbms/database/IDatabase.php
index
eac9bae
..
90b888d
100644
(file)
--- a/
includes/libs/rdbms/database/IDatabase.php
+++ b/
includes/libs/rdbms/database/IDatabase.php
@@
-114,6
+114,11
@@
interface IDatabase {
*/
const QUERY_PSEUDO_PERMANENT = 2;
*/
const QUERY_PSEUDO_PERMANENT = 2;
+ /** @var bool Parameter to unionQueries() for UNION ALL */
+ const UNION_ALL = true;
+ /** @var bool Parameter to unionQueries() for UNION DISTINCT */
+ const UNION_DISTINCT = false;
+
/**
* A string describing the current software version, and possibly
* other details in a user-friendly way. Will be listed on Special:Version, etc.
/**
* A string describing the current software version, and possibly
* other details in a user-friendly way. Will be listed on Special:Version, etc.
@@
-1384,7
+1389,7
@@
interface IDatabase {
* This is used for providing overload point for other DB abstractions
* not compatible with the MySQL syntax.
* @param array $sqls SQL statements to combine
* This is used for providing overload point for other DB abstractions
* not compatible with the MySQL syntax.
* @param array $sqls SQL statements to combine
- * @param bool $all
Use UNION ALL
+ * @param bool $all
Either IDatabase::UNION_ALL or IDatabase::UNION_DISTINCT
* @return string SQL fragment
*/
public function unionQueries( $sqls, $all );
* @return string SQL fragment
*/
public function unionQueries( $sqls, $all );
@@
-1549,7
+1554,6
@@
interface IDatabase {
*
* @param callable $callback
* @param string $fname Caller name
*
* @param callable $callback
* @param string $fname Caller name
- * @return mixed
* @since 1.28
*/
public function onTransactionResolution( callable $callback, $fname = __METHOD__ );
* @since 1.28
*/
public function onTransactionResolution( callable $callback, $fname = __METHOD__ );
@@
-1593,7
+1597,6
@@
interface IDatabase {
*
* @param callable $callback
* @param string $fname
*
* @param callable $callback
* @param string $fname
- * @return mixed
* @since 1.20
* @deprecated Since 1.32
*/
* @since 1.20
* @deprecated Since 1.32
*/
@@
-1639,7
+1642,6
@@
interface IDatabase {
*
* @param string $name Callback name
* @param callable|null $callback Use null to unset a listener
*
* @param string $name Callback name
* @param callable|null $callback Use null to unset a listener
- * @return mixed
* @since 1.28
*/
public function setTransactionListener( $name, callable $callback = null );
* @since 1.28
*/
public function setTransactionListener( $name, callable $callback = null );
@@
-2167,7
+2169,6
@@
interface IDatabase {
* the aliases can be removed, and then the old X-named indexes dropped.
*
* @param string[] $aliases
* the aliases can be removed, and then the old X-named indexes dropped.
*
* @param string[] $aliases
- * @return mixed
* @since 1.31
*/
public function setIndexAliases( array $aliases );
* @since 1.31
*/
public function setIndexAliases( array $aliases );