wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

WikibaseQualityExternalValidationHooks.php

Spacing +6 added lines, -6 removed lines

@@ -7,16 +7,16 @@
 	 *
 	 * @return bool
 	 */
-	public static function onCreateSchema( DatabaseUpdater $updater ) {
-		$updater->addExtensionTable( 'wbqev_dump_information', __DIR__ . '/sql/create_wbqev_dump_information.sql' );
-		$updater->addExtensionTable( 'wbqev_external_data', __DIR__ . '/sql/create_wbqev_external_data.sql' );
-		$updater->addExtensionTable( 'wbqev_identifier_properties', __DIR__ . '/sql/create_wbqev_identifier_properties.sql' );
+	public static function onCreateSchema(DatabaseUpdater $updater) {
+		$updater->addExtensionTable('wbqev_dump_information', __DIR__.'/sql/create_wbqev_dump_information.sql');
+		$updater->addExtensionTable('wbqev_external_data', __DIR__.'/sql/create_wbqev_external_data.sql');
+		$updater->addExtensionTable('wbqev_identifier_properties', __DIR__.'/sql/create_wbqev_identifier_properties.sql');
 
 		return true;
 	}
 
-	public static function onUnitTestsList( &$paths ) {
-		$paths[] = __DIR__ . '/tests/phpunit';
+	public static function onUnitTestsList(&$paths) {
+		$paths[] = __DIR__.'/tests/phpunit';
 		return 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;
 	}
 

maintenance/UpdateExternalData.php

Spacing +10 added lines, -10 removed lines

@@ -7,10 +7,10 @@ 
 use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings;
 use WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter;
 
-$basePath = getenv( 'MW_INSTALL_PATH' ) !== false
-	? getenv( 'MW_INSTALL_PATH' )
-	: __DIR__ . '/../../..';
-require_once $basePath . '/maintenance/Maintenance.php';
+$basePath = getenv('MW_INSTALL_PATH') !== false
+	? getenv('MW_INSTALL_PATH')
+	: __DIR__.'/../../..';
+require_once $basePath.'/maintenance/Maintenance.php';
 
 /**
  * Maintenance script that evokes updates of wbqev_external_data, wbqev_dump_information, wbqev_identifier_properties
@@ -25,16 +25,16 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->addDescription( "Imports external entities from given CSV files into the local database. CSV files can be generated using the DumpConverter." );
-		$this->addOption( 'external-values-file', 'CSV file containing external values for import.', true, true );
-		$this->addOption( 'dump-information-file', 'CSV file containing dump meta information for import.', true, true );
-		$this->setBatchSize( 1000 );
+		$this->addDescription("Imports external entities from given CSV files into the local database. CSV files can be generated using the DumpConverter.");
+		$this->addOption('external-values-file', 'CSV file containing external values for import.', true, true);
+		$this->addOption('dump-information-file', 'CSV file containing dump meta information for import.', true, true);
+		$this->setBatchSize(1000);
 	}
 
 	public function execute() {
 		$context = new CsvImportSettings(
-			$this->getOption( 'external-values-file' ),
-			$this->getOption( 'dump-information-file' ),
+			$this->getOption('external-values-file'),
+			$this->getOption('dump-information-file'),
 			$this->mBatchSize,
 			$this->isQuiet()
 		);

WikibaseQualityExternalValidation.alias.php

Spacing +2 added lines, -2 removed lines

@@ -11,6 +11,6 @@
 
 /** English (English) */
 $specialPageAliases['en'] = array(
-	'CrossCheck' => array( 'CrossCheck', 'Cross Check' ),
-	'ExternalDatabases' => array( 'ExternalDatabases', 'ExternalDbs', 'External Dbs' ),
+	'CrossCheck' => array('CrossCheck', 'Cross Check'),
+	'ExternalDatabases' => array('ExternalDatabases', 'ExternalDbs', 'External Dbs'),
 );
\ No newline at end of file

specials/SpecialExternalDatabases.php

Spacing +38 added lines, -38 removed lines

@@ -54,10 +54,10 @@ 
 		TermLookup $termLookup,
 		EntityIdHtmlLinkFormatterFactory $entityIdHtmlLinkFormatterFactory,
 		DumpMetaInformationLookup $dumpMetaInformationRepo ) {
-		parent::__construct( 'ExternalDatabases' );
+		parent::__construct('ExternalDatabases');
 
 		$this->entityIdLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter(
-			new LanguageLabelDescriptionLookup( $termLookup, $this->getLanguage()->getCode() )
+			new LanguageLabelDescriptionLookup($termLookup, $this->getLanguage()->getCode())
 		);
 
 		$this->dumpMetaInformationRepo = $dumpMetaInformationRepo;
@@ -78,7 +78,7 @@ 
 	 * @return string
 	 */
 	public function getDescription() {
-		return $this->msg( 'wbqev-externaldbs' )->text();
+		return $this->msg('wbqev-externaldbs')->text();
 	}
 
 	/**
@@ -86,51 +86,51 @@ 
 	 *
 	 * @param string|null $subPage
 	 */
-	public function execute( $subPage ) {
+	public function execute($subPage) {
 		$out = $this->getOutput();
 
 		$this->setHeaders();
 
 		$out->addHTML(
-			Html::openElement( 'p' )
-			. $this->msg( 'wbqev-externaldbs-instructions' )->parse()
-			. Html::closeElement( 'p' )
-			. Html::openElement( 'h3' )
-			. $this->msg( 'wbqev-externaldbs-overview-headline' )->parse()
-			. Html::closeElement( 'h3' )
+			Html::openElement('p')
+			. $this->msg('wbqev-externaldbs-instructions')->parse()
+			. Html::closeElement('p')
+			. Html::openElement('h3')
+			. $this->msg('wbqev-externaldbs-overview-headline')->parse()
+			. Html::closeElement('h3')
 		);
 
 		$dumps = $this->dumpMetaInformationRepo->getAll();
-		if ( count( $dumps ) > 0 ) {
+		if (count($dumps) > 0) {
 			$groupedDumpMetaInformation = array();
-			foreach ( $dumps as $dump ) {
+			foreach ($dumps as $dump) {
 				$sourceItemId = $dump->getSourceItemId()->getSerialization();
 				$groupedDumpMetaInformation[$sourceItemId][] = $dump;
 			}
 
 			$table = new HtmlTableBuilder(
 				array(
-					$this->msg( 'wbqev-externaldbs-name' )->escaped(),
-					$this->msg( 'wbqev-externaldbs-id' )->escaped(),
-					$this->msg( 'wbqev-externaldbs-import-date' )->escaped(),
-					$this->msg( 'wbqev-externaldbs-language' )->escaped(),
-					$this->msg( 'wbqev-externaldbs-source-urls' )->escaped(),
-					$this->msg( 'wbqev-externaldbs-size' )->escaped(),
-					$this->msg( 'wbqev-externaldbs-license' )->escaped()
+					$this->msg('wbqev-externaldbs-name')->escaped(),
+					$this->msg('wbqev-externaldbs-id')->escaped(),
+					$this->msg('wbqev-externaldbs-import-date')->escaped(),
+					$this->msg('wbqev-externaldbs-language')->escaped(),
+					$this->msg('wbqev-externaldbs-source-urls')->escaped(),
+					$this->msg('wbqev-externaldbs-size')->escaped(),
+					$this->msg('wbqev-externaldbs-license')->escaped()
 				),
 				true
 			);
 
-			foreach ( $groupedDumpMetaInformation as $dumpMetaInformation ) {
-				$table->appendRows( $this->getRowGroup( $dumpMetaInformation ) );
+			foreach ($groupedDumpMetaInformation as $dumpMetaInformation) {
+				$table->appendRows($this->getRowGroup($dumpMetaInformation));
 			}
 
-			$out->addHTML( $table->toHtml() );
+			$out->addHTML($table->toHtml());
 		} else {
 			$out->addHTML(
-				Html::openElement( 'p' )
-				. $this->msg( 'wbqev-externaldbs-no-databases' )->escaped()
-				. Html::closeElement( 'p' )
+				Html::openElement('p')
+				. $this->msg('wbqev-externaldbs-no-databases')->escaped()
+				. Html::closeElement('p')
 			);
 		}
 	}
@@ -142,12 +142,12 @@ 
 	 *
 	 * @return array
 	 */
-	private function getRowGroup( array $dumpMetaInformationGroup ) {
+	private function getRowGroup(array $dumpMetaInformationGroup) {
 		$rows = array();
 
-		foreach ( $dumpMetaInformationGroup as $dumpMetaInformation ) {
+		foreach ($dumpMetaInformationGroup as $dumpMetaInformation) {
 			$dumpId = $dumpMetaInformation->getDumpId();
-			$importDate = $this->getLanguage()->timeanddate( $dumpMetaInformation->getImportDate() );
+			$importDate = $this->getLanguage()->timeanddate($dumpMetaInformation->getImportDate());
 			$language = Language::fetchLanguageName(
 				$dumpMetaInformation->getLanguageCode(),
 				$this->getLanguage()->getCode()
@@ -156,23 +156,23 @@ 
 				$dumpMetaInformation->getSourceUrl(),
 				$dumpMetaInformation->getSourceUrl()
 			);
-			$size = $this->getLanguage()->formatSize( $dumpMetaInformation->getSize() );
-			$license = $this->entityIdLinkFormatter->formatEntityId( $dumpMetaInformation->getLicenseItemId() );
+			$size = $this->getLanguage()->formatSize($dumpMetaInformation->getSize());
+			$license = $this->entityIdLinkFormatter->formatEntityId($dumpMetaInformation->getLicenseItemId());
 			$rows[] = array(
-				new HtmlTableCellBuilder( $dumpId ),
-				new HtmlTableCellBuilder( $importDate ),
-				new HtmlTableCellBuilder( $language ),
-				new HtmlTableCellBuilder( $sourceUrl, array(), true ),
-				new HtmlTableCellBuilder( $size ),
-				new HtmlTableCellBuilder( $license, array(), true )
+				new HtmlTableCellBuilder($dumpId),
+				new HtmlTableCellBuilder($importDate),
+				new HtmlTableCellBuilder($language),
+				new HtmlTableCellBuilder($sourceUrl, array(), true),
+				new HtmlTableCellBuilder($size),
+				new HtmlTableCellBuilder($license, array(), true)
 			);
 		}
 
 		array_unshift(
 			$rows[0],
 			new HtmlTableCellBuilder(
-				$this->entityIdLinkFormatter->formatEntityId( $dumpMetaInformationGroup[0]->getSourceItemId() ),
-				array( 'rowspan' => (string)count( $dumpMetaInformationGroup ) ),
+				$this->entityIdLinkFormatter->formatEntityId($dumpMetaInformationGroup[0]->getSourceItemId()),
+				array('rowspan' => (string)count($dumpMetaInformationGroup)),
 				true
 			)
 		);

specials/SpecialCrossCheck.php

Spacing +100 added lines, -100 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() === array() ) {
-			$out->addHTML( $this->buildNotice( 'wbqev-crosscheck-empty-result' ) );
+		if ($results === null || $results->toArray() === array()) {
+			$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',
-				array( 'class' => 'wbqev-infobox' )
+				array('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',
-				array( 'class' => $cssClasses ),
-				$this->msg( $messageKey )->text()
+				array('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',
 				array(),
-				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 = array();
-		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 = array();
-		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',
-				array (
-					'class' => 'wbqev-status wbqev-status-' . htmlspecialchars( $status )
+				array(
+					'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 = array( $dataValues );
+	private function formatDataValues($dataValues, $linking = true, $separator = null) {
+		if ($dataValues instanceof DataValue) {
+			$dataValues = array($dataValues);
 		}
 
 		$formattedDataValues = array();
-		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(
 			array(
 				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(
 				array(
-					new HtmlTableCellBuilder( $status, array(), true ),
-					new HtmlTableCellBuilder( $propertyId, array(), true ),
-					new HtmlTableCellBuilder( $localValue, array(), true ),
-					new HtmlTableCellBuilder( $externalValue, array(), true ),
-					new HtmlTableCellBuilder( $referenceStatus, array() ),
-					new HtmlTableCellBuilder( $dataSource, array(), true )
+					new HtmlTableCellBuilder($status, array(), true),
+					new HtmlTableCellBuilder($propertyId, array(), true),
+					new HtmlTableCellBuilder($localValue, array(), true),
+					new HtmlTableCellBuilder($externalValue, array(), true),
+					new HtmlTableCellBuilder($referenceStatus, array()),
+					new HtmlTableCellBuilder($dataSource, array(), true)
 				)
 			);
 		}

includes/DumpMetaInformation/DumpMetaInformationLookup.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 	 * @return DumpMetaInformation[]
 	 * @throws \InvalidArgumentException
 	 */
-	public function getWithIds( array $dumpIds );
+	public function getWithIds(array $dumpIds);
 
 	/**
 	 * Gets DumpMetaInformation for specific identifier properties from database
@@ -30,7 +30,7 @@ 
 	 *
 	 * @return DumpMetaInformation[]
 	 */
-	public function getWithIdentifierProperties( array $identifierPropertyIds );
+	public function getWithIdentifierProperties(array $identifierPropertyIds);
 
 	/**
 	 * Gets all DumpMetaInformation from database

api/RunCrossCheck.php

Spacing +32 added lines, -32 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())
 		);
 	}
 
@@ -91,17 +91,17 @@ 
 	 * @param SerializerFactory $serializerFactory
 	 * @param ApiHelperFactory $apiHelperFactory
 	 */
-	public function __construct( ApiMain $main, $name, $prefix = '', EntityIdParser $entityIdParser,
+	public function __construct(ApiMain $main, $name, $prefix = '', EntityIdParser $entityIdParser,
 								 StatementGuidValidator $statementGuidValidator, CrossCheckInteractor $crossCheckInteractor,
-								 SerializerFactory $serializerFactory, ApiHelperFactory $apiHelperFactory ) {
-		parent::__construct( $main, $name, $prefix );
+								 SerializerFactory $serializerFactory, ApiHelperFactory $apiHelperFactory) {
+		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);
 	}
 
 	/**
@@ -110,24 +110,24 @@ 
 	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->dieError(
 				'Either provide the ids of entities or ids of claims, that should be cross-checked.',
@@ -137,7 +137,7 @@ 
 		}
 
 		// Print result lists
-		$this->writeResultOutput( $resultLists );
+		$this->writeResultOutput($resultLists);
 	}
 
 	/**
@@ -145,9 +145,9 @@ 
 	 *
 	 * @return EntityId[]
 	 */
-	private function parseEntityIds( array $entityIds ) {
+	private function parseEntityIds(array $entityIds) {
 		return array_map(
-			array( $this->entityIdParser, 'parse' ),
+			array($this->entityIdParser, 'parse'),
 			$entityIds
 		);
 	}
@@ -155,10 +155,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');
 			}
 		}
 	}
@@ -170,13 +170,13 @@ 
 	 *
 	 * @return array
 	 */
-	private function writeResultOutput( array $resultLists ) {
+	private function writeResultOutput(array $resultLists) {
 		$serializer = $this->serializerFactory->newCrossCheckResultListSerializer();
 
 		$output = array();
-		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 {
@@ -186,10 +186,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/UpdateExternalData/ExternalDataImporter.php

Spacing +41 added lines, -41 removed lines

@@ -51,13 +51,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();
 	}
@@ -68,54 +68,54 @@ 
 	 * @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 = array();
-		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 );
+				$this->dumpMetaInformationStore->save($dumpMetaInformation);
 			}
-			catch( \DBError $e ) {
-				exit( 'Unknown database error occurred.' );
+			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;
 	}
@@ -124,32 +124,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 = array();
-		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 );
+					$this->externalDataRepo->insertBatch($accumulator);
 				}
-				catch( \DBError $e ) {
-					exit( 'Unknown database error occurred.' );
+				catch (\DBError $e) {
+					exit('Unknown database error occurred.');
 				}
 				wfGetLBFactory()->waitForReplication();
 
-				$this->log( "\r\033[K" );
-				$this->log( "$i rows inserted" );
+				$this->log("\r\033[K");
+				$this->log("$i rows inserted");
 
 				$accumulator = array();
 
-				if ( $data === false ) {
+				if ($data === false) {
 					break;
 				}
 			}
@@ -157,16 +157,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;
 		}
 	}