wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

api/RunCrossCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 	/**
 	 * Writes output for CrossCheckResultList
 	 *
-	 * @param array $resultLists
+	 * @param \WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList[] $resultLists
 	 *
 	 * @return array
 	 */

Spacing +31 added lines, -31 removed lines

@@ -65,7 +65,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();
 
@@ -77,7 +77,7 @@ 
 			$repo->getStatementGuidValidator(),
 			$externalValidationServices->getCrossCheckInteractor(),
 			$externalValidationServices->getSerializerFactory(),
-			$repo->getApiHelperFactory( RequestContext::getMain() )
+			$repo->getApiHelperFactory(RequestContext::getMain())
 		);
 	}
 
@@ -101,14 +101,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);
 	}
 
 	/**
@@ -117,34 +117,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);
 	}
 
 	/**
@@ -152,9 +152,9 @@ 
 	 *
 	 * @return EntityId[]
 	 */
-	private function parseEntityIds( array $entityIds ) {
+	private function parseEntityIds(array $entityIds) {
 		return array_map(
-			[ $this->entityIdParser, 'parse' ],
+			[$this->entityIdParser, 'parse'],
 			$entityIds
 		);
 	}
@@ -162,10 +162,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');
 			}
 		}
 	}
@@ -177,13 +177,13 @@ 
 	 *
 	 * @return array
 	 */
-	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 {
@@ -193,10 +193,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/CrossCheckInteractor.php

Doc Comments +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
 	}
 
 	/**
-	 * @param array $strings
+	 * @param string[] $strings
 	 * @param string $parameterName
 	 *
 	 * @throws InvalidArgumentException

Spacing +62 added lines, -62 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	private $crossChecker;
 
-	public function __construct( EntityLookup $entityLookup, StatementGuidParser $statementGuidParser, CrossChecker $crossChecker ) {
+	public function __construct(EntityLookup $entityLookup, StatementGuidParser $statementGuidParser, CrossChecker $crossChecker) {
 		$this->entityLookup = $entityLookup;
 		$this->statementGuidParser = $statementGuidParser;
 		$this->crossChecker = $crossChecker;
@@ -50,11 +50,11 @@ 
 	 *
 	 * @return CrossCheckResultList|null
 	 */
-	public function crossCheckEntityById( EntityId $entityId ) {
-		$entity = $this->entityLookup->getEntity( $entityId );
+	public function crossCheckEntityById(EntityId $entityId) {
+		$entity = $this->entityLookup->getEntity($entityId);
 
-		if ( $entity instanceof StatementListProvider ) {
-			return $this->crossCheckStatements( $entity->getStatements() );
+		if ($entity instanceof StatementListProvider) {
+			return $this->crossCheckStatements($entity->getStatements());
 		}
 
 		return null;
@@ -67,12 +67,12 @@ 
 	 *
 	 * @return CrossCheckResultList[]
 	 */
-	public function crossCheckEntitiesByIds( array $entityIds ) {
-		Assert::parameterElementType( EntityId::class,  $entityIds, '$entityIds' );
+	public function crossCheckEntitiesByIds(array $entityIds) {
+		Assert::parameterElementType(EntityId::class, $entityIds, '$entityIds');
 
 		$results = [];
-		foreach ( $entityIds as $entityId ) {
-			$results[$entityId->getSerialization()] = $this->crossCheckEntityById( $entityId );
+		foreach ($entityIds as $entityId) {
+			$results[$entityId->getSerialization()] = $this->crossCheckEntityById($entityId);
 		}
 
 		return $results;
@@ -85,8 +85,8 @@ 
 	 *
 	 * @return CrossCheckResultList
 	 */
-	public function crossCheckStatements( StatementList $statements ) {
-		return $this->crossChecker->crossCheckStatements( $statements, $statements );
+	public function crossCheckStatements(StatementList $statements) {
+		return $this->crossChecker->crossCheckStatements($statements, $statements);
 	}
 
 	/**
@@ -97,14 +97,14 @@ 
 	 * @return CrossCheckResultList[]
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckEntities( array $entities ) {
-		Assert::parameterElementType( EntityDocument::class,  $entities, '$entities' );
+	public function crossCheckEntities(array $entities) {
+		Assert::parameterElementType(EntityDocument::class, $entities, '$entities');
 
 		$results = [];
-		foreach ( $entities as $entity ) {
+		foreach ($entities as $entity) {
 			$entityId = $entity->getId()->getSerialization();
-			if ( $entity instanceof StatementListProvider ) {
-				$results[$entityId] = $this->crossCheckStatements( $entity->getStatements() );
+			if ($entity instanceof StatementListProvider) {
+				$results[$entityId] = $this->crossCheckStatements($entity->getStatements());
 			}
 		}
 
@@ -120,13 +120,13 @@ 
 	 * @return CrossCheckResultList|null
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckEntityByIdWithProperties( EntityId $entityId, array $propertyIds ) {
-		Assert::parameterElementType( PropertyId::class,  $propertyIds, '$propertyIds' );
+	public function crossCheckEntityByIdWithProperties(EntityId $entityId, array $propertyIds) {
+		Assert::parameterElementType(PropertyId::class, $propertyIds, '$propertyIds');
 
-		$entity = $this->entityLookup->getEntity( $entityId );
+		$entity = $this->entityLookup->getEntity($entityId);
 
-		if ( $entity instanceof StatementListProvider ) {
-			return $this->crossCheckStatementsWithProperties( $entity->getStatements(), $propertyIds );
+		if ($entity instanceof StatementListProvider) {
+			return $this->crossCheckStatementsWithProperties($entity->getStatements(), $propertyIds);
 		}
 
 		return null;
@@ -141,13 +141,13 @@ 
 	 * @return CrossCheckResultList[]
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckEntitiesByIdWithProperties( array $entityIds, array $propertyIds ) {
-		Assert::parameterElementType( EntityId::class,  $entityIds, '$entityIds' );
-		Assert::parameterElementType( PropertyId::class,  $propertyIds, '$propertyIds' );
+	public function crossCheckEntitiesByIdWithProperties(array $entityIds, array $propertyIds) {
+		Assert::parameterElementType(EntityId::class, $entityIds, '$entityIds');
+		Assert::parameterElementType(PropertyId::class, $propertyIds, '$propertyIds');
 
 		$results = [];
-		foreach ( $entityIds as $entityId ) {
-			$results[$entityId->getSerialization()] = $this->crossCheckEntityByIdWithProperties( $entityId, $propertyIds );
+		foreach ($entityIds as $entityId) {
+			$results[$entityId->getSerialization()] = $this->crossCheckEntityByIdWithProperties($entityId, $propertyIds);
 		}
 
 		return $results;
@@ -162,17 +162,17 @@ 
 	 * @return CrossCheckResultList
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckStatementsWithProperties( StatementList $entityStatements, array $propertyIds ) {
-		Assert::parameterElementType( PropertyId::class,  $propertyIds, '$propertyIds' );
+	public function crossCheckStatementsWithProperties(StatementList $entityStatements, array $propertyIds) {
+		Assert::parameterElementType(PropertyId::class, $propertyIds, '$propertyIds');
 
 		$statements = new StatementList();
-		foreach ( $entityStatements->toArray() as $statement ) {
-			if ( in_array( $statement->getPropertyId(), $propertyIds ) ) {
-				$statements->addStatement( $statement );
+		foreach ($entityStatements->toArray() as $statement) {
+			if (in_array($statement->getPropertyId(), $propertyIds)) {
+				$statements->addStatement($statement);
 			}
 		}
 
-		return $this->crossChecker->crossCheckStatements( $entityStatements, $statements );
+		return $this->crossChecker->crossCheckStatements($entityStatements, $statements);
 	}
 
 	/**
@@ -184,14 +184,14 @@ 
 	 * @return CrossCheckResultList[]
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckEntitiesWithProperties( array $entities, array $propertyIds ) {
-		Assert::parameterElementType( EntityDocument::class,  $entities, '$entities' );
-		Assert::parameterElementType( PropertyId::class,  $propertyIds, '$propertyIds' );
+	public function crossCheckEntitiesWithProperties(array $entities, array $propertyIds) {
+		Assert::parameterElementType(EntityDocument::class, $entities, '$entities');
+		Assert::parameterElementType(PropertyId::class, $propertyIds, '$propertyIds');
 
 		$results = [];
-		foreach ( $entities as $entity ) {
+		foreach ($entities as $entity) {
 			$entityId = $entity->getId()->getSerialization();
-			if ( $entity instanceof StatementListProvider ) {
+			if ($entity instanceof StatementListProvider) {
 				$results[$entityId] = $this->crossCheckStatementsWithProperties(
 					$entity->getStatements(),
 					$propertyIds
@@ -210,12 +210,12 @@ 
 	 * @return CrossCheckResultList
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckStatementByGuid( $guid ) {
-		$this->assertIsString( $guid, '$guid' );
+	public function crossCheckStatementByGuid($guid) {
+		$this->assertIsString($guid, '$guid');
 
-		$resultList = $this->crossCheckStatementsByGuids( [ $guid ] );
+		$resultList = $this->crossCheckStatementsByGuids([$guid]);
 
-		return reset( $resultList );
+		return reset($resultList);
 	}
 
 	/**
@@ -226,21 +226,21 @@ 
 	 * @return CrossCheckResultList[]
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckStatementsByGuids( array $guids ) {
-		$this->assertIsArrayOfStrings( $guids, '$guids' );
+	public function crossCheckStatementsByGuids(array $guids) {
+		$this->assertIsArrayOfStrings($guids, '$guids');
 
 		$entityIds = [];
 		$groupedStatementGuids = [];
-		foreach ( $guids as $guid ) {
-			$serializedEntityId = $this->statementGuidParser->parse( $guid )->getEntityId();
+		foreach ($guids as $guid) {
+			$serializedEntityId = $this->statementGuidParser->parse($guid)->getEntityId();
 			$entityIds[$serializedEntityId->getSerialization()] = $serializedEntityId;
 			$groupedStatementGuids[$serializedEntityId->getSerialization()][] = $guid;
 		}
 
 		$resultLists = [];
-		foreach ( $groupedStatementGuids as $serializedEntityId => $guidsOfEntity ) {
-			$entityId = $entityIds[ $serializedEntityId ];
-			$resultLists[ $serializedEntityId ] = $this->crossCheckClaimsOfEntity( $entityId, $guidsOfEntity );
+		foreach ($groupedStatementGuids as $serializedEntityId => $guidsOfEntity) {
+			$entityId = $entityIds[$serializedEntityId];
+			$resultLists[$serializedEntityId] = $this->crossCheckClaimsOfEntity($entityId, $guidsOfEntity);
 		}
 
 		return $resultLists;
@@ -252,18 +252,18 @@ 
 	 *
 	 * @return CrossCheckResultList|null
 	 */
-	private function crossCheckClaimsOfEntity( EntityId $entityId, array $guids ) {
-		$entity = $this->entityLookup->getEntity( $entityId );
+	private function crossCheckClaimsOfEntity(EntityId $entityId, array $guids) {
+		$entity = $this->entityLookup->getEntity($entityId);
 
-		if ( $entity instanceof StatementListProvider ) {
+		if ($entity instanceof StatementListProvider) {
 			$statements = new StatementList();
-			foreach ( $entity->getStatements()->toArray() as $statement ) {
-				if ( in_array( $statement->getGuid(), $guids ) ) {
-					$statements->addStatement( $statement );
+			foreach ($entity->getStatements()->toArray() as $statement) {
+				if (in_array($statement->getGuid(), $guids)) {
+					$statements->addStatement($statement);
 				}
 			}
 
-			return $this->crossChecker->crossCheckStatements( $entity->getStatements(), $statements );
+			return $this->crossChecker->crossCheckStatements($entity->getStatements(), $statements);
 		}
 
 		return null;
@@ -275,9 +275,9 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function assertIsString( $string, $parameterName ) {
-		if ( !is_string( $string ) ) {
-			throw new InvalidArgumentException( "$parameterName must be string." );
+	private function assertIsString($string, $parameterName) {
+		if (!is_string($string)) {
+			throw new InvalidArgumentException("$parameterName must be string.");
 		}
 	}
 
@@ -287,10 +287,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function assertIsArrayOfStrings( array $strings, $parameterName ) {
-		foreach ( $strings as $string ) {
-			if ( !is_string( $string ) ) {
-				throw new InvalidArgumentException( "Each element of $parameterName must be string." );
+	private function assertIsArrayOfStrings(array $strings, $parameterName) {
+		foreach ($strings as $string) {
+			if (!is_string($string)) {
+				throw new InvalidArgumentException("Each element of $parameterName must be string.");
 			}
 		}
 	}

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/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/DumpMetaInformation/DumpMetaInformationStore.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 	 *
 	 * @param DumpMetaInformation $dumpMetaInformation
 	 */
-	public function save( DumpMetaInformation $dumpMetaInformation );
+	public function save(DumpMetaInformation $dumpMetaInformation);
 
 }

includes/Serializer/IndexedTagsSerializer.php

Spacing +5 added lines, -5 removed lines

@@ -20,8 +20,8 @@ 
 	 * @param array &$arr
 	 * @param string $tag
 	 */
-	protected function setIndexedTagName( array &$arr, $tag ) {
-		ApiResult::setIndexedTagName( $arr, $tag );
+	protected function setIndexedTagName(array &$arr, $tag) {
+		ApiResult::setIndexedTagName($arr, $tag);
 	}
 
 	/**
@@ -33,9 +33,9 @@ 
 	 * @param string $tagName
 	 * @param string $idAttribute
 	 */
-	protected function setKeyAttributeName( array &$arr, $tagName, $idAttribute ) {
-		ApiResult::setArrayType( $arr, 'kvp', $idAttribute );
-		ApiResult::setIndexedTagName( $arr, $tagName );
+	protected function setKeyAttributeName(array &$arr, $tagName, $idAttribute) {
+		ApiResult::setArrayType($arr, 'kvp', $idAttribute);
+		ApiResult::setIndexedTagName($arr, $tagName);
 	}
 
 }

includes/UpdateExternalData/CsvImportSettings.php

Spacing +5 added lines, -5 removed lines

@@ -43,11 +43,11 @@
 	 * @param int $batchSize
 	 * @param bool $quiet
 	 */
-	public function __construct( $externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false ) {
-		Assert::parameterType( 'string', $externalValuesFilePath, '$externalValuesFilePath' );
-		Assert::parameterType( 'string', $dumpInformationFilePath, '$dumpInformationFilePath' );
-		Assert::parameterType( 'integer', $batchSize, '$batchSize' );
-		Assert::parameterType( 'boolean', $quiet, '$quiet' );
+	public function __construct($externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false) {
+		Assert::parameterType('string', $externalValuesFilePath, '$externalValuesFilePath');
+		Assert::parameterType('string', $dumpInformationFilePath, '$dumpInformationFilePath');
+		Assert::parameterType('integer', $batchSize, '$batchSize');
+		Assert::parameterType('boolean', $quiet, '$quiet');
 
 		$this->externalValuesFilePath = $externalValuesFilePath;
 		$this->dumpInformationFilePath = $dumpInformationFilePath;

specials/SpecialCrossCheck.php

Doc Comments +2 added lines, -2 removed lines

@@ -306,7 +306,7 @@ 
 	/**
 	 * Builds summary from given results
 	 *
-	 * @param CrossCheckResult[]|CrossCheckResultList $results
+	 * @param CrossCheckResultList $results
 	 *
 	 * @return string HTML
 	 */
@@ -396,7 +396,7 @@ 
 	}
 
 	/**
-	 * @param CrossCheckResult[]|CrossCheckResultList $results
+	 * @param CrossCheckResultList $results
 	 *
 	 * @return string HTML
 	 */

Spacing +99 added lines, -99 removed lines

@@ -103,18 +103,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;
 	}
@@ -134,7 +134,7 @@ 
 	 * @return string (plain text)
 	 */
 	public function getDescription() {
-		return $this->msg( 'wbqev-crosscheck' )->text();
+		return $this->msg('wbqev-crosscheck')->text();
 	}
 
 	/**
@@ -146,55 +146,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)
 			);
 		}
 	}
@@ -204,9 +204,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;
@@ -223,15 +223,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();
 	}
 
@@ -241,18 +241,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;
 	}
@@ -267,17 +267,17 @@ 
 	 *
 	 * @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()
 			);
 	}
 
@@ -288,18 +288,18 @@ 
 	 *
 	 * @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)
 			);
 	}
 
@@ -310,11 +310,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;
@@ -322,15 +322,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;
 	}
@@ -344,16 +344,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;
@@ -370,29 +370,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);
 	}
 
 	/**
@@ -400,31 +400,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
@@ -433,28 +433,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/TimeValueComparer.php

Spacing +23 added lines, -23 removed lines

@@ -30,9 +30,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.');
 		}
 
 		/**
@@ -42,38 +42,38 @@ 
 
 		$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;
 		}
 
 		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;
@@ -87,10 +87,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.
@@ -134,10 +134,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();
 	}
@@ -150,7 +150,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof TimeValue && $comparativeValue instanceof TimeValue;
 	}