wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/ExternalDataRepo.php

Spacing +31 added lines, -31 removed lines

@@ -24,23 +24,23 @@ 
 	 * @param PropertyId[] $propertyIds
 	 * @return array
 	 */
-	public function getExternalData( array $dumpIds, array $externalIds, array $propertyIds ) {
-		Assert::parameterElementType( 'string', $dumpIds, '$dumpIds' );
-		Assert::parameterElementType( 'string', $externalIds, '$externalIds' );
-		Assert::parameterElementType( PropertyId::class, $propertyIds, '$propertyIds' );
-		Assert::parameter( count( $dumpIds ) > 0, '$dumpIds', '$dumpIds has to contain at least one element.' );
-		Assert::parameter( count( $externalIds ) > 0, '$externalIds', '$externalIds has to contain at least one element.' );
+	public function getExternalData(array $dumpIds, array $externalIds, array $propertyIds) {
+		Assert::parameterElementType('string', $dumpIds, '$dumpIds');
+		Assert::parameterElementType('string', $externalIds, '$externalIds');
+		Assert::parameterElementType(PropertyId::class, $propertyIds, '$propertyIds');
+		Assert::parameter(count($dumpIds) > 0, '$dumpIds', '$dumpIds has to contain at least one element.');
+		Assert::parameter(count($externalIds) > 0, '$externalIds', '$externalIds has to contain at least one element.');
 
 		$conditions = [
 			'dump_id' => $dumpIds,
 			'external_id' => $externalIds
 		];
-		if ( $propertyIds ) {
+		if ($propertyIds) {
 			$conditions['pid'] = $propertyIds;
 		}
 
 		$externalData = [];
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$result = $db->select(
 			self::TABLE_NAME,
 			[
@@ -52,7 +52,7 @@ 
 			$conditions
 		);
 
-		foreach ( $result as $row ) {
+		foreach ($result as $row) {
 			$externalData[$row->dump_id][$row->external_id][$row->pid][] = $row->external_value;
 		}
 
@@ -68,13 +68,13 @@ 
 	 * @param string $externalValue
 	 * @return bool
 	 */
-	public function insert( $dumpId, $externalId, PropertyId $propertyId, $externalValue ) {
-		Assert::parameterType( 'string', $dumpId, '$dumpId' );
-		Assert::parameterType( 'string', $externalId, '$externalId' );
-		Assert::parameterType( 'string', $externalValue, '$externalValue' );
+	public function insert($dumpId, $externalId, PropertyId $propertyId, $externalValue) {
+		Assert::parameterType('string', $dumpId, '$dumpId');
+		Assert::parameterType('string', $externalId, '$externalId');
+		Assert::parameterType('string', $externalValue, '$externalValue');
 
-		$externalDataBatch = [ func_get_args() ];
-		return $this->insertBatch( $externalDataBatch );
+		$externalDataBatch = [func_get_args()];
+		return $this->insertBatch($externalDataBatch);
 	}
 
 	/**
@@ -84,10 +84,10 @@ 
 	 * @throws DBError
 	 * @return bool
 	 */
-	public function insertBatch( array $externalDataBatch ) {
-		$db = wfGetDB( DB_MASTER );
+	public function insertBatch(array $externalDataBatch) {
+		$db = wfGetDB(DB_MASTER);
 		$accumulator = array_map(
-			function ( $externalData ) use ( $db ) {
+			function($externalData) use ($db) {
 				return [
 					'dump_id' => $externalData[0],
 					'external_id' => $externalData[1],
@@ -100,9 +100,9 @@ 
 
 		try {
 			$db->begin();
-			$result = $db->insert( self::TABLE_NAME, $accumulator );
+			$result = $db->insert(self::TABLE_NAME, $accumulator);
 			$db->commit();
-		} catch ( DBError $ex ) {
+		} catch (DBError $ex) {
 			$db->rollback();
 			throw $ex;
 		}
@@ -117,22 +117,22 @@ 
 	 * @param int $batchSize
 	 * @throws \Wikimedia\Rdbms\DBUnexpectedError
 	 */
-	public function deleteOfDump( $dumpId, $batchSize = 1000 ) {
-		Assert::parameterType( 'string', $dumpId, '$dumpId' );
-		Assert::parameterType( 'integer', $batchSize, 'batchSize' );
+	public function deleteOfDump($dumpId, $batchSize = 1000) {
+		Assert::parameterType('string', $dumpId, '$dumpId');
+		Assert::parameterType('integer', $batchSize, 'batchSize');
 
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-		$db = $lbFactory->getMainLB()->getConnection( DB_MASTER );
-		if ( $db->getType() === 'sqlite' ) {
-			$db->delete( self::TABLE_NAME, [ 'dump_id' => $dumpId ] );
+		$db = $lbFactory->getMainLB()->getConnection(DB_MASTER);
+		if ($db->getType() === 'sqlite') {
+			$db->delete(self::TABLE_NAME, ['dump_id' => $dumpId]);
 		} else {
 			do {
-				$db->commit( __METHOD__, 'flush' );
+				$db->commit(__METHOD__, 'flush');
 				$lbFactory->waitForReplication();
-				$table = $db->tableName( self::TABLE_NAME );
-				$condition = 'dump_id = ' . $db->addQuotes( $dumpId );
-				$db->query( sprintf( 'DELETE FROM %s WHERE %s LIMIT %d', $table, $condition, $batchSize ) );
-			} while ( $db->affectedRows() > 0 );
+				$table = $db->tableName(self::TABLE_NAME);
+				$condition = 'dump_id = '.$db->addQuotes($dumpId);
+				$db->query(sprintf('DELETE FROM %s WHERE %s LIMIT %d', $table, $condition, $batchSize));
+			} while ($db->affectedRows() > 0);
 		}
 	}
 

includes/UpdateExternalData/ExternalDataImporter.php

Spacing +41 added lines, -41 removed lines

@@ -47,13 +47,13 @@ 
 	public function import() {
 		$dumpIds = $this->insertMetaInformation();
 
-		$this->log( "\nDelete old database entries...\n" );
+		$this->log("\nDelete old database entries...\n");
 
-		foreach ( $dumpIds as $dumpId ) {
-			$this->externalDataRepo->deleteOfDump( $dumpId, $this->importSettings->getBatchSize() );
+		foreach ($dumpIds as $dumpId) {
+			$this->externalDataRepo->deleteOfDump($dumpId, $this->importSettings->getBatchSize());
 		}
 
-		$this->log( "\n" );
+		$this->log("\n");
 
 		$this->insertExternalValues();
 	}
@@ -64,52 +64,52 @@ 
 	 * @return array
 	 */
 	protected function insertMetaInformation() {
-		$this->log( "Insert new dump meta information\n" );
+		$this->log("Insert new dump meta information\n");
 
-		$csvFile = fopen( $this->importSettings->getDumpInformationFilePath(), 'rb' );
-		if ( !$csvFile ) {
-			exit( 'Error while reading CSV file.' );
+		$csvFile = fopen($this->importSettings->getDumpInformationFilePath(), 'rb');
+		if (!$csvFile) {
+			exit('Error while reading CSV file.');
 		}
 
 		$i = 0;
 		$dumpIds = [];
-		while ( $data = fgetcsv( $csvFile ) ) {
+		while ($data = fgetcsv($csvFile)) {
 			$identifierPropertyIds = array_map(
-				function ( $propertyId ) {
-					return new PropertyId( $propertyId );
+				function($propertyId) {
+					return new PropertyId($propertyId);
 				},
-				json_decode( $data[2] )
+				json_decode($data[2])
 			);
 			try {
 				$dumpMetaInformation = new DumpMetaInformation(
 					$data[0],
-					new ItemId( $data[1] ),
+					new ItemId($data[1]),
 					$identifierPropertyIds,
 					$data[3],
 					$data[4],
 					$data[5],
-					intval( $data[6] ),
-					new ItemId( $data[7] )
+					intval($data[6]),
+					new ItemId($data[7])
 				);
-			} catch ( \InvalidArgumentException $e ) {
-				exit( 'Input file has bad formatted values.' );
+			} catch (\InvalidArgumentException $e) {
+				exit('Input file has bad formatted values.');
 			}
 			$dumpIds[] = $dumpMetaInformation->getDumpId();
 
 			try {
-				$this->dumpMetaInformationStore->save( $dumpMetaInformation );
-			} catch ( DBError $e ) {
-				exit( 'Unknown database error occurred.' );
+				$this->dumpMetaInformationStore->save($dumpMetaInformation);
+			} catch (DBError $e) {
+				exit('Unknown database error occurred.');
 			}
 
 			$i++;
-			$this->log( "\r\033[K" );
-			$this->log( "$i rows inserted or updated" );
+			$this->log("\r\033[K");
+			$this->log("$i rows inserted or updated");
 		}
 
-		fclose( $csvFile );
+		fclose($csvFile);
 
-		$this->log( "\n" );
+		$this->log("\n");
 
 		return $dumpIds;
 	}
@@ -118,32 +118,32 @@ 
 	 * Inserts external values stored in csv file into database
 	 */
 	private function insertExternalValues() {
-		$this->log( "Insert new data values\n" );
+		$this->log("Insert new data values\n");
 
-		$csvFile = fopen( $this->importSettings->getExternalValuesFilePath(), 'rb' );
-		if ( !$csvFile ) {
-			exit( 'Error while reading CSV file.' );
+		$csvFile = fopen($this->importSettings->getExternalValuesFilePath(), 'rb');
+		if (!$csvFile) {
+			exit('Error while reading CSV file.');
 		}
 
 		$i = 0;
 		$accumulator = [];
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-		while ( true ) {
-			$data = fgetcsv( $csvFile );
-			if ( $data === false || ++$i % $this->importSettings->getBatchSize() === 0 ) {
+		while (true) {
+			$data = fgetcsv($csvFile);
+			if ($data === false || ++$i % $this->importSettings->getBatchSize() === 0) {
 				try {
-					$this->externalDataRepo->insertBatch( $accumulator );
-				} catch ( DBError $e ) {
-					exit( 'Unknown database error occurred.' );
+					$this->externalDataRepo->insertBatch($accumulator);
+				} catch (DBError $e) {
+					exit('Unknown database error occurred.');
 				}
 				$lbFactory->waitForReplication();
 
-				$this->log( "\r\033[K" );
-				$this->log( "$i rows inserted" );
+				$this->log("\r\033[K");
+				$this->log("$i rows inserted");
 
 				$accumulator = [];
 
-				if ( $data === false ) {
+				if ($data === false) {
 					break;
 				}
 			}
@@ -151,16 +151,16 @@ 
 			$accumulator[] = $data;
 		}
 
-		fclose( $csvFile );
+		fclose($csvFile);
 
-		$this->log( "\n" );
+		$this->log("\n");
 	}
 
 	/**
 	 * @param string $text
 	 */
-	private function log( $text ) {
-		if ( !$this->importSettings->isQuiet() ) {
+	private function log($text) {
+		if (!$this->importSettings->isQuiet()) {
 			print $text;
 		}
 	}

includes/CrossCheck/Comparer/StringComparer.php

Spacing +40 added lines, -40 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	private $stringNormalizer;
 
-	public function __construct( StringNormalizer $stringNormalizer ) {
+	public function __construct(StringNormalizer $stringNormalizer) {
 		$this->stringNormalizer = $stringNormalizer;
 	}
 
@@ -33,16 +33,16 @@ 
 	 * @param string $comparativeValue
 	 * @return string
 	 */
-	public function compare( $value, $comparativeValue ) {
-		Assert::parameterType( 'string', $value, '$value' );
-		Assert::parameterType( 'string', $comparativeValue, '$comparativeValue' );
+	public function compare($value, $comparativeValue) {
+		Assert::parameterType('string', $value, '$value');
+		Assert::parameterType('string', $comparativeValue, '$comparativeValue');
 
-		$value = $this->cleanDataString( $value );
-		$comparativeValue = $this->cleanDataString( $comparativeValue );
+		$value = $this->cleanDataString($value);
+		$comparativeValue = $this->cleanDataString($comparativeValue);
 
-		if ( $value === $comparativeValue ) {
+		if ($value === $comparativeValue) {
 			return ComparisonResult::STATUS_MATCH;
-		} elseif ( $this->checkSimilarity( $value, $comparativeValue ) ) {
+		} elseif ($this->checkSimilarity($value, $comparativeValue)) {
 			return ComparisonResult::STATUS_PARTIAL_MATCH;
 		} else {
 			return ComparisonResult::STATUS_MISMATCH;
@@ -56,19 +56,19 @@ 
 	 * @param array $comparativeValues
 	 * @return string
 	 */
-	public function compareWithArray( $value, array $comparativeValues ) {
-		Assert::parameterType( 'string', $value, '$value' );
-		Assert::parameterElementType( 'string', $comparativeValues, '$comparativeValues' );
+	public function compareWithArray($value, array $comparativeValues) {
+		Assert::parameterType('string', $value, '$value');
+		Assert::parameterElementType('string', $comparativeValues, '$comparativeValues');
 
-		$value = $this->cleanDataString( $value );
-		$comparativeValues = $this->cleanDataArray( $comparativeValues );
+		$value = $this->cleanDataString($value);
+		$comparativeValues = $this->cleanDataArray($comparativeValues);
 
-		if ( in_array( $value, $comparativeValues ) ) {
+		if (in_array($value, $comparativeValues)) {
 			return ComparisonResult::STATUS_MATCH;
 		}
 
-		foreach ( $comparativeValues as $comparativeValue ) {
-			if ( $this->checkSimilarity( $comparativeValue, $value ) ) {
+		foreach ($comparativeValues as $comparativeValue) {
+			if ($this->checkSimilarity($comparativeValue, $value)) {
 				return ComparisonResult::STATUS_PARTIAL_MATCH;
 			}
 		}
@@ -83,10 +83,10 @@ 
 	 * @param string $comparativeValue
 	 * @return bool
 	 */
-	private function checkSimilarity( $value, $comparativeValue ) {
-		return $this->percentagePrefixSimilarity( $value, $comparativeValue ) > self::SIMILARITY_THRESHOLD
-			|| $this->percentageSuffixSimilarity( $value, $comparativeValue ) > self::SIMILARITY_THRESHOLD
-			|| $this->percentageLevenshteinDistance( $value, $comparativeValue ) > self::SIMILARITY_THRESHOLD;
+	private function checkSimilarity($value, $comparativeValue) {
+		return $this->percentagePrefixSimilarity($value, $comparativeValue) > self::SIMILARITY_THRESHOLD
+			|| $this->percentageSuffixSimilarity($value, $comparativeValue) > self::SIMILARITY_THRESHOLD
+			|| $this->percentageLevenshteinDistance($value, $comparativeValue) > self::SIMILARITY_THRESHOLD;
 	}
 
 	/**
@@ -96,10 +96,10 @@ 
 	 *
 	 * @return string
 	 */
-	private function cleanDataString( $value ) {
-		$value = $this->stringNormalizer->trimToNFC( $value );
+	private function cleanDataString($value) {
+		$value = $this->stringNormalizer->trimToNFC($value);
 
-		return mb_strtolower( $value );
+		return mb_strtolower($value);
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 *
 	 * @return array
 	 */
-	private function cleanDataArray( array $array ) {
+	private function cleanDataArray(array $array) {
 
 		return array_map(
-			[ $this, 'cleanDataString' ],
+			[$this, 'cleanDataString'],
 			$array );
 	}
 
@@ -124,19 +124,19 @@ 
 	 *
 	 * @return float
 	 */
-	private function percentagePrefixSimilarity( $value, $comparativeValue ) {
+	private function percentagePrefixSimilarity($value, $comparativeValue) {
 		$prefixLength = 0; // common prefix length
-		$localLength = strlen( $value );
-		$externalLength = strlen( $comparativeValue );
-		while ( $prefixLength < min( $localLength, $externalLength ) ) {
+		$localLength = strlen($value);
+		$externalLength = strlen($comparativeValue);
+		while ($prefixLength < min($localLength, $externalLength)) {
 			$c = $value[$prefixLength];
-			if ( $externalLength > $prefixLength && $comparativeValue[$prefixLength] !== $c ) {
+			if ($externalLength > $prefixLength && $comparativeValue[$prefixLength] !== $c) {
 				break;
 			}
 			$prefixLength++;
 		}
 
-		return $prefixLength / max( $localLength, $externalLength );
+		return $prefixLength / max($localLength, $externalLength);
 	}
 
 	/**
@@ -147,19 +147,19 @@ 
 	 *
 	 * @return float
 	 */
-	private function percentageSuffixSimilarity( $value, $comparativeValue ) {
+	private function percentageSuffixSimilarity($value, $comparativeValue) {
 		$suffixLength = 0; // common suffix length
-		$localLength = strlen( $value );
-		$externalLength = strlen( $comparativeValue );
-		while ( $suffixLength < min( $localLength, $externalLength ) ) {
+		$localLength = strlen($value);
+		$externalLength = strlen($comparativeValue);
+		while ($suffixLength < min($localLength, $externalLength)) {
 			$c = $value[$localLength - 1 - $suffixLength];
-			if ( $externalLength > $suffixLength && $comparativeValue[$externalLength - 1 - $suffixLength] !== $c ) {
+			if ($externalLength > $suffixLength && $comparativeValue[$externalLength - 1 - $suffixLength] !== $c) {
 				break;
 			}
 			$suffixLength++;
 		}
 
-		return $suffixLength / max( $localLength, $externalLength );
+		return $suffixLength / max($localLength, $externalLength);
 	}
 
 	/**
@@ -170,9 +170,9 @@ 
 	 *
 	 * @return float
 	 */
-	private function percentageLevenshteinDistance( $value, $comparativeValue ) {
-		$distance = levenshtein( $value, $comparativeValue );
-		$percentage = 1.0 - $distance / max( strlen( $value ), strlen( $comparativeValue ) );
+	private function percentageLevenshteinDistance($value, $comparativeValue) {
+		$distance = levenshtein($value, $comparativeValue);
+		$percentage = 1.0 - $distance / max(strlen($value), strlen($comparativeValue));
 
 		return $percentage;
 	}

api/RunCrossCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 	/**
 	 * Writes output for CrossCheckResultList
 	 *
-	 * @param array $resultLists
+	 * @param \WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList[] $resultLists
 	 */
 	private function writeResultOutput( array $resultLists ) {
 		$serializer = $this->serializerFactory->newCrossCheckResultListSerializer();

Spacing +31 added lines, -31 removed lines

@@ -64,7 +64,7 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$repo = WikibaseRepo::getDefaultInstance();
 		$externalValidationServices = ExternalValidationServices::getDefaultInstance();
 
@@ -76,7 +76,7 @@ 
 			$repo->getStatementGuidValidator(),
 			$externalValidationServices->getCrossCheckInteractor(),
 			$externalValidationServices->getSerializerFactory(),
-			$repo->getApiHelperFactory( RequestContext::getMain() )
+			$repo->getApiHelperFactory(RequestContext::getMain())
 		);
 	}
 
@@ -100,14 +100,14 @@ 
 		SerializerFactory $serializerFactory,
 		ApiHelperFactory $apiHelperFactory
 	) {
-		parent::__construct( $main, $name, $prefix );
+		parent::__construct($main, $name, $prefix);
 
 		$this->entityIdParser = $entityIdParser;
 		$this->statementGuidValidator = $statementGuidValidator;
 		$this->crossCheckInteractor = $crossCheckInteractor;
 		$this->serializerFactory = $serializerFactory;
-		$this->resultBuilder = $apiHelperFactory->getResultBuilder( $this );
-		$this->errorReporter = $apiHelperFactory->getErrorReporter( $this );
+		$this->resultBuilder = $apiHelperFactory->getResultBuilder($this);
+		$this->errorReporter = $apiHelperFactory->getErrorReporter($this);
 	}
 
 	/**
@@ -116,34 +116,34 @@ 
 	public function execute() {
 		$params = $this->extractRequestParams();
 
-		if ( $params['entities'] && $params['claims'] ) {
+		if ($params['entities'] && $params['claims']) {
 			$this->errorReporter->dieError(
 				'Either provide the ids of entities or ids of claims, that should be cross-checked.',
 				'param-invalid'
 			);
 			throw new LogicException();
-		} elseif ( $params['entities'] ) {
-			$entityIds = $this->parseEntityIds( $params['entities'] );
-			if ( $params['properties'] ) {
-				$propertyIds = $this->parseEntityIds( $params['properties'] );
-				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIdWithProperties( $entityIds, $propertyIds );
+		} elseif ($params['entities']) {
+			$entityIds = $this->parseEntityIds($params['entities']);
+			if ($params['properties']) {
+				$propertyIds = $this->parseEntityIds($params['properties']);
+				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIdWithProperties($entityIds, $propertyIds);
 			} else {
-				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIds( $entityIds );
+				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIds($entityIds);
 			}
-		} elseif ( $params['claims'] ) {
+		} elseif ($params['claims']) {
 			$guids = $params['claims'];
-			$this->assertAreValidClaimGuids( $guids );
-			$resultLists = $this->crossCheckInteractor->crossCheckStatementsByGuids( $guids );
+			$this->assertAreValidClaimGuids($guids);
+			$resultLists = $this->crossCheckInteractor->crossCheckStatementsByGuids($guids);
 		} else {
 			$this->errorReporter->dieWithError(
-				[ 'wikibase-api-param-missing', 'entities|claims' ],
+				['wikibase-api-param-missing', 'entities|claims'],
 				'param-missing'
 			);
 			throw new LogicException();
 		}
 
 		// Print result lists
-		$this->writeResultOutput( $resultLists );
+		$this->writeResultOutput($resultLists);
 	}
 
 	/**
@@ -151,9 +151,9 @@ 
 	 *
 	 * @return EntityId[]
 	 */
-	private function parseEntityIds( array $entityIds ) {
+	private function parseEntityIds(array $entityIds) {
 		return array_map(
-			[ $this->entityIdParser, 'parse' ],
+			[$this->entityIdParser, 'parse'],
 			$entityIds
 		);
 	}
@@ -161,10 +161,10 @@ 
 	/**
 	 * @param string[] $guids
 	 */
-	private function assertAreValidClaimGuids( array $guids ) {
-		foreach ( $guids as $guid ) {
-			if ( $this->statementGuidValidator->validateFormat( $guid ) === false ) {
-				$this->errorReporter->dieError( 'Invalid claim guid.', 'invalid-guid' );
+	private function assertAreValidClaimGuids(array $guids) {
+		foreach ($guids as $guid) {
+			if ($this->statementGuidValidator->validateFormat($guid) === false) {
+				$this->errorReporter->dieError('Invalid claim guid.', 'invalid-guid');
 			}
 		}
 	}
@@ -174,13 +174,13 @@ 
 	 *
 	 * @param array $resultLists
 	 */
-	private function writeResultOutput( array $resultLists ) {
+	private function writeResultOutput(array $resultLists) {
 		$serializer = $this->serializerFactory->newCrossCheckResultListSerializer();
 
 		$output = [];
-		foreach ( $resultLists as $entityId => $resultList ) {
-			if ( $resultList ) {
-				$serializedResultList = $serializer->serialize( $resultList );
+		foreach ($resultLists as $entityId => $resultList) {
+			if ($resultList) {
+				$serializedResultList = $serializer->serialize($resultList);
 
 				$output[$entityId] = $serializedResultList;
 			} else {
@@ -190,10 +190,10 @@ 
 			}
 		}
 
-		$this->getResult()->setIndexedTagName( $output, 'entity' );
-		$this->getResult()->setArrayType( $output, 'kvp', 'id' );
-		$this->getResult()->addValue( null, 'results', $output );
-		$this->resultBuilder->markSuccess( 1 );
+		$this->getResult()->setIndexedTagName($output, 'entity');
+		$this->getResult()->setArrayType($output, 'kvp', 'id');
+		$this->getResult()->addValue(null, 'results', $output);
+		$this->resultBuilder->markSuccess(1);
 	}
 
 	/**