From c9fa62d917f16f512ea027be8c72bb79b275d820 Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 14 Feb 2013 20:33:21 +0100
Subject: [PATCH] cleanup action=tokens

* profile of execute function is done by the caller
* $type is always lower case, because param validation would reject all
other values
* use array syntax for callbacks
* use all token types in the result properties description

Change-Id: I7ed1d339df3f94305fbedb0052bb778efba59b7c
---
 includes/api/ApiTokens.php | 62 +++++---------------------------------
 1 file changed, 8 insertions(+), 54 deletions(-)

diff --git a/includes/api/ApiTokens.php b/includes/api/ApiTokens.php
index 518bfce088..7080f547f3 100644
--- a/includes/api/ApiTokens.php
+++ b/includes/api/ApiTokens.php
@@ -24,21 +24,17 @@
  * @file
  */
 
-
 /**
  * @ingroup API
  */
 class ApiTokens extends ApiBase {
 
 	public function execute() {
-		wfProfileIn( __METHOD__ );
 		$params = $this->extractRequestParams();
 		$res = array();
 
 		$types = $this->getTokenTypes();
 		foreach ( $params['type'] as $type ) {
-			$type = strtolower( $type );
-
 			$val = call_user_func( $types[$type], null, null );
 
 			if ( $val === false ) {
@@ -49,7 +45,6 @@ class ApiTokens extends ApiBase {
 		}
 
 		$this->getResult()->addValue( null, $this->getModuleName(), $res );
-		wfProfileOut( __METHOD__ );
 	}
 
 	private function getTokenTypes() {
@@ -58,11 +53,11 @@ class ApiTokens extends ApiBase {
 			return $types;
 		}
 		wfProfileIn( __METHOD__ );
-		$types = array( 'patrol' => 'ApiQueryRecentChanges::getPatrolToken' );
+		$types = array( 'patrol' => array( 'ApiQueryRecentChanges', 'getPatrolToken' ) );
 		$names = array( 'edit', 'delete', 'protect', 'move', 'block', 'unblock',
 			'email', 'import', 'watch', 'options' );
 		foreach ( $names as $name ) {
-			$types[$name] = 'ApiQueryInfo::get' . ucfirst( $name ) . 'Token';
+			$types[$name] = array( 'ApiQueryInfo', 'get' . ucfirst( $name ) . 'Token' );
 		}
 		wfRunHooks( 'ApiTokensGetTokenTypes', array( &$types ) );
 		ksort( $types );
@@ -81,54 +76,13 @@ class ApiTokens extends ApiBase {
 	}
 
 	public function getResultProperties() {
-		return array(
-			'' => array(
-				'patroltoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'edittoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'deletetoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'protecttoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'movetoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'blocktoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'unblocktoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'emailtoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'importtoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'watchtoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'optionstoken' => array(
-					ApiBase::PROP_TYPE => 'string',
-					ApiBase::PROP_NULLABLE => true
-				)
-			)
+		$props = array(
+			'' => array(),
 		);
+
+		self::addTokenProperties( $props, $this->getTokenTypes() );
+
+		return $props;
 	}
 
 	public function getParamDescription() {
-- 
2.20.1