wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

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);
 	}
 
 	/**

WikibaseQualityExternalValidation.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-if ( function_exists( 'wfLoadExtension' ) ) {
-	wfLoadExtension( 'WikibaseQualityExternalValidation', __DIR__ . '/extension.json' );
+if (function_exists('wfLoadExtension')) {
+	wfLoadExtension('WikibaseQualityExternalValidation', __DIR__.'/extension.json');
 	// Keep i18n globals so mergeMessageFileList.php doesn't break
-	$GLOBALS['wgMessagesDirs']['WikibaseQualityExternalValidation'] = __DIR__ . '/i18n';
+	$GLOBALS['wgMessagesDirs']['WikibaseQualityExternalValidation'] = __DIR__.'/i18n';
 	$GLOBALS['wgExtensionMessagesFiles']['WikibaseQualityExternalValidationAlias'] =
-		__DIR__ . '/WikibaseQualityExternalValidation.alias.php';
+		__DIR__.'/WikibaseQualityExternalValidation.alias.php';
 	/* wfWarn(
 		'Deprecated PHP entry point used for WikibaseQualityConstraints extension. ' .
 		'Please use wfLoadExtension instead, ' .
@@ -13,5 +13,5 @@ 
 	); */
 	return;
 } else {
-	die( 'This version of the WikibaseQualityExternalValidation extension requires MediaWiki 1.25+' );
+	die('This version of the WikibaseQualityExternalValidation extension requires MediaWiki 1.25+');
 }

includes/CrossCheck/Comparer/TimeValueComparer.php

Spacing +23 added lines, -23 removed lines

@@ -29,9 +29,9 @@ 
 	 * @throws InvalidArgumentException
 	 * @return string One of the ComparisonResult::STATUS_... constants.
 	 */
-	public function compare( DataValue $value, DataValue $comparativeValue ) {
-		if ( !$this->canCompare( $value, $comparativeValue ) ) {
-			throw new InvalidArgumentException( 'Given values can not be compared using this comparer.' );
+	public function compare(DataValue $value, DataValue $comparativeValue) {
+		if (!$this->canCompare($value, $comparativeValue)) {
+			throw new InvalidArgumentException('Given values can not be compared using this comparer.');
 		}
 
 		/**
@@ -41,15 +41,15 @@ 
 
 		$result = ComparisonResult::STATUS_MISMATCH;
 
-		if ( !preg_match( '/^([-+]?)(\d*)((\d{4}\b).*)/', $value->getTime(), $localMatches )
-			|| !preg_match( '/^([-+]?)(\d*)((\d{4}\b).*)/', $comparativeValue->getTime(), $externalMatches )
+		if (!preg_match('/^([-+]?)(\d*)((\d{4}\b).*)/', $value->getTime(), $localMatches)
+			|| !preg_match('/^([-+]?)(\d*)((\d{4}\b).*)/', $comparativeValue->getTime(), $externalMatches)
 		) {
 			return ComparisonResult::STATUS_MISMATCH;
 		}
-		list( , $localSign, $localYearHigh, $localMwTime, $localYearLow ) = $localMatches;
-		list( , $externalSign, $externalYearHigh, $externalMwTime, $externalYearLow ) = $externalMatches;
-		if ( $localSign !== $externalSign && ( $localYearHigh . $localYearLow !== '0000'
-				|| $externalYearHigh . $externalYearLow !== '0000' )
+		list(, $localSign, $localYearHigh, $localMwTime, $localYearLow) = $localMatches;
+		list(, $externalSign, $externalYearHigh, $externalMwTime, $externalYearLow) = $externalMatches;
+		if ($localSign !== $externalSign && ($localYearHigh.$localYearLow !== '0000'
+				|| $externalYearHigh.$externalYearLow !== '0000')
 		) {
 			return ComparisonResult::STATUS_MISMATCH;
 		}
@@ -58,24 +58,24 @@ 
 		$externalYearHigh = $externalYearHigh === '' ? 0 : (float)$externalYearHigh;
 
 		try {
-			$localTimestamp = new MWTimestamp( $localMwTime );
-			$externalTimestamp = new MWTimestamp( $externalMwTime );
-			$diff = $localTimestamp->diff( $externalTimestamp );
-			$diff->y += abs( $localYearHigh - $externalYearHigh ) * 10000;
+			$localTimestamp = new MWTimestamp($localMwTime);
+			$externalTimestamp = new MWTimestamp($externalMwTime);
+			$diff = $localTimestamp->diff($externalTimestamp);
+			$diff->y += abs($localYearHigh - $externalYearHigh) * 10000;
 
-			if ( $value->getPrecision() === $comparativeValue->getPrecision()
-				&& $this->resultOfDiffWithPrecision( $diff, $value->getPrecision() )
+			if ($value->getPrecision() === $comparativeValue->getPrecision()
+				&& $this->resultOfDiffWithPrecision($diff, $value->getPrecision())
 			) {
 				$result = ComparisonResult::STATUS_MATCH;
 			} elseif (
 				$this->resultOfDiffWithPrecision(
 					$diff,
-					min( $value->getPrecision(), $comparativeValue->getPrecision() )
+					min($value->getPrecision(), $comparativeValue->getPrecision())
 				)
 			) {
 				$result = ComparisonResult::STATUS_PARTIAL_MATCH;
 			}
-		} catch ( TimestampException $ex ) {
+		} catch (TimestampException $ex) {
 		}
 
 		return $result;
@@ -89,10 +89,10 @@ 
 	 *
 	 * @return bool
 	 */
-	private function resultOfDiffWithPrecision( DateInterval $diff, $precision ) {
+	private function resultOfDiffWithPrecision(DateInterval $diff, $precision) {
 		$result = true;
 
-		switch ( $precision ) {
+		switch ($precision) {
 			case TimeValue::PRECISION_SECOND:
 				$result = $diff->s === 0;
 				// Fall through with no break/return. This is critical for this algorithm.
@@ -136,10 +136,10 @@ 
 	 *
 	 * @return ValueParser
 	 */
-	protected function getExternalValueParser( DumpMetaInformation $dumpMetaInformation ) {
+	protected function getExternalValueParser(DumpMetaInformation $dumpMetaInformation) {
 		$parserOptions = new ParserOptions();
-		$parserOptions->setOption( ValueParser::OPT_LANG, $dumpMetaInformation->getLanguageCode() );
-		$timeParserFactory = new TimeParserFactory( $parserOptions );
+		$parserOptions->setOption(ValueParser::OPT_LANG, $dumpMetaInformation->getLanguageCode());
+		$timeParserFactory = new TimeParserFactory($parserOptions);
 
 		return $timeParserFactory->getTimeParser();
 	}
@@ -152,7 +152,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof TimeValue && $comparativeValue instanceof TimeValue;
 	}