Merge "Fix \n handling for HTMLUsersMultiselectField"

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

diff --git a/includes/api/ApiQueryPagesWithProp.php b/includes/api/ApiQueryPagesWithProp.php
index ad641a4..97f79b6 100644 (file)
--- a/includes/api/ApiQueryPagesWithProp.php
+++ b/includes/api/ApiQueryPagesWithProp.php
@@ -2,7 +2,7 @@
 /**
  * Created on December 31, 2012
  *
- * Copyright © 2012 Brad Jorsch <bjorsch@wikimedia.org>
+ * Copyright © 2012 Wikimedia Foundation and contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
  *
  * @file
  * @since 1.21
- * @author Brad Jorsch
  */
 
 /**
@@ -61,13 +60,13 @@ class ApiQueryPagesWithProp extends ApiQueryGeneratorBase {
                $fld_value = isset( $prop['value'] );
 
                if ( $resultPageSet === null ) {
-                       $this->addFields( array( 'page_id' ) );
-                       $this->addFieldsIf( array( 'page_title', 'page_namespace' ), $fld_title );
+                       $this->addFields( [ 'page_id' ] );
+                       $this->addFieldsIf( [ 'page_title', 'page_namespace' ], $fld_title );
                        $this->addFieldsIf( 'pp_value', $fld_value );
                } else {
                        $this->addFields( $resultPageSet->getPageTableFields() );
                }
-               $this->addTables( array( 'page_props', 'page' ) );
+               $this->addTables( [ 'page_props', 'page' ] );
                $this->addWhere( 'pp_page=page_id' );
                $this->addWhereFld( 'pp_propname', $params['propname'] );
 
@@ -99,9 +98,9 @@ class ApiQueryPagesWithProp extends ApiQueryGeneratorBase {
                        }
 
                        if ( $resultPageSet === null ) {
-                               $vals = array(
+                               $vals = [
                                        ApiResult::META_TYPE => 'assoc',
-                               );
+                               ];
                                if ( $fld_ids ) {
                                        $vals['pageid'] = (int)$row->page_id;
                                }
@@ -112,7 +111,7 @@ class ApiQueryPagesWithProp extends ApiQueryGeneratorBase {
                                if ( $fld_value ) {
                                        $vals['value'] = $row->pp_value;
                                }
-                               $fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $vals );
+                               $fit = $result->addValue( [ 'query', $this->getModuleName() ], null, $vals );
                                if ( !$fit ) {
                                        $this->setContinueEnumParameter( 'continue', $row->page_id );
                                        break;
@@ -123,56 +122,56 @@ class ApiQueryPagesWithProp extends ApiQueryGeneratorBase {
                }
 
                if ( $resultPageSet === null ) {
-                       $result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'page' );
+                       $result->addIndexedTagName( [ 'query', $this->getModuleName() ], 'page' );
                }
        }
 
        public function getAllowedParams() {
-               return array(
-                       'propname' => array(
+               return [
+                       'propname' => [
                                ApiBase::PARAM_TYPE => 'string',
                                ApiBase::PARAM_REQUIRED => true,
-                       ),
-                       'prop' => array(
+                       ],
+                       'prop' => [
                                ApiBase::PARAM_DFLT => 'ids|title',
                                ApiBase::PARAM_ISMULTI => true,
-                               ApiBase::PARAM_TYPE => array(
+                               ApiBase::PARAM_TYPE => [
                                        'ids',
                                        'title',
                                        'value',
-                               ),
-                               ApiBase::PARAM_HELP_MSG_PER_VALUE => array(),
-                       ),
-                       'continue' => array(
+                               ],
+                               ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
+                       ],
+                       'continue' => [
                                ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
-                       ),
-                       'limit' => array(
+                       ],
+                       'limit' => [
                                ApiBase::PARAM_TYPE => 'limit',
                                ApiBase::PARAM_DFLT => 10,
                                ApiBase::PARAM_MIN => 1,
                                ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
                                ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
-                       ),
-                       'dir' => array(
+                       ],
+                       'dir' => [
                                ApiBase::PARAM_DFLT => 'ascending',
-                               ApiBase::PARAM_TYPE => array(
+                               ApiBase::PARAM_TYPE => [
                                        'ascending',
                                        'descending',
-                               )
-                       ),
-               );
+                               ]
+                       ],
+               ];
        }
 
        protected function getExamplesMessages() {
-               return array(
+               return [
                        'action=query&list=pageswithprop&pwppropname=displaytitle&pwpprop=ids|title|value'
                                => 'apihelp-query+pageswithprop-example-simple',
                        'action=query&generator=pageswithprop&gpwppropname=notoc&prop=info'
                                => 'apihelp-query+pageswithprop-example-generator',
-               );
+               ];
        }
 
        public function getHelpUrls() {
-               return 'https://www.mediawiki.org/wiki/API:Pageswithprop';
+               return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Pageswithprop';
        }
 }