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
build: Bump mediawiki-phan-config to 0.8.0
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiOpenSearch.php
diff --git
a/includes/api/ApiOpenSearch.php
b/includes/api/ApiOpenSearch.php
index
0ba4a0e
..
6d66f5a
100644
(file)
--- a/
includes/api/ApiOpenSearch.php
+++ b/
includes/api/ApiOpenSearch.php
@@
-71,6
+71,7
@@
class ApiOpenSearch extends ApiBase {
case 'xml':
$printer = $this->getMain()->createPrinterByName( 'xml' . $this->fm );
case 'xml':
$printer = $this->getMain()->createPrinterByName( 'xml' . $this->fm );
+ '@phan-var ApiFormatXML $printer';
$printer->setRootElement( 'SearchSuggestion' );
return $printer;
$printer->setRootElement( 'SearchSuggestion' );
return $printer;
@@
-112,7
+113,7
@@
class ApiOpenSearch extends ApiBase {
* @param string $search the search query
* @param array $params api request params
* @return array search results. Keys are integers.
* @param string $search the search query
* @param array $params api request params
* @return array search results. Keys are integers.
- * @phan-return array<array{title:Title,
extract
:false,image:false,url:string}>
+ * @phan-return array<array{title:Title,
redirect_from:?Title,extract:false,extract_trimmed
:false,image:false,url:string}>
* Note that phan annotations don't support keys containing a space.
*/
private function search( $search, array $params ) {
* Note that phan annotations don't support keys containing a space.
*/
private function search( $search, array $params ) {
@@
-250,7
+251,6
@@
class ApiOpenSearch extends ApiBase {
if ( is_string( $r['extract'] ) && $r['extract'] !== '' ) {
$item['Description'] = $r['extract'];
}
if ( is_string( $r['extract'] ) && $r['extract'] !== '' ) {
$item['Description'] = $r['extract'];
}
- // @phan-suppress-next-line PhanTypeArraySuspiciousNullable
if ( is_array( $r['image'] ) && isset( $r['image']['source'] ) ) {
$item['Image'] = array_intersect_key( $r['image'], $imageKeys );
}
if ( is_array( $r['image'] ) && isset( $r['image']['source'] ) ) {
$item['Image'] = array_intersect_key( $r['image'], $imageKeys );
}