wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

specials/SpecialCrossCheck.php

Spacing +99 added lines, -99 removed lines

@@ -98,18 +98,18 @@ 
 		OutputFormatValueFormatterFactory $valueFormatterFactory,
 		CrossCheckInteractor $crossCheckInteractor
 	) {
-		parent::__construct( 'CrossCheck' );
+		parent::__construct('CrossCheck');
 
 		$this->entityLookup = $entityLookup;
 		$this->entityIdParser = $entityIdParser;
 
 		$formatterOptions = new FormatterOptions();
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $this->getLanguage()->getCode() );
-		$this->dataValueFormatter = $valueFormatterFactory->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions );
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $this->getLanguage()->getCode());
+		$this->dataValueFormatter = $valueFormatterFactory->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions);
 
-		$labelLookup = new LanguageLabelDescriptionLookup( $termLookup, $this->getLanguage()->getCode() );
-		$this->entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter( $labelLookup );
-		$this->entityIdLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $labelLookup );
+		$labelLookup = new LanguageLabelDescriptionLookup($termLookup, $this->getLanguage()->getCode());
+		$this->entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter($labelLookup);
+		$this->entityIdLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($labelLookup);
 
 		$this->crossCheckInteractor = $crossCheckInteractor;
 	}
@@ -129,7 +129,7 @@ 
 	 * @return string (plain text)
 	 */
 	public function getDescription() {
-		return $this->msg( 'wbqev-crosscheck' )->text();
+		return $this->msg('wbqev-crosscheck')->text();
 	}
 
 	/**
@@ -141,55 +141,55 @@ 
 	 * @throws EntityIdParsingException
 	 * @throws UnexpectedValueException
 	 */
-	public function execute( $subPage ) {
+	public function execute($subPage) {
 		$out = $this->getOutput();
-		$postRequest = $this->getContext()->getRequest()->getVal( 'entityid' );
-		if ( $postRequest ) {
-			$out->redirect( $this->getPageTitle( strtoupper( $postRequest ) )->getLocalURL() );
+		$postRequest = $this->getContext()->getRequest()->getVal('entityid');
+		if ($postRequest) {
+			$out->redirect($this->getPageTitle(strtoupper($postRequest))->getLocalURL());
 			return;
 		}
 
-		$out->addModules( 'SpecialCrossCheckPage' );
+		$out->addModules('SpecialCrossCheckPage');
 
 		$this->setHeaders();
 
-		$out->addHTML( $this->buildInfoBox() );
+		$out->addHTML($this->buildInfoBox());
 		$this->buildEntityIdForm();
 
-		if ( $subPage ) {
-			$this->buildResult( $subPage );
+		if ($subPage) {
+			$this->buildResult($subPage);
 		}
 	}
 
 	/**
 	 * @param string $idSerialization
 	 */
-	private function buildResult( $idSerialization ) {
+	private function buildResult($idSerialization) {
 		$out = $this->getOutput();
 
 		try {
-			$entityId = $this->entityIdParser->parse( $idSerialization );
-		} catch ( EntityIdParsingException $ex ) {
-			$out->addHTML( $this->buildNotice( 'wbqev-crosscheck-invalid-entity-id', true ) );
+			$entityId = $this->entityIdParser->parse($idSerialization);
+		} catch (EntityIdParsingException $ex) {
+			$out->addHTML($this->buildNotice('wbqev-crosscheck-invalid-entity-id', true));
 			return;
 		}
 
-		$out->addHTML( $this->buildResultHeader( $entityId ) );
+		$out->addHTML($this->buildResultHeader($entityId));
 
-		$entity = $this->entityLookup->getEntity( $entityId );
-		if ( $entity === null ) {
-			$out->addHTML( $this->buildNotice( 'wbqev-crosscheck-not-existent-entity', true ) );
+		$entity = $this->entityLookup->getEntity($entityId);
+		if ($entity === null) {
+			$out->addHTML($this->buildNotice('wbqev-crosscheck-not-existent-entity', true));
 			return;
 		}
 
-		$results = $this->getCrossCheckResultsFromEntity( $entity );
+		$results = $this->getCrossCheckResultsFromEntity($entity);
 
-		if ( $results === null || $results->toArray() === [] ) {
-			$out->addHTML( $this->buildNotice( 'wbqev-crosscheck-empty-result' ) );
+		if ($results === null || $results->toArray() === []) {
+			$out->addHTML($this->buildNotice('wbqev-crosscheck-empty-result'));
 		} else {
 			$out->addHTML(
-				$this->buildSummary( $results )
-				. $this->buildResultTable( $results )
+				$this->buildSummary($results)
+				. $this->buildResultTable($results)
 			);
 		}
 	}
@@ -199,9 +199,9 @@ 
 	 *
 	 * @return CrossCheckResultList|null
 	 */
-	private function getCrossCheckResultsFromEntity( EntityDocument $entity ) {
-		if ( $entity instanceof StatementListProvider ) {
-			return $this->crossCheckInteractor->crossCheckStatements( $entity->getStatements() );
+	private function getCrossCheckResultsFromEntity(EntityDocument $entity) {
+		if ($entity instanceof StatementListProvider) {
+			return $this->crossCheckInteractor->crossCheckStatements($entity->getStatements());
 		}
 
 		return null;
@@ -218,15 +218,15 @@ 
 				'name' => 'entityid',
 				'label-message' => 'wbqev-crosscheck-form-entityid-label',
 				'cssclass' => 'wbqev-crosscheck-form-entity-id',
-				'placeholder' => $this->msg( 'wbqev-crosscheck-form-entityid-placeholder' )->escaped()
+				'placeholder' => $this->msg('wbqev-crosscheck-form-entityid-placeholder')->escaped()
 			]
 		];
-		$htmlForm = new HTMLForm( $formDescriptor, $this->getContext(), 'wbqev-crosscheck-form' );
-		$htmlForm->setSubmitText( $this->msg( 'wbqev-crosscheck-form-submit-label' )->escaped() );
-		$htmlForm->setSubmitCallback( function() {
+		$htmlForm = new HTMLForm($formDescriptor, $this->getContext(), 'wbqev-crosscheck-form');
+		$htmlForm->setSubmitText($this->msg('wbqev-crosscheck-form-submit-label')->escaped());
+		$htmlForm->setSubmitCallback(function() {
 			return false;
 		} );
-		$htmlForm->setMethod( 'post' );
+		$htmlForm->setMethod('post');
 		$htmlForm->show();
 	}
 
@@ -236,18 +236,18 @@ 
 	 * @return string HTML
 	 */
 	private function buildInfoBox() {
-		$externalDbLink = Linker::specialLink( 'ExternalDatabases', 'wbqev-externaldbs' );
+		$externalDbLink = Linker::specialLink('ExternalDatabases', 'wbqev-externaldbs');
 		$infoBox =
 			Html::openElement(
 				'div',
-				[ 'class' => 'wbqev-infobox' ]
+				['class' => 'wbqev-infobox']
 			)
-			. $this->msg( 'wbqev-crosscheck-explanation-general' )->parse()
-			. sprintf( ' %s.', $externalDbLink )
-			. Html::element( 'br' )
-			. Html::element( 'br' )
-			. $this->msg( 'wbqev-crosscheck-explanation-detail' )->parse()
-			. Html::closeElement( 'div' );
+			. $this->msg('wbqev-crosscheck-explanation-general')->parse()
+			. sprintf(' %s.', $externalDbLink)
+			. Html::element('br')
+			. Html::element('br')
+			. $this->msg('wbqev-crosscheck-explanation-detail')->parse()
+			. Html::closeElement('div');
 
 		return $infoBox;
 	}
@@ -262,16 +262,16 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildNotice( $messageKey, $error = false ) {
+	private function buildNotice($messageKey, $error = false) {
 		$cssClasses = 'wbqev-crosscheck-notice';
-		if ( $error ) {
+		if ($error) {
 			$cssClasses .= ' wbqev-crosscheck-notice-error';
 		}
 
 		return Html::element(
 			'p',
-			[ 'class' => $cssClasses ],
-			$this->msg( $messageKey )->text()
+			['class' => $cssClasses],
+			$this->msg($messageKey)->text()
 		);
 	}
 
@@ -282,17 +282,17 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildResultHeader( EntityId $entityId ) {
+	private function buildResultHeader(EntityId $entityId) {
 		$entityLink = sprintf(
 			'%s (%s)',
-			$this->entityIdLinkFormatter->formatEntityId( $entityId ),
-			htmlspecialchars( $entityId->getSerialization() )
+			$this->entityIdLinkFormatter->formatEntityId($entityId),
+			htmlspecialchars($entityId->getSerialization())
 		);
 
 		return Html::rawElement(
 			'h3',
 			[],
-			sprintf( '%s %s', $this->msg( 'wbqev-crosscheck-result-headline' )->escaped(), $entityLink )
+			sprintf('%s %s', $this->msg('wbqev-crosscheck-result-headline')->escaped(), $entityLink)
 		);
 	}
 
@@ -303,11 +303,11 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildSummary( $results ) {
+	private function buildSummary($results) {
 		$statuses = [];
-		foreach ( $results as $result ) {
-			$status = strtolower( $result->getComparisonResult()->getStatus() );
-			if ( array_key_exists( $status, $statuses ) ) {
+		foreach ($results as $result) {
+			$status = strtolower($result->getComparisonResult()->getStatus());
+			if (array_key_exists($status, $statuses)) {
 				$statuses[$status]++;
 			} else {
 				$statuses[$status] = 1;
@@ -315,15 +315,15 @@ 
 		}
 
 		$statusElements = [];
-		foreach ( $statuses as $status => $count ) {
-			if ( $count > 0 ) {
-				$statusElements[] = $this->formatStatus( $status ) . ': ' . $count;
+		foreach ($statuses as $status => $count) {
+			if ($count > 0) {
+				$statusElements[] = $this->formatStatus($status).': '.$count;
 			}
 		}
 		$summary =
-			Html::openElement( 'p' )
-			. implode( ', ', $statusElements )
-			. Html::closeElement( 'p' );
+			Html::openElement('p')
+			. implode(', ', $statusElements)
+			. Html::closeElement('p');
 
 		return $summary;
 	}
@@ -337,16 +337,16 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function formatStatus( $status ) {
-		$messageKey = 'wbqev-crosscheck-status-' . strtolower( $status );
+	private function formatStatus($status) {
+		$messageKey = 'wbqev-crosscheck-status-'.strtolower($status);
 
 		$formattedStatus =
 			Html::element(
 				'span',
 				[
-					'class' => 'wbqev-status wbqev-status-' . htmlspecialchars( $status )
+					'class' => 'wbqev-status wbqev-status-'.htmlspecialchars($status)
 				],
-				$this->msg( $messageKey )->text()
+				$this->msg($messageKey)->text()
 			);
 
 		return $formattedStatus;
@@ -363,29 +363,29 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function formatDataValues( $dataValues, $linking = true, $separator = null ) {
-		if ( $dataValues instanceof DataValue ) {
-			$dataValues = [ $dataValues ];
+	private function formatDataValues($dataValues, $linking = true, $separator = null) {
+		if ($dataValues instanceof DataValue) {
+			$dataValues = [$dataValues];
 		}
 
 		$formattedDataValues = [];
-		foreach ( $dataValues as $dataValue ) {
-			if ( $dataValue instanceof EntityIdValue ) {
-				if ( $linking ) {
-					$formattedDataValues[] = $this->entityIdLinkFormatter->formatEntityId( $dataValue->getEntityId() );
+		foreach ($dataValues as $dataValue) {
+			if ($dataValue instanceof EntityIdValue) {
+				if ($linking) {
+					$formattedDataValues[] = $this->entityIdLinkFormatter->formatEntityId($dataValue->getEntityId());
 				} else {
-					$formattedDataValues[] = $this->entityIdLabelFormatter->formatEntityId( $dataValue->getEntityId() );
+					$formattedDataValues[] = $this->entityIdLabelFormatter->formatEntityId($dataValue->getEntityId());
 				}
 			} else {
-				$formattedDataValues[] = $this->dataValueFormatter->format( $dataValue );
+				$formattedDataValues[] = $this->dataValueFormatter->format($dataValue);
 			}
 		}
 
-		if ( $separator ) {
-			return implode( $separator, $formattedDataValues );
+		if ($separator) {
+			return implode($separator, $formattedDataValues);
 		}
 
-		return $this->getLanguage()->commaList( $formattedDataValues );
+		return $this->getLanguage()->commaList($formattedDataValues);
 	}
 
 	/**
@@ -393,31 +393,31 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildResultTable( $results ) {
+	private function buildResultTable($results) {
 		$table = new HtmlTableBuilder(
 			[
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqev-crosscheck-result-table-header-status' )->escaped(),
+					$this->msg('wbqev-crosscheck-result-table-header-status')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'datatypes-type-wikibase-property' )->escaped(),
+					$this->msg('datatypes-type-wikibase-property')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqev-crosscheck-result-table-header-local-value' )->escaped()
+					$this->msg('wbqev-crosscheck-result-table-header-local-value')->escaped()
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqev-crosscheck-result-table-header-external-value' )->escaped()
+					$this->msg('wbqev-crosscheck-result-table-header-external-value')->escaped()
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqev-crosscheck-result-table-header-references' )->escaped(),
+					$this->msg('wbqev-crosscheck-result-table-header-references')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
 					Linker::linkKnown(
-						self::getTitleFor( 'ExternalDatabases' ),
-						$this->msg( 'wbqev-crosscheck-result-table-header-external-source' )->escaped()
+						self::getTitleFor('ExternalDatabases'),
+						$this->msg('wbqev-crosscheck-result-table-header-external-source')->escaped()
 					),
 					true,
 					true
@@ -426,28 +426,28 @@ 
 			true
 		);
 
-		foreach ( $results as $result ) {
-			$status = $this->formatStatus( $result->getComparisonResult()->getStatus() );
-			$propertyId = $this->entityIdLinkFormatter->formatEntityId( $result->getPropertyId() );
-			$localValue = $this->formatDataValues( $result->getComparisonResult()->getLocalValue() );
+		foreach ($results as $result) {
+			$status = $this->formatStatus($result->getComparisonResult()->getStatus());
+			$propertyId = $this->entityIdLinkFormatter->formatEntityId($result->getPropertyId());
+			$localValue = $this->formatDataValues($result->getComparisonResult()->getLocalValue());
 			$externalValue = $this->formatDataValues(
 				$result->getComparisonResult()->getExternalValues(),
 				true,
-				Html::element( 'br' )
+				Html::element('br')
 			);
 			$referenceStatus = $this->msg(
-				'wbqev-crosscheck-status-' . $result->getReferenceResult()->getStatus()
+				'wbqev-crosscheck-status-'.$result->getReferenceResult()->getStatus()
 			)->text();
-			$dataSource = $this->entityIdLinkFormatter->formatEntityId( $result->getDumpMetaInformation()->getSourceItemId() );
+			$dataSource = $this->entityIdLinkFormatter->formatEntityId($result->getDumpMetaInformation()->getSourceItemId());
 
 			$table->appendRow(
 				[
-					new HtmlTableCellBuilder( $status, [], true ),
-					new HtmlTableCellBuilder( $propertyId, [], true ),
-					new HtmlTableCellBuilder( $localValue, [], true ),
-					new HtmlTableCellBuilder( $externalValue, [], true ),
-					new HtmlTableCellBuilder( $referenceStatus, [] ),
-					new HtmlTableCellBuilder( $dataSource, [], true )
+					new HtmlTableCellBuilder($status, [], true),
+					new HtmlTableCellBuilder($propertyId, [], true),
+					new HtmlTableCellBuilder($localValue, [], true),
+					new HtmlTableCellBuilder($externalValue, [], true),
+					new HtmlTableCellBuilder($referenceStatus, []),
+					new HtmlTableCellBuilder($dataSource, [], true)
 				]
 			);
 		}

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

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

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 : (int)$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;
 	}