wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/ExternalDataRepo.php

Spacing +31 added lines, -31 removed lines

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

includes/UpdateExternalData/ExternalDataImporter.php

Spacing +41 added lines, -41 removed lines

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

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;
 	}