SemanticMediaWiki / SemanticFormsSelect

src/ApiRequestProcessor.php

Spacing +39 added lines, -39 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param Parser $parser
 	 */
-	public function __construct( Parser $parser ) {
+	public function __construct(Parser $parser) {
 		$this->parser = $parser;
 	}
 
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param boolean $debugFlag
 	 */
-	public function setDebugFlag( $debugFlag ) {
+	public function setDebugFlag($debugFlag) {
 		$this->debugFlag = $debugFlag;
 	}
 
@@ -52,91 +52,91 @@ 
 	 *
 	 * @return string
 	 */
-	public function getJsonDecodedResultValuesForRequestParameters( array $parameters ) {
+	public function getJsonDecodedResultValuesForRequestParameters(array $parameters) {
 
-		if ( !isset( $parameters['query'] ) || !isset( $parameters['sep'] ) ) {
-			throw new InvalidArgumentException( 'Missing an query parameter' );
+		if (!isset($parameters['query']) || !isset($parameters['sep'])) {
+			throw new InvalidArgumentException('Missing an query parameter');
 		}
 
 		$this->parser->firstCallInit();
 		$json = array();
 
-		if ( isset( $parameters['approach'] ) && $parameters['approach'] == 'smw' ) {
-			$json = $this->doProcessQueryFor( $parameters['query'], $parameters['sep'] );
+		if (isset($parameters['approach']) && $parameters['approach'] == 'smw') {
+			$json = $this->doProcessQueryFor($parameters['query'], $parameters['sep']);
 		} else {
-			$json = $this->doProcessFunctionFor( $parameters['query'], $parameters['sep'] );
+			$json = $this->doProcessFunctionFor($parameters['query'], $parameters['sep']);
 		}
 
 		// I have no idea why we first encode and and then decode here??
 
-		return json_decode( $json );
+		return json_decode($json);
 	}
 
-	private function doProcessQueryFor( $query, $sep = "," ) {
+	private function doProcessQueryFor($query, $sep = ",") {
 
 		$query = str_replace(
-			array( "<", ">", "sep=;" ),
-			array( "<", ">", "sep={$sep};" ),
+			array("&lt;", "&gt;", "sep=;"),
+			array("<", ">", "sep={$sep};"),
 			$query
 		);
 
-		$params = explode( ";", $query );
-		$f = str_replace( ";", "|", $params[0] );
+		$params = explode(";", $query);
+		$f = str_replace(";", "|", $params[0]);
 
-		$params[0] = $this->parser->replaceVariables( $f );
+		$params[0] = $this->parser->replaceVariables($f);
 
-		if ( $this->debugFlag ) {
-			error_log( implode( "|", $params ) );
+		if ($this->debugFlag) {
+			error_log(implode("|", $params));
 		}
 
 		$values = $this->getFormattedValuesFrom(
 			$sep,
-			QueryProcessor::getResultFromFunctionParams( $params, SMW_OUTPUT_WIKI )
+			QueryProcessor::getResultFromFunctionParams($params, SMW_OUTPUT_WIKI)
 		);
 
-		return json_encode( array(
+		return json_encode(array(
 			"values" => $values,
-			"count"  => count( $values )
-		) );
+			"count"  => count($values)
+		));
 	}
 
-	private function doProcessFunctionFor( $query, $sep = "," ) {
+	private function doProcessFunctionFor($query, $sep = ",") {
 
 		$query = str_replace(
-			array( "&lt;", "&gt;", "sep=;" ),
-			array( "<", ">", "sep={$sep};" ),
+			array("&lt;", "&gt;", "sep=;"),
+			array("<", ">", "sep={$sep};"),
 			$query
 		);
 
-		$f = str_replace( ";", "|", $query );
+		$f = str_replace(";", "|", $query);
 
-		if ( $this->debugFlag ) {
-			error_log( $f );
+		if ($this->debugFlag) {
+			error_log($f);
 		}
 
 		$values = $this->getFormattedValuesFrom(
 			$sep,
-			$this->parser->replaceVariables( $f )
+			$this->parser->replaceVariables($f)
 		);
 
-		return json_encode( array(
+		return json_encode(array(
 			"values" => $values,
-			"count"  => count( $values )
-		) );
+			"count"  => count($values)
+		));
 	}
 
-	private function getFormattedValuesFrom( $sep, $values ) {
+	private function getFormattedValuesFrom($sep, $values) {
 
-		if ( strpos( $values, $sep ) === false ) {
-			return array( $values );
+		if (strpos($values, $sep) === false) {
+			return array($values);
 		}
 
-		$values = explode( $sep, $values );
-		$values = array_map( "trim", $values );
-		$values = array_unique( $values );
+		$values = explode($sep, $values);
+		$values = array_map("trim", $values);
+		$values = array_unique($values);
 
-		sort( $values );
-		array_unshift( $values, "" );
+		sort($values);
+		array_unshift($values, "");
 
 		return $values;
 	}

tests/phpunit/Unit/ApiRequestProcessorTest.php

Spacing +10 added lines, -10 removed lines

@@ -21,43 +21,43 @@
 
 	public function testCanConstruct() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
 		$this->assertInstanceOf(
 			'\SFS\ApiRequestProcessor',
-			new ApiRequestProcessor( $parser )
+			new ApiRequestProcessor($parser)
 		);
 	}
 
 	public function testMissingParametersThrowsException() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$instance = new ApiRequestProcessor( $parser );
+		$instance = new ApiRequestProcessor($parser);
 
 		$parameters = array();
 
-		$this->setExpectedException( 'InvalidArgumentException' );
-		$instance->getJsonDecodedResultValuesForRequestParameters( $parameters );
+		$this->setExpectedException('InvalidArgumentException');
+		$instance->getJsonDecodedResultValuesForRequestParameters($parameters);
 	}
 
 	public function testJsonResultValuesFromRequestParameters() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$instance = new ApiRequestProcessor( $parser );
+		$instance = new ApiRequestProcessor($parser);
 
-		$parameters = array( 'query' => 'foo', 'sep' => ',' );
+		$parameters = array('query' => 'foo', 'sep' => ',');
 
 		$this->assertInternalType(
 			'object',
-			$instance->getJsonDecodedResultValuesForRequestParameters( $parameters )
+			$instance->getJsonDecodedResultValuesForRequestParameters($parameters)
 		);
 	}
 

tests/phpunit/Unit/ApiSemanticFormsSelectTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 
 	public function testCanConstruct() {
 
-		$apiMain = new ApiMain( $this->newRequestContext( array() ), true );
+		$apiMain = new ApiMain($this->newRequestContext(array()), true);
 
 		$instance = new ApiSemanticFormsSelect(
 			$apiMain,
@@ -43,7 +43,7 @@ 
 			'sep'      => ','
 		);
 
-		$apiMain = new ApiMain( $this->newRequestContext( $parameters ), true );
+		$apiMain = new ApiMain($this->newRequestContext($parameters), true);
 
 		$instance = new ApiSemanticFormsSelect(
 			$apiMain,
@@ -55,14 +55,14 @@ 
 		);
 	}
 
-	private function newRequestContext( $request = array() ) {
+	private function newRequestContext($request = array()) {
 
 		$context = new RequestContext();
 
-		if ( $request instanceof WebRequest ) {
-			$context->setRequest( $request );
+		if ($request instanceof WebRequest) {
+			$context->setRequest($request);
 		} else {
-			$context->setRequest( new FauxRequest( $request, true ) );
+			$context->setRequest(new FauxRequest($request, true));
 		}
 
 		return $context;

tests/phpunit/Unit/OutputTest.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 		$this->assertContains(
 			'mw.config.set({"Foo":"\"Bar\""})',
-			Output::addToHeadItem( 'Foo', 'Bar' )
+			Output::addToHeadItem('Foo', 'Bar')
 		);
 	}
 

tests/phpunit/Unit/SemanticFormsSelectTest.php

Spacing +9 added lines, -9 removed lines

@@ -17,13 +17,13 @@ 
 
 	public function testCanConstruct() {
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
 		$this->assertInstanceOf(
 			'\SFS\SemanticFormsSelect',
-			new SemanticFormsSelect( $parser )
+			new SemanticFormsSelect($parser)
 		);
 	}
 
@@ -41,23 +41,23 @@ 
 			'is_list' => true
 		);
 
-		$parserOutput = $this->getMockBuilder( '\ParserOutput' )
+		$parserOutput = $this->getMockBuilder('\ParserOutput')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$parser = $this->getMockBuilder( '\Parser' )
+		$parser = $this->getMockBuilder('\Parser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$parser->expects( $this->any() )
-			->method( 'getOutput' )
-			->will( $this->returnValue( $parserOutput ) );
+		$parser->expects($this->any())
+			->method('getOutput')
+			->will($this->returnValue($parserOutput));
 
-		$instance = new SemanticFormsSelect( $parser );
+		$instance = new SemanticFormsSelect($parser);
 
 		$this->assertInternalType(
 			'string',
-			$instance->select( $value, $inputName, $isMandatory, $isDisabled, $otherArgs )
+			$instance->select($value, $inputName, $isMandatory, $isDisabled, $otherArgs)
 		);
 	}
 

tests/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -1,25 +1,25 @@
 <?php
 
-if ( PHP_SAPI !== 'cli' ) {
-	die( 'Not an entry point' );
+if (PHP_SAPI !== 'cli') {
+	die('Not an entry point');
 }
 
-error_reporting( E_ALL | E_STRICT );
-date_default_timezone_set( 'UTC' );
-ini_set( 'display_errors', 1 );
+error_reporting(E_ALL | E_STRICT);
+date_default_timezone_set('UTC');
+ini_set('display_errors', 1);
 
 
-if ( !is_readable( $autoloaderClassPath = __DIR__ . '/../../SemanticMediaWiki/tests/autoloader.php' ) ) {
-	die( 'The Semantic MediaWiki test autoloader is not available' );
+if (!is_readable($autoloaderClassPath = __DIR__.'/../../SemanticMediaWiki/tests/autoloader.php')) {
+	die('The Semantic MediaWiki test autoloader is not available');
 }
 
-if ( !class_exists( 'SemanticFormsSelect' ) || ( $version = SemanticFormsSelect::getVersion() ) === null ) {
-	die( "\nSemantic Forms Select is not available, please check your Composer or LocalSettings.\n" );
+if (!class_exists('SemanticFormsSelect') || ($version = SemanticFormsSelect::getVersion()) === null) {
+	die("\nSemantic Forms Select is not available, please check your Composer or LocalSettings.\n");
 }
 
-print sprintf( "\n%-20s%s\n", "Semantic Forms Select: ", $version );
+print sprintf("\n%-20s%s\n", "Semantic Forms Select: ", $version);
 
 $autoloader = require $autoloaderClassPath;
-$autoloader->addPsr4( 'SFS\\Tests\\', __DIR__ . '/phpunit/Unit' );
-$autoloader->addPsr4( 'SFS\\Tests\\Integration\\', __DIR__ . '/phpunit/Integration' );
-unset( $autoloader );
+$autoloader->addPsr4('SFS\\Tests\\', __DIR__.'/phpunit/Unit');
+$autoloader->addPsr4('SFS\\Tests\\Integration\\', __DIR__.'/phpunit/Integration');
+unset($autoloader);

src/SemanticFormsSelect.php

Spacing +71 added lines, -71 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @param Parser $parser
 	 */
-	public function __construct( &$parser ) {
+	public function __construct(&$parser) {
 		$this->parser = $parser;
 	}
 
@@ -40,53 +40,53 @@ 
 	 *
 	 * @return string
 	 */
-	public static function init( $value, $inputName, $isMandatory, $isDisabled, $otherArgs ) {
+	public static function init($value, $inputName, $isMandatory, $isDisabled, $otherArgs) {
 
-		$instance = new self( $GLOBALS['wgParser'] );
+		$instance = new self($GLOBALS['wgParser']);
 
-		return $instance->select( $value, $inputName, $isMandatory, $isDisabled, $otherArgs );
+		return $instance->select($value, $inputName, $isMandatory, $isDisabled, $otherArgs);
 	}
 
-	public function select ( $cur_value, $input_name, $is_mandatory, $is_disabled, $other_args ) {
+	public function select($cur_value, $input_name, $is_mandatory, $is_disabled, $other_args) {
 		global $wgScriptSelectCount, $sfgFieldNum, $wgUser;
 
 		$selectField = array();
 		$values = null;
 		$staticvalue = false;
 
-		if ( array_key_exists( "query", $other_args ) ) {
+		if (array_key_exists("query", $other_args)) {
 			$query = $other_args["query"];
 
 			$query = str_replace(
-				array( "~", "(", ")" ),
-				array( "=", "[", "]" ),
+				array("~", "(", ")"),
+				array("=", "[", "]"),
 				$query
 			);
 
 			$selectField["query"] = $query;
 
-			if ( strpos ($query, '@@@@') === false ) {
+			if (strpos($query, '@@@@') === false) {
 				$params = explode(";", $query);
-				$params[0] = $this->parser->replaceVariables( $params[0] );
-				$values = QueryProcessor::getResultFromFunctionParams($params,SMW_OUTPUT_WIKI);
+				$params[0] = $this->parser->replaceVariables($params[0]);
+				$values = QueryProcessor::getResultFromFunctionParams($params, SMW_OUTPUT_WIKI);
 				$staticvalue = true;
 			}
 
-		} elseif ( array_key_exists( "function", $other_args ) ) {
+		} elseif (array_key_exists("function", $other_args)) {
 			$query = $other_args["function"];
 			$query = '{{#'.$query.'}}';
 
 			$query = str_replace(
-				array( "~", "(", ")" ),
-				array( "=", "[", "]" ),
+				array("~", "(", ")"),
+				array("=", "[", "]"),
 				$query
 			);
 
 			$selectField["function"] = $query;
 
-			if ( strpos( $query, '@@@@' ) === false ) {
-				$f = str_replace( ";", "|", $query );
-				$values = $this->parser->replaceVariables( $f );
+			if (strpos($query, '@@@@') === false) {
+				$f = str_replace(";", "|", $query);
+				$values = $this->parser->replaceVariables($f);
 				$staticvalue = true;
 			}
 		}
@@ -99,115 +99,115 @@ 
 			$values = array_unique($values);
 		} else {
 
-			if ($wgScriptSelectCount == 0 ) {
-				Output::addModule( 'ext.sf_select.scriptselect' );
+			if ($wgScriptSelectCount == 0) {
+				Output::addModule('ext.sf_select.scriptselect');
 			}
 
 			$wgScriptSelectCount++;
 
-			$data["selectismultiple"] = array_key_exists( "part_of_multiple", $other_args );
+			$data["selectismultiple"] = array_key_exists("part_of_multiple", $other_args);
 
 			$index = strpos($input_name, "[");
 			$data['selecttemplate'] = substr($input_name, 0, $index);
 
 			// Does hit work for multiple template?
 			$index = strrpos($input_name, "[");
-			$data['selectfield'] = substr( $input_name, $index+1, strlen( $input_name ) - $index - 2 );
+			$data['selectfield'] = substr($input_name, $index + 1, strlen($input_name) - $index - 2);
 
 			$valueField = array();
-			$data["valuetemplate"] = array_key_exists( "sametemplate", $other_args ) ? $data['selecttemplate'] : $other_args["template"];
+			$data["valuetemplate"] = array_key_exists("sametemplate", $other_args) ? $data['selecttemplate'] : $other_args["template"];
 			$data["valuefield"] = $other_args["field"];
 
-			$data['selectrm'] = array_key_exists( 'rmdiv', $other_args );
-			$data['label'] = array_key_exists( 'label', $other_args );
-			$data['sep'] = array_key_exists( 'sep', $other_args ) ? $other_args["sep"] : ',';
+			$data['selectrm'] = array_key_exists('rmdiv', $other_args);
+			$data['label'] = array_key_exists('label', $other_args);
+			$data['sep'] = array_key_exists('sep', $other_args) ? $other_args["sep"] : ',';
 
-			if (array_key_exists("query", $selectField ) ) {
+			if (array_key_exists("query", $selectField)) {
 				$data['selectquery'] = $selectField['query'];
-			} else{
+			} else {
 				$data['selectfunction'] = $selectField['function'];
 			}
 
 			self::$data[] = $data;
 		}
 
-		$extraatt="";
-		$is_list=false;
+		$extraatt = "";
+		$is_list = false;
 
 		// TODO This needs clean-up
 
-		if (array_key_exists('is_list', $other_args) && $other_args['is_list']==true){
-			$is_list=true;
+		if (array_key_exists('is_list', $other_args) && $other_args['is_list'] == true) {
+			$is_list = true;
 		}
-		if ($is_list){
-			$extraatt=' multiple="multiple" ';
+		if ($is_list) {
+			$extraatt = ' multiple="multiple" ';
 		}
-		if(array_key_exists("size", $other_args)){
-			$extraatt.=" size=\"{$other_args['size']}\"";
+		if (array_key_exists("size", $other_args)) {
+			$extraatt .= " size=\"{$other_args['size']}\"";
 		}
-		$classes=array();
-		if($is_mandatory){
-			$classes[]="mandatoryField";
+		$classes = array();
+		if ($is_mandatory) {
+			$classes[] = "mandatoryField";
 		}
-		if (array_key_exists("class", $other_args)){
-			$classes[]=$other_args['class'];
+		if (array_key_exists("class", $other_args)) {
+			$classes[] = $other_args['class'];
 		}
-		if ($classes){
-			$cstr=implode(" ",$classes);
-			$extraatt.=" class=\"$cstr\"";
+		if ($classes) {
+			$cstr = implode(" ", $classes);
+			$extraatt .= " class=\"$cstr\"";
 		}
-		$inname=$input_name;
-		if ($is_list){
-			$inname.='[]';
+		$inname = $input_name;
+		if ($is_list) {
+			$inname .= '[]';
 		}
 
 		// TODO Use Html::
 
-		$spanextra=$is_mandatory?'mandatoryFieldSpan':'';
-		$ret="<span class=\"inputSpan $spanextra\"><select name='$inname' id='input_$sfgFieldNum' $extraatt>";
-		$curvalues=null;
-		if ($cur_value){
-			if ($cur_value==='current user'){
-				$cur_value=$wgUser->getName();
+		$spanextra = $is_mandatory ? 'mandatoryFieldSpan' : '';
+		$ret = "<span class=\"inputSpan $spanextra\"><select name='$inname' id='input_$sfgFieldNum' $extraatt>";
+		$curvalues = null;
+		if ($cur_value) {
+			if ($cur_value === 'current user') {
+				$cur_value = $wgUser->getName();
 			}
-			if (is_array($cur_value) ){
-				$curvalues=$cur_value;
-			} else{
-				$curvalues=array_map("trim", explode(",", $cur_value));
+			if (is_array($cur_value)) {
+				$curvalues = $cur_value;
+			} else {
+				$curvalues = array_map("trim", explode(",", $cur_value));
 			}
 
 		} else {
-			$curvalues=array();
+			$curvalues = array();
 		}
 
 		// TODO handle empty value case.
-		$ret.="<option></option>";
+		$ret .= "<option></option>";
 
 		foreach ($curvalues as $cur) {
-			$ret.="<option selected='selected'>$cur</option>";
+			$ret .= "<option selected='selected'>$cur</option>";
 		}
 
-		if ($staticvalue){
-			foreach($values as $val){
-				if(!in_array($val, $curvalues)){
-					$ret.="<option>$val</option>";
+		if ($staticvalue) {
+			foreach ($values as $val) {
+				if (!in_array($val, $curvalues)) {
+					$ret .= "<option>$val</option>";
 				}
 			}
 		}
 
-		$ret.="</select></span>";
-		$ret.="<span id=\"info_$sfgFieldNum\" class=\"errorMessage\"></span>";
+		$ret .= "</select></span>";
+		$ret .= "<span id=\"info_$sfgFieldNum\" class=\"errorMessage\"></span>";
 
-		if ($other_args["is_list"]){
-			$hiddenname=$input_name.'[is_list]';
-			$ret.="<input type='hidden' name='$hiddenname' value='1' />";
+		if ($other_args["is_list"]) {
+			$hiddenname = $input_name.'[is_list]';
+			$ret .= "<input type='hidden' name='$hiddenname' value='1' />";
 		}
 
-		if ( !$staticvalue ){
-			Output::addToHeadItem( 'sf_select', self::$data );
+		if (!$staticvalue) {
+			Output::addToHeadItem('sf_select', self::$data);
 		}
 
-		Output::commitToParserOutput( $this->parser->getOutput() );
+		Output::commitToParserOutput($this->parser->getOutput());
 
 		return $ret;
 	}

src/Output.php

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param string $moduleName
 	 */
-	public static function addModule( $moduleName ) {
+	public static function addModule($moduleName) {
 		self::$resourceModules[$moduleName] = $moduleName;
 	}
 
@@ -38,8 +38,8 @@ 
 	 * @param string $id
 	 * @param string $data
 	 */
-	public static function addToHeadItem( $id, $data = '' ) {
-		return self::$headItems[$id] = self::makeVariablesScript( array( $id => json_encode( $data ) ) );
+	public static function addToHeadItem($id, $data = '') {
+		return self::$headItems[$id] = self::makeVariablesScript(array($id => json_encode($data)));
 	}
 
 	/**
@@ -47,24 +47,24 @@ 
 	 *
 	 * @param ParserOutput $parserOutput
 	 */
-	public static function commitToParserOutput( ParserOutput $parserOutput ) {
+	public static function commitToParserOutput(ParserOutput $parserOutput) {
 
-		foreach ( self::$headItems as $key => $item ) {
-			$parserOutput->addHeadItem( "\t\t" . $item . "\n", $key );
+		foreach (self::$headItems as $key => $item) {
+			$parserOutput->addHeadItem("\t\t".$item."\n", $key);
 		}
 
-		$parserOutput->addModules( array_values( self::$resourceModules ) );
+		$parserOutput->addModules(array_values(self::$resourceModules));
 
 		self::$resourceModules = array();
 		self::$headItems = array();
 	}
 
-	private static function makeVariablesScript( $data ) {
+	private static function makeVariablesScript($data) {
 
-		if ( $data ) {
+		if ($data) {
 			return \Html::inlineScript(
 				ResourceLoader::makeLoaderConditionalScript(
-					ResourceLoader::makeConfigSetScript( $data )
+					ResourceLoader::makeConfigSetScript($data)
 				)
 			);
 		}

src/ApiSemanticFormsSelect.php

Spacing +8 added lines, -8 removed lines

@@ -24,22 +24,22 @@ 
 	 */
 	public function execute() {
 
-		$parser = new Parser( $GLOBALS['wgParserConf'] );
-		$parser->setTitle( Title::newFromText( 'NO TITLE' ) );
+		$parser = new Parser($GLOBALS['wgParserConf']);
+		$parser->setTitle(Title::newFromText('NO TITLE'));
 		$parser->mOptions = new ParserOptions();
 		$parser->mOutput = new ParserOutput();
 
-		$apiRequestProcessor = new ApiRequestProcessor( $parser );
-		$apiRequestProcessor->setDebugFlag( $GLOBALS['wgSF_Select_debug'] );
+		$apiRequestProcessor = new ApiRequestProcessor($parser);
+		$apiRequestProcessor->setDebugFlag($GLOBALS['wgSF_Select_debug']);
 
 		$resultValues = $apiRequestProcessor->getJsonDecodedResultValuesForRequestParameters(
 			$this->extractRequestParams()
 		);
 
 		$result = $this->getResult();
-		$result->setIndexedTagName( $resultValues->values, 'value' );
-		$result->addValue( $this->getModuleName(), 'values', $resultValues->values );
-		$result->addValue( $this->getModuleName(), 'count', $resultValues->count );
+		$result->setIndexedTagName($resultValues->values, 'value');
+		$result->addValue($this->getModuleName(), 'values', $resultValues->values);
+		$result->addValue($this->getModuleName(), 'count', $resultValues->count);
 
 		return true;
 	}
@@ -87,7 +87,7 @@ 
 	 * @see ApiBase::getVersion
 	 */
 	public function getVersion() {
-		return __CLASS__ . ': 1.1';
+		return __CLASS__.': 1.1';
 	}
 
 }