X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiQueryRevisionsBase.php;h=266d6999bac0e8db39e19a0d1e3a6c6ce2e8f5f8;hp=0c5d5f302d9738517a52aba2c3b5d9fb11de20cf;hb=e3bd13db0c285f312e31bb1b7271af4628cca80c;hpb=a8181b4a8e009b7f7ee2443179919ba21d217356

diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php
index 0c5d5f302d..266d6999ba 100644
--- a/includes/api/ApiQueryRevisionsBase.php
+++ b/includes/api/ApiQueryRevisionsBase.php
@@ -81,10 +81,10 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 			if ( $params['diffto'] != 0 ) {
 				$difftoRev = Revision::newFromId( $params['diffto'] );
 				if ( !$difftoRev ) {
-					$this->dieUsageMsg( array( 'nosuchrevid', $params['diffto'] ) );
+					$this->dieUsageMsg( [ 'nosuchrevid', $params['diffto'] ] );
 				}
 				if ( !$difftoRev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
-					$this->setWarning( "Couldn't diff to r{$difftoRev->getID()}: content is hidden" );
+					$this->setWarning( "Couldn't diff to r{$difftoRev->getId()}: content is hidden" );
 					$params['diffto'] = null;
 				}
 			}
@@ -160,7 +160,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 	protected function extractRevisionInfo( Revision $revision, $row ) {
 		$title = $revision->getTitle();
 		$user = $this->getUser();
-		$vals = array();
+		$vals = [];
 		$anyHidden = false;
 
 		if ( $this->fld_ids ) {
@@ -213,7 +213,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 			}
 			if ( $revision->userCan( Revision::DELETED_TEXT, $user ) ) {
 				if ( $revision->getSha1() != '' ) {
-					$vals['sha1'] = wfBaseConvert( $revision->getSha1(), 36, 16, 40 );
+					$vals['sha1'] = Wikimedia\base_convert( $revision->getSha1(), 36, 16, 40 );
 				} else {
 					$vals['sha1'] = '';
 				}
@@ -248,7 +248,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 				ApiResult::setIndexedTagName( $tags, 'tag' );
 				$vals['tags'] = $tags;
 			} else {
-				$vals['tags'] = array();
+				$vals['tags'] = [];
 			}
 		}
 
@@ -286,7 +286,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 						Parser::OT_PREPROCESS
 					);
 					$dom = $wgParser->preprocessToDom( $t );
-					if ( is_callable( array( $dom, 'saveXML' ) ) ) {
+					if ( is_callable( [ $dom, 'saveXML' ] ) ) {
 						$xml = $dom->saveXML();
 					} else {
 						$xml = $dom->__toString();
@@ -294,9 +294,9 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 					$vals['parsetree'] = $xml;
 				} else {
 					$vals['badcontentformatforparsetree'] = true;
-					$this->setWarning( "Conversion to XML is supported for wikitext only, " .
+					$this->setWarning( 'Conversion to XML is supported for wikitext only, ' .
 						$title->getPrefixedDBkey() .
-						" uses content model " . $content->getModel() );
+						' uses content model ' . $content->getModel() );
 				}
 			}
 		}
@@ -315,9 +315,9 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 						ParserOptions::newFromContext( $this->getContext() )
 					);
 				} else {
-					$this->setWarning( "Template expansion is supported for wikitext only, " .
+					$this->setWarning( 'Template expansion is supported for wikitext only, ' .
 						$title->getPrefixedDBkey() .
-						" uses content model " . $content->getModel() );
+						' uses content model ' . $content->getModel() );
 					$vals['badcontentformat'] = true;
 					$text = false;
 				}
@@ -332,7 +332,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 			}
 
 			if ( $text === null ) {
-				$format = $this->contentFormat ? $this->contentFormat : $content->getDefaultFormat();
+				$format = $this->contentFormat ?: $content->getDefaultFormat();
 				$model = $content->getModel();
 
 				if ( !$content->isSupportedFormat( $format ) ) {
@@ -359,7 +359,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 			static $n = 0; // Number of uncached diffs we've had
 
 			if ( $n < $this->getConfig()->get( 'APIMaxUncachedDiffs' ) ) {
-				$vals['diff'] = array();
+				$vals['diff'] = [];
 				$context = new DerivativeContext( $this->getContext() );
 				$context->setTitle( $title );
 				$handler = $revision->getContentHandler();
@@ -392,7 +392,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 						$engine->setContent( $content, $difftocontent );
 					}
 				} else {
-					$engine = $handler->createDifferenceEngine( $context, $revision->getID(), $this->diffto );
+					$engine = $handler->createDifferenceEngine( $context, $revision->getId(), $this->diffto );
 					$vals['diff']['from'] = $engine->getOldid();
 					$vals['diff']['to'] = $engine->getNewid();
 				}
@@ -424,11 +424,11 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'prop' => array(
+		return [
+			'prop' => [
 				ApiBase::PARAM_ISMULTI => true,
 				ApiBase::PARAM_DFLT => 'ids|timestamp|flags|comment|user',
-				ApiBase::PARAM_TYPE => array(
+				ApiBase::PARAM_TYPE => [
 					'ids',
 					'flags',
 					'timestamp',
@@ -442,9 +442,9 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 					'content',
 					'tags',
 					'parsetree',
-				),
+				],
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-prop',
-				ApiBase::PARAM_HELP_MSG_PER_VALUE => array(
+				ApiBase::PARAM_HELP_MSG_PER_VALUE => [
 					'ids' => 'apihelp-query+revisions+base-paramvalue-prop-ids',
 					'flags' => 'apihelp-query+revisions+base-paramvalue-prop-flags',
 					'timestamp' => 'apihelp-query+revisions+base-paramvalue-prop-timestamp',
@@ -457,48 +457,48 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 					'parsedcomment' => 'apihelp-query+revisions+base-paramvalue-prop-parsedcomment',
 					'content' => 'apihelp-query+revisions+base-paramvalue-prop-content',
 					'tags' => 'apihelp-query+revisions+base-paramvalue-prop-tags',
-					'parsetree' => array( 'apihelp-query+revisions+base-paramvalue-prop-parsetree',
-						CONTENT_MODEL_WIKITEXT ),
-				),
-			),
-			'limit' => array(
+					'parsetree' => [ 'apihelp-query+revisions+base-paramvalue-prop-parsetree',
+						CONTENT_MODEL_WIKITEXT ],
+				],
+			],
+			'limit' => [
 				ApiBase::PARAM_TYPE => 'limit',
 				ApiBase::PARAM_MIN => 1,
 				ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
 				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2,
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-limit',
-			),
-			'expandtemplates' => array(
+			],
+			'expandtemplates' => [
 				ApiBase::PARAM_DFLT => false,
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-expandtemplates',
-			),
-			'generatexml' => array(
+			],
+			'generatexml' => [
 				ApiBase::PARAM_DFLT => false,
 				ApiBase::PARAM_DEPRECATED => true,
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-generatexml',
-			),
-			'parse' => array(
+			],
+			'parse' => [
 				ApiBase::PARAM_DFLT => false,
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-parse',
-			),
-			'section' => array(
+			],
+			'section' => [
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-section',
-			),
-			'diffto' => array(
+			],
+			'diffto' => [
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-diffto',
-			),
-			'difftotext' => array(
+			],
+			'difftotext' => [
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-difftotext',
-			),
-			'difftotextpst' => array(
+			],
+			'difftotextpst' => [
 				ApiBase::PARAM_DFLT => false,
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-difftotextpst',
-			),
-			'contentformat' => array(
+			],
+			'contentformat' => [
 				ApiBase::PARAM_TYPE => ContentHandler::getAllContentFormats(),
 				ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-contentformat',
-			),
-		);
+			],
+		];
 	}
 
 }