wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/CrossCheck/Comparer/DataValueComparer.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue );
+	public function canCompare(DataValue $value, DataValue $comparativeValue);
 
 	/**
 	 * Runs the comparison of two DataValues.
@@ -28,6 +28,6 @@ 
 	 *
 	 * @return string One of the ComparisonResult::STATUS_... constants.
 	 */
-	public function compare( DataValue $value, DataValue $comparativeValue );
+	public function compare(DataValue $value, DataValue $comparativeValue);
 
 }

includes/CrossCheck/Comparer/DataValueComparerFactory.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param TermIndex $termIndex
 	 * @param StringNormalizer $stringNormalizer
 	 */
-	public function __construct( TermIndex $termIndex, StringNormalizer $stringNormalizer ) {
+	public function __construct(TermIndex $termIndex, StringNormalizer $stringNormalizer) {
 		$this->termIndex = $termIndex;
 		$this->stringNormalizer = $stringNormalizer;
 	}
@@ -68,7 +68,7 @@ 
 	 * @return StringComparer
 	 */
 	private function newStringComparer() {
-		return new StringComparer( $this->stringNormalizer );
+		return new StringComparer($this->stringNormalizer);
 	}
 
 	/**

includes/CrossCheck/Comparer/DispatchingDataValueComparer.php

Spacing +12 added lines, -12 removed lines

@@ -20,8 +20,8 @@ 
 	/**
 	 * @param DataValueComparer[] $dataValueComparers
 	 */
-	public function __construct( array $dataValueComparers = array() ) {
-		$this->assertAreDataValueComparer( $dataValueComparers );
+	public function __construct(array $dataValueComparers = array()) {
+		$this->assertAreDataValueComparer($dataValueComparers);
 		$this->dataValueComparers = $dataValueComparers;
 	}
 
@@ -30,9 +30,9 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	protected function assertAreDataValueComparer( array $dataValueComparers ) {
-		foreach ( $dataValueComparers as $dataValueComparer ) {
-			if ( !is_object( $dataValueComparer ) || !( $dataValueComparer instanceof DataValueComparer ) ) {
+	protected function assertAreDataValueComparer(array $dataValueComparers) {
+		foreach ($dataValueComparers as $dataValueComparer) {
+			if (!is_object($dataValueComparer) || !($dataValueComparer instanceof DataValueComparer)) {
 				throw new InvalidArgumentException(
 					'All $dataValueComparers need to implement the DataValueComparer interface'
 				);
@@ -48,9 +48,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
-		foreach ( $this->dataValueComparers as $dataValueComparer ) {
-			if ( $dataValueComparer->canCompare( $value, $comparativeValue ) ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
+		foreach ($this->dataValueComparers as $dataValueComparer) {
+			if ($dataValueComparer->canCompare($value, $comparativeValue)) {
 				return true;
 			}
 		}
@@ -67,10 +67,10 @@ 
 	 * @throws InvalidArgumentException
 	 * @return string One of the ComparisonResult::STATUS_... constants.
 	 */
-	public function compare( DataValue $value, DataValue $comparativeValue ) {
-		foreach ( $this->dataValueComparers as $dataValueComparer ) {
-			if ( $dataValueComparer->canCompare( $value, $comparativeValue ) ) {
-				return $dataValueComparer->compare( $value, $comparativeValue );
+	public function compare(DataValue $value, DataValue $comparativeValue) {
+		foreach ($this->dataValueComparers as $dataValueComparer) {
+			if ($dataValueComparer->canCompare($value, $comparativeValue)) {
+				return $dataValueComparer->compare($value, $comparativeValue);
 			}
 		}
 

includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php

Spacing +8 added lines, -8 removed lines

@@ -23,9 +23,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.');
 		}
 
 		/**
@@ -39,14 +39,14 @@ 
 		$extLat = $comparativeValue->getLatitude();
 		$extLong = $comparativeValue->getLongitude();
 
-		$diffLat = abs( $locLat - $extLat );
-		$diffLong = abs( $locLong - $extLong );
-		if ( ( $diffLat <= $precision ) && ( $diffLong <= $precision ) ) {
+		$diffLat = abs($locLat - $extLat);
+		$diffLong = abs($locLong - $extLong);
+		if (($diffLat <= $precision) && ($diffLong <= $precision)) {
 			return ComparisonResult::STATUS_MATCH;
 		}
 
 		$daumen = $precision;
-		if ( ( $diffLat <= pi() * $daumen ) && ( $diffLong <= pi() * $daumen ) ) {
+		if (($diffLat <= pi() * $daumen) && ($diffLong <= pi() * $daumen)) {
 			return ComparisonResult::STATUS_PARTIAL_MATCH;
 		}
 
@@ -60,7 +60,7 @@ 
 	 * @param DataValue $comparativeValue
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof GlobeCoordinateValue && $comparativeValue instanceof GlobeCoordinateValue;
 	}
 

includes/CrossCheck/Comparer/MonolingualTextValueComparer.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * @param StringComparer $stringComparer
 	 */
-	public function __construct( StringComparer $stringComparer ) {
+	public function __construct(StringComparer $stringComparer) {
 		$this->stringComparer = $stringComparer;
 	}
 
@@ -35,9 +35,9 @@ 
 	 * @throws InvalidArgumentException
 	 * @return string|null 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.');
 		}
 
 		/**
@@ -45,8 +45,8 @@ 
 		 * @var MonolingualTextValue $comparativeValue
 		 */
 
-		if ( $value->getLanguageCode() === $comparativeValue->getLanguageCode() ) {
-			return $this->stringComparer->compare( $value->getText(), $comparativeValue->getText() );
+		if ($value->getLanguageCode() === $comparativeValue->getLanguageCode()) {
+			return $this->stringComparer->compare($value->getText(), $comparativeValue->getText());
 		}
 
 		return null;
@@ -59,7 +59,7 @@ 
 	 * @param DataValue $comparativeValue
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof MonolingualTextValue && $comparativeValue instanceof MonolingualTextValue;
 	}
 

includes/CrossCheck/Comparer/MultilingualTextValueComparer.php

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * @param StringComparer $stringComparer
 	 */
-	public function __construct( StringComparer $stringComparer ) {
+	public function __construct(StringComparer $stringComparer) {
 		$this->stringComparer = $stringComparer;
 	}
 
@@ -35,9 +35,9 @@ 
 	 * @throws InvalidArgumentException
 	 * @return string|null 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.');
 		}
 
 		/**
@@ -47,21 +47,21 @@ 
 
 		$texts = $value->getTexts();
 		$comparativeTexts = $comparativeValue->getTexts();
-		$commonLanguages = array_intersect( array_keys( $texts ), array_keys( $comparativeTexts ) );
+		$commonLanguages = array_intersect(array_keys($texts), array_keys($comparativeTexts));
 
-		if ( $commonLanguages ) {
+		if ($commonLanguages) {
 			$totalResult = ComparisonResult::STATUS_MISMATCH;
 
-			foreach ( $commonLanguages as $language ) {
+			foreach ($commonLanguages as $language) {
 				$monolingualText = $texts[$language];
 				$comparativeMonolingualText = $comparativeTexts[$language];
 
-				$result = $this->stringComparer->compare( $monolingualText->getText(), $comparativeMonolingualText->getText() );
-				if ( $result !== ComparisonResult::STATUS_MISMATCH ) {
+				$result = $this->stringComparer->compare($monolingualText->getText(), $comparativeMonolingualText->getText());
+				if ($result !== ComparisonResult::STATUS_MISMATCH) {
 					$totalResult = $result;
 
 					// FIXME: This reports a partial match in a single language as a full match!
-					if ( $result === ComparisonResult::STATUS_MATCH ) {
+					if ($result === ComparisonResult::STATUS_MATCH) {
 						break;
 					}
 				}
@@ -80,7 +80,7 @@ 
 	 * @param DataValue $comparativeValue
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof MultilingualTextValue && $comparativeValue instanceof MultilingualTextValue;
 	}
 

includes/CrossCheck/Comparer/QuantityValueComparer.php

Spacing +6 added lines, -6 removed lines

@@ -23,9 +23,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.');
 		}
 
 		/**
@@ -33,8 +33,8 @@ 
 		 * @var QuantityValue $comparativeValue
 		 */
 
-		if ( $comparativeValue->getLowerBound()->compare( $value->getUpperBound() ) <= 0 &&
-			$comparativeValue->getUpperBound()->compare( $value->getLowerBound() ) >= 0
+		if ($comparativeValue->getLowerBound()->compare($value->getUpperBound()) <= 0 &&
+			$comparativeValue->getUpperBound()->compare($value->getLowerBound()) >= 0
 		) {
 			return ComparisonResult::STATUS_MATCH;
 		}
@@ -49,7 +49,7 @@ 
 	 * @param DataValue $comparativeValue
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof QuantityValue && $comparativeValue instanceof QuantityValue;
 	}
 

includes/CrossCheck/Comparer/StringComparer.php

Spacing +40 added lines, -40 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @param StringNormalizer $stringNormalizer
 	 */
-	public function __construct( StringNormalizer $stringNormalizer ) {
+	public function __construct(StringNormalizer $stringNormalizer) {
 		$this->stringNormalizer = $stringNormalizer;
 	}
 
@@ -37,16 +37,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;
@@ -60,19 +60,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;
 			}
 		}
@@ -87,11 +87,11 @@ 
 	 * @param string $comparativeValue
 	 * @return bool
 	 */
-	private function checkSimilarity( $value, $comparativeValue ) {
+	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;
+			$this->percentagePrefixSimilarity($value, $comparativeValue) > self::SIMILARITY_THRESHOLD ||
+			$this->percentageSuffixSimilarity($value, $comparativeValue) > self::SIMILARITY_THRESHOLD ||
+			$this->percentageLevenshteinDistance($value, $comparativeValue) > self::SIMILARITY_THRESHOLD;
 	}
 
 	/**
@@ -101,10 +101,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);
 	}
 
 	/**
@@ -114,10 +114,10 @@ 
 	 *
 	 * @return array
 	 */
-	private function cleanDataArray( array $array ) {
+	private function cleanDataArray(array $array) {
 
 		return array_map(
-			array( $this, 'cleanDataString' ),
+			array($this, 'cleanDataString'),
 			$array );
 	}
 
@@ -129,19 +129,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);
 	}
 
 	/**
@@ -152,19 +152,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);
 	}
 
 	/**
@@ -175,9 +175,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;
 	}

includes/CrossCheck/Comparer/StringValueComparer.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 	/**
 	 * @param StringComparer $stringComparer
 	 */
-	public function __construct( StringComparer $stringComparer ) {
+	public function __construct(StringComparer $stringComparer) {
 		$this->stringComparer = $stringComparer;
 	}
 
@@ -34,12 +34,12 @@ 
 	 * @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.');
 		}
 
-		return $this->stringComparer->compare( $value->getValue(), $comparativeValue->getValue() );
+		return $this->stringComparer->compare($value->getValue(), $comparativeValue->getValue());
 	}
 
 	/**
@@ -49,7 +49,7 @@ 
 	 * @param DataValue $comparativeValue
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof StringValue && $comparativeValue instanceof StringValue;
 	}