Merge "Pass in ServiceOptions to BlockManager"

[lhc/web/wiklou.git] / includes / api / ApiQueryFileRepoInfo.php

diff --git a/includes/api/ApiQueryFileRepoInfo.php b/includes/api/ApiQueryFileRepoInfo.php
index 12b9893..279bc0a 100644 (file)
--- a/includes/api/ApiQueryFileRepoInfo.php
+++ b/includes/api/ApiQueryFileRepoInfo.php
@@ -46,7 +46,7 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
                $params = $this->extractRequestParams();
                $props = array_flip( $params['prop'] );
 
-               $repos = array();
+               $repos = [];
 
                $repoGroup = $this->getInitialisedRepoGroup();
                $foreignTargets = $conf->get( 'ForeignUploadTargets' );
@@ -66,7 +66,7 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
                ApiResult::setIndexedTagName( $repos, 'repo' );
                ApiResult::setArrayTypeRecursive( $repos, 'assoc' );
                ApiResult::setArrayType( $repos, 'array' );
-               $result->addValue( array( 'query' ), 'repos', $repos );
+               $result->addValue( [ 'query' ], 'repos', $repos );
        }
 
        public function getCacheMode( $params ) {
@@ -76,17 +76,18 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
        public function getAllowedParams() {
                $props = $this->getProps();
 
-               return array(
-                       'prop' => array(
-                               ApiBase::PARAM_DFLT => join( '|', $props ),
+               return [
+                       'prop' => [
+                               ApiBase::PARAM_DFLT => implode( '|', $props ),
                                ApiBase::PARAM_ISMULTI => true,
                                ApiBase::PARAM_TYPE => $props,
-                       ),
-               );
+                               ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
+                       ],
+               ];
        }
 
        public function getProps() {
-               $props = array();
+               $props = [];
                $repoGroup = $this->getInitialisedRepoGroup();
 
                $repoGroup->forEachForeignRepo( function ( $repo ) use ( &$props ) {
@@ -100,17 +101,23 @@ class ApiQueryFileRepoInfo extends ApiQueryBase {
 
                $propValues[] = 'canUpload';
 
+               sort( $propValues );
                return $propValues;
        }
 
        protected function getExamplesMessages() {
-               return array(
-                       'action=query&meta=filerepoinfo&friprop=apiurl|name|displayname'
-                               => 'apihelp-query+filerepoinfo-example-simple',
-               );
+               $examples = [];
+
+               $props = array_intersect( [ 'apiurl', 'name', 'displayname' ], $this->getProps() );
+               if ( $props ) {
+                       $examples['action=query&meta=filerepoinfo&friprop=' . implode( '|', $props )] =
+                               'apihelp-query+filerepoinfo-example-simple';
+               }
+
+               return $examples;
        }
 
        public function getHelpUrls() {
-               return 'https://www.mediawiki.org/wiki/API:Filerepoinfo';
+               return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Filerepoinfo';
        }
 }