X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryTags.php;h=7a14aac3f77a801c2002a7c9e51036f6bb73cdc4;hb=c16805f064856ade4c13827668c0d0297235e993;hp=284bb82129b48cff5532cae492cda01c05c95c69;hpb=70e760ee4e37edad1be0573b37c17fe6899e4806;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryTags.php b/includes/api/ApiQueryTags.php
index 284bb82129..7a14aac3f7 100644
--- a/includes/api/ApiQueryTags.php
+++ b/includes/api/ApiQueryTags.php
@@ -50,11 +50,11 @@ class ApiQueryTags extends ApiQueryBase {
 		$limit = $params['limit'];
 		$result = $this->getResult();
 
-		$extensionDefinedTags = array_fill_keys( ChangeTags::listExtensionDefinedTags(), 0 );
+		$softwareDefinedTags = array_fill_keys( ChangeTags::listSoftwareDefinedTags(), 0 );
 		$explicitlyDefinedTags = array_fill_keys( ChangeTags::listExplicitlyDefinedTags(), 0 );
-		$extensionActivatedTags = array_fill_keys( ChangeTags::listExtensionActivatedTags(), 0 );
+		$softwareActivatedTags = array_fill_keys( ChangeTags::listSoftwareActivatedTags(), 0 );
 
-		$definedTags = array_merge( $extensionDefinedTags, $explicitlyDefinedTags );
+		$definedTags = array_merge( $softwareDefinedTags, $explicitlyDefinedTags );
 
 		# Fetch defined tags that aren't past the continuation
 		if ( $params['continue'] !== null ) {
@@ -70,7 +70,7 @@ class ApiQueryTags extends ApiQueryBase {
 		# Merge in all used tags
 		$this->addTables( 'change_tag' );
 		$this->addFields( 'ct_tag' );
-		$this->addFields( array( 'hitcount' => $fld_hitcount ? 'COUNT(*)' : '0' ) );
+		$this->addFields( [ 'hitcount' => $fld_hitcount ? 'COUNT(*)' : '0' ] );
 		$this->addOption( 'LIMIT', $limit + 1 );
 		$this->addOption( 'GROUP BY', 'ct_tag' );
 		$this->addWhereRange( 'ct_tag', 'newer', $params['continue'], null );
@@ -89,7 +89,7 @@ class ApiQueryTags extends ApiQueryBase {
 				break;
 			}
 
-			$tag = array();
+			$tag = [];
 			$tag['name'] = $tagName;
 
 			if ( $fld_displayname ) {
@@ -105,16 +105,17 @@ class ApiQueryTags extends ApiQueryBase {
 				$tag['hitcount'] = $hitcount;
 			}
 
-			$isExtension = isset( $extensionDefinedTags[$tagName] );
+			$isSoftware = isset( $softwareDefinedTags[$tagName] );
 			$isExplicit = isset( $explicitlyDefinedTags[$tagName] );
 
 			if ( $fld_defined ) {
-				$tag['defined'] = $isExtension || $isExplicit;
+				$tag['defined'] = $isSoftware || $isExplicit;
 			}
 
 			if ( $fld_source ) {
-				$tag['source'] = array();
-				if ( $isExtension ) {
+				$tag['source'] = [];
+				if ( $isSoftware ) {
+					// TODO: Can we change this to 'software'?
 					$tag['source'][] = 'extension';
 				}
 				if ( $isExplicit ) {
@@ -123,17 +124,17 @@ class ApiQueryTags extends ApiQueryBase {
 			}
 
 			if ( $fld_active ) {
-				$tag['active'] = $isExplicit || isset( $extensionActivatedTags[$tagName] );
+				$tag['active'] = $isExplicit || isset( $softwareActivatedTags[$tagName] );
 			}
 
-			$fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $tag );
+			$fit = $result->addValue( [ 'query', $this->getModuleName() ], null, $tag );
 			if ( !$fit ) {
 				$this->setContinueEnumParameter( 'continue', $tagName );
 				break;
 			}
 		}
 
-		$result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'tag' );
+		$result->addIndexedTagName( [ 'query', $this->getModuleName() ], 'tag' );
 	}
 
 	public function getCacheMode( $params ) {
@@ -141,20 +142,20 @@ class ApiQueryTags extends ApiQueryBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'continue' => array(
+		return [
+			'continue' => [
 				ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
-			),
-			'limit' => array(
+			],
+			'limit' => [
 				ApiBase::PARAM_DFLT => 10,
 				ApiBase::PARAM_TYPE => 'limit',
 				ApiBase::PARAM_MIN => 1,
 				ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
 				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
-			),
-			'prop' => array(
+			],
+			'prop' => [
 				ApiBase::PARAM_DFLT => 'name',
-				ApiBase::PARAM_TYPE => array(
+				ApiBase::PARAM_TYPE => [
 					'name',
 					'displayname',
 					'description',
@@ -162,18 +163,18 @@ class ApiQueryTags extends ApiQueryBase {
 					'defined',
 					'source',
 					'active',
-				),
+				],
 				ApiBase::PARAM_ISMULTI => true,
-				ApiBase::PARAM_HELP_MSG_PER_VALUE => array(),
-			)
-		);
+				ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
+			]
+		];
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=query&list=tags&tgprop=displayname|description|hitcount|defined'
 				=> 'apihelp-query+tags-example-simple',
-		);
+		];
 	}
 
 	public function getHelpUrls() {