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
Merge "WLFilters: Use displaysOnUnstructuredUi instead of isVisible"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryBase.php
diff --git
a/includes/api/ApiQueryBase.php
b/includes/api/ApiQueryBase.php
index
87bb6a7
..
44526e8
100644
(file)
--- a/
includes/api/ApiQueryBase.php
+++ b/
includes/api/ApiQueryBase.php
@@
-24,6
+24,7
@@
* @file
*/
* @file
*/
+use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\ResultWrapper;
/**
use Wikimedia\Rdbms\ResultWrapper;
/**
@@
-105,7
+106,7
@@
abstract class ApiQueryBase extends ApiBase {
/**
* Get the Query database connection (read-only)
/**
* Get the Query database connection (read-only)
- * @return Database
+ * @return
I
Database
*/
protected function getDB() {
if ( is_null( $this->mDb ) ) {
*/
protected function getDB() {
if ( is_null( $this->mDb ) ) {
@@
-121,7
+122,7
@@
abstract class ApiQueryBase extends ApiBase {
* @param string $name Name to assign to the database connection
* @param int $db One of the DB_* constants
* @param array $groups Query groups
* @param string $name Name to assign to the database connection
* @param int $db One of the DB_* constants
* @param array $groups Query groups
- * @return Database
+ * @return
I
Database
*/
public function selectNamedDB( $name, $db, $groups ) {
$this->mDb = $this->getQuery()->getNamedDB( $name, $db, $groups );
*/
public function selectNamedDB( $name, $db, $groups ) {
$this->mDb = $this->getQuery()->getNamedDB( $name, $db, $groups );
@@
-355,7
+356,6
@@
abstract class ApiQueryBase extends ApiBase {
* @return ResultWrapper
*/
protected function select( $method, $extraQuery = [], array &$hookData = null ) {
* @return ResultWrapper
*/
protected function select( $method, $extraQuery = [], array &$hookData = null ) {
-
$tables = array_merge(
$this->tables,
isset( $extraQuery['tables'] ) ? (array)$extraQuery['tables'] : []
$tables = array_merge(
$this->tables,
isset( $extraQuery['tables'] ) ? (array)$extraQuery['tables'] : []
@@
-478,7
+478,7
@@
abstract class ApiQueryBase extends ApiBase {
/**
* Add information (title and namespace) about a Title object to a
* result array
/**
* Add information (title and namespace) about a Title object to a
* result array
- * @param array $arr Result array à la ApiResult
+ * @param array
&
$arr Result array à la ApiResult
* @param Title $title
* @param string $prefix Module prefix
*/
* @param Title $title
* @param string $prefix Module prefix
*/