wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

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

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

includes/Serializer/CrossCheckResultSerializer.php

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isSerializerFor( $object ) {
+	public function isSerializerFor($object) {
 		return $object instanceof CrossCheckResult;
 	}
 
@@ -63,25 +63,25 @@ 
 	 * @return array
 	 * @throws UnsupportedObjectException
 	 */
-	public function serialize( $object ) {
-		if ( !$this->isSerializerFor( $object ) ) {
+	public function serialize($object) {
+		if (!$this->isSerializerFor($object)) {
 			throw new UnsupportedObjectException(
 				$object,
 				'CrossCheckResultSerializer can only serialize CrossCheckResult objects.'
 			);
 		}
 
-		return $this->getSerialized( $object );
+		return $this->getSerialized($object);
 	}
 
-	private function getSerialized( CrossCheckResult $crossCheckResult ) {
+	private function getSerialized(CrossCheckResult $crossCheckResult) {
 		return array(
 			'propertyId' => $crossCheckResult->getPropertyId()->getSerialization(),
 			'claimGuid' => $crossCheckResult->getClaimGuid(),
 			'externalId' => $crossCheckResult->getExternalId(),
-			'dataSource' => $this->dumpMetaInformationSerializer->serialize( $crossCheckResult->getDumpMetaInformation() ),
-			'comparisonResult' => $this->comparisonResultSerializer->serialize( $crossCheckResult->getComparisonResult() ),
-			'referenceResult' => $this->referenceResultSerializer->serialize( $crossCheckResult->getReferenceResult() )
+			'dataSource' => $this->dumpMetaInformationSerializer->serialize($crossCheckResult->getDumpMetaInformation()),
+			'comparisonResult' => $this->comparisonResultSerializer->serialize($crossCheckResult->getComparisonResult()),
+			'referenceResult' => $this->referenceResultSerializer->serialize($crossCheckResult->getReferenceResult())
 		);
 	}
 

maintenance/UpdateExternalData.php

Spacing +11 added lines, -11 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,17 +25,17 @@ 
 	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()
 		);

includes/CrossCheck/Comparer/QuantityValueComparer.php

Spacing +6 added lines, -6 removed lines

@@ -23,9 +23,9 @@ 
 	 * @throws InvalidArgumentException
 	 * @return string One of the ComparisonResult::STATUS_... constants.
 	 */
-	public function compare( DataValue $value, DataValue $comparativeValue ) {
-		if ( !$this->canCompare( $value, $comparativeValue ) ) {
-			throw new InvalidArgumentException( 'Given values can not be compared using this comparer.' );
+	public function compare(DataValue $value, DataValue $comparativeValue) {
+		if (!$this->canCompare($value, $comparativeValue)) {
+			throw new InvalidArgumentException('Given values can not be compared using this comparer.');
 		}
 
 		/**
@@ -33,8 +33,8 @@ 
 		 * @var QuantityValue $comparativeValue
 		 */
 
-		if ( $comparativeValue->getLowerBound()->compare( $value->getUpperBound() ) <= 0 &&
-			$comparativeValue->getUpperBound()->compare( $value->getLowerBound() ) >= 0
+		if ($comparativeValue->getLowerBound()->compare($value->getUpperBound()) <= 0 &&
+			$comparativeValue->getUpperBound()->compare($value->getLowerBound()) >= 0
 		) {
 			return ComparisonResult::STATUS_MATCH;
 		}
@@ -50,7 +50,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof QuantityValue && $comparativeValue instanceof QuantityValue;
 	}
 

includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php

Spacing +42 added lines, -42 removed lines

@@ -29,18 +29,18 @@ 
 	 * @return DumpMetaInformation[]
 	 * @throws InvalidArgumentException
 	 */
-	public function getWithIds( array $dumpIds ) {
-		if ( $dumpIds === [] ) {
+	public function getWithIds(array $dumpIds) {
+		if ($dumpIds === []) {
 			return [];
 		}
 
-		foreach ( $dumpIds as $dumpId ) {
-			if ( !is_string( $dumpId ) ) {
-				throw new InvalidArgumentException( '$dumpIds must contain only strings.' );
+		foreach ($dumpIds as $dumpId) {
+			if (!is_string($dumpId)) {
+				throw new InvalidArgumentException('$dumpIds must contain only strings.');
 			}
 		}
 
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$result = $db->select(
 			array(
 				self::META_TABLE_NAME,
@@ -60,7 +60,7 @@ 
 			)
 		);
 
-		return $this->buildDumpMetaInformationFromResult( $result );
+		return $this->buildDumpMetaInformationFromResult($result);
 	}
 
 	/**
@@ -72,20 +72,20 @@ 
 	 * @throws InvalidArgumentException
 	 * @return DumpMetaInformation[]
 	 */
-	public function getWithIdentifierProperties( array $identifierPropertyIds ) {
-		if ( $identifierPropertyIds === [] ) {
+	public function getWithIdentifierProperties(array $identifierPropertyIds) {
+		if ($identifierPropertyIds === []) {
 			return [];
 		}
 
-		foreach ( $identifierPropertyIds as $propertyId ) {
-			if ( !( $propertyId instanceof PropertyId ) ) {
-				throw new InvalidArgumentException( '$identifierProperties must contain only PropertyIds.' );
+		foreach ($identifierPropertyIds as $propertyId) {
+			if (!($propertyId instanceof PropertyId)) {
+				throw new InvalidArgumentException('$identifierProperties must contain only PropertyIds.');
 			}
 		}
 
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$identifierPropertyIds = array_map(
-			function( PropertyId $id ) {
+			function(PropertyId $id) {
 				return $id->getSerialization();
 			},
 			$identifierPropertyIds
@@ -98,13 +98,13 @@ 
 			)
 		);
 		$dumpIds = array();
-		foreach ( $result as $row ) {
-			if ( !in_array( $row->dump_id, $dumpIds ) ) {
+		foreach ($result as $row) {
+			if (!in_array($row->dump_id, $dumpIds)) {
 				$dumpIds[] = $row->dump_id;
 			}
 		}
 
-		return $this->getWithIds( $dumpIds );
+		return $this->getWithIds($dumpIds);
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @return DumpMetaInformation[]
 	 */
 	public function getAll() {
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$result = $db->select(
 			array(
 				self::META_TABLE_NAME,
@@ -132,7 +132,7 @@ 
 			)
 		);
 
-		return $this->buildDumpMetaInformationFromResult( $result );
+		return $this->buildDumpMetaInformationFromResult($result);
 	}
 
 	/**
@@ -140,34 +140,34 @@ 
 	 * @return null|array
 	 * @throws UnexpectedValueException
 	 */
-	private function buildDumpMetaInformationFromResult( ResultWrapper $result ) {
+	private function buildDumpMetaInformationFromResult(ResultWrapper $result) {
 		$aggregatedRows = array();
-		foreach ( $result as $row ) {
-			if ( array_key_exists( $row->id, $aggregatedRows ) ) {
-				$propertyId = new PropertyId( $row->identifier_pid );
+		foreach ($result as $row) {
+			if (array_key_exists($row->id, $aggregatedRows)) {
+				$propertyId = new PropertyId($row->identifier_pid);
 				$aggregatedRows[$row->id]->identifier_pid[] = $propertyId;
 			} else {
-				if ( $row->identifier_pid !== null ) {
-					$propertyId = new PropertyId( $row->identifier_pid );
-					$row->identifier_pid = array( $propertyId );
+				if ($row->identifier_pid !== null) {
+					$propertyId = new PropertyId($row->identifier_pid);
+					$row->identifier_pid = array($propertyId);
 				}
 				$aggregatedRows[$row->id] = $row;
 			}
 		}
 
 		$dumpMetaInformation = array();
-		foreach ( $aggregatedRows as $row ) {
+		foreach ($aggregatedRows as $row) {
 			$dumpId = $row->id;
-			$sourceItemId = new ItemId( $row->source_qid );
-			$importDate = wfTimestamp( TS_MW, $row->import_date );
+			$sourceItemId = new ItemId($row->source_qid);
+			$importDate = wfTimestamp(TS_MW, $row->import_date);
 			$language = $row->language;
 			$sourceUrl = $row->source_url;
 			$size = (int)$row->size;
-			$licenseItemId = new ItemId( $row->license_qid );
+			$licenseItemId = new ItemId($row->license_qid);
 			$identifierPropertyIds = $row->identifier_pid;
 
 			$dumpMetaInformation[$row->dump_id] =
-				new DumpMetaInformation( $dumpId,
+				new DumpMetaInformation($dumpId,
 					$sourceItemId,
 					$identifierPropertyIds,
 					$importDate,
@@ -186,22 +186,22 @@ 
 	 *
 	 * @param DumpMetaInformation $dumpMetaInformation
 	 */
-	public function save( DumpMetaInformation $dumpMetaInformation ) {
-		$db = wfGetDB( DB_REPLICA );
+	public function save(DumpMetaInformation $dumpMetaInformation) {
+		$db = wfGetDB(DB_REPLICA);
 		$dumpId = $dumpMetaInformation->getDumpId();
-		$accumulator = $this->getDumpInformationFields( $db, $dumpMetaInformation );
+		$accumulator = $this->getDumpInformationFields($db, $dumpMetaInformation);
 
 		$existing = $db->selectRow(
 			self::META_TABLE_NAME,
-			array( 'id' ),
-			array( 'id' => $dumpId )
+			array('id'),
+			array('id' => $dumpId)
 		);
 
-		if ( $existing ) {
+		if ($existing) {
 			$db->update(
 				self::META_TABLE_NAME,
 				$accumulator,
-				array( 'id' => $dumpId )
+				array('id' => $dumpId)
 			);
 		} else {
 			$db->insert(
@@ -212,12 +212,12 @@ 
 
 		$db->delete(
 			self::IDENTIFIER_PROPERTIES_TABLE_NAME,
-			array( 'dump_id' => $dumpId )
+			array('dump_id' => $dumpId)
 		);
 		$db->insert(
 			self::IDENTIFIER_PROPERTIES_TABLE_NAME,
 			array_map(
-				function ( PropertyId $identifierPropertyId ) use ( $dumpId ) {
+				function(PropertyId $identifierPropertyId) use ($dumpId) {
 					return array(
 						'dump_id' => $dumpId,
 						'identifier_pid' => $identifierPropertyId->getSerialization()
@@ -233,11 +233,11 @@ 
 	 * @param DumpMetaInformation $dumpMetaInformation
 	 * @return array
 	 */
-	private function getDumpInformationFields( Database $db,  DumpMetaInformation $dumpMetaInformation ) {
+	private function getDumpInformationFields(Database $db, DumpMetaInformation $dumpMetaInformation) {
 		return array(
 			'id' => $dumpMetaInformation->getDumpId(),
 			'source_qid' => $dumpMetaInformation->getSourceItemId()->getSerialization(),
-			'import_date' => $db->timestamp( $dumpMetaInformation->getImportDate() ),
+			'import_date' => $db->timestamp($dumpMetaInformation->getImportDate()),
 			'language' => $dumpMetaInformation->getLanguageCode(),
 			'source_url' => $dumpMetaInformation->getSourceUrl(),
 			'size' => $dumpMetaInformation->getSize(),

includes/DumpMetaInformation/DumpMetaInformation.php

Spacing +30 added lines, -30 removed lines

@@ -83,27 +83,27 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( $dumpId,
+	public function __construct($dumpId,
 								 ItemId $sourceItemId,
 								 array $identifierPropertyIds,
 								 $importDate,
 								 $languageCode,
 								 $sourceUrl,
 								 $size,
-								 ItemId $licenseItemId ) {
+								 ItemId $licenseItemId) {
 		Assert::parameterElementType(
 			PropertyId::class,
 			$identifierPropertyIds,
 			'$identifierPropertyIds'
 		);
 
-		$this->setDumpId( $dumpId );
+		$this->setDumpId($dumpId);
 		$this->sourceItemId = $sourceItemId;
 		$this->identifierPropertyIds = $identifierPropertyIds;
-		$this->setImportDate( $importDate );
-		$this->setLanguageCode( $languageCode );
-		$this->setSourceUrl( $sourceUrl );
-		$this->setSize( $size );
+		$this->setImportDate($importDate);
+		$this->setLanguageCode($languageCode);
+		$this->setSourceUrl($sourceUrl);
+		$this->setSize($size);
 		$this->licenseItemId = $licenseItemId;
 	}
 
@@ -168,10 +168,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setDumpId( $dumpId ) {
-		Assert::parameterType( 'string', $dumpId, '$dumpId' );
-		$length = strlen( $dumpId );
-		if ( $length < 1 || $length > 25 ) {
+	private function setDumpId($dumpId) {
+		Assert::parameterType('string', $dumpId, '$dumpId');
+		$length = strlen($dumpId);
+		if ($length < 1 || $length > 25) {
 			throw new InvalidArgumentException('$dumpId must be between 1 and 25 characters.');
 		}
 
@@ -183,10 +183,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setLanguageCode( $languageCode ) {
-		Assert::parameterType( 'string', $languageCode, '$languageCode' );
-		if ( !Language::isValidCode( $languageCode ) ) {
-			throw new InvalidArgumentException( '$languageCode is not valid.' );
+	private function setLanguageCode($languageCode) {
+		Assert::parameterType('string', $languageCode, '$languageCode');
+		if (!Language::isValidCode($languageCode)) {
+			throw new InvalidArgumentException('$languageCode is not valid.');
 		}
 
 		$this->languageCode = $languageCode;
@@ -197,12 +197,12 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setImportDate( $importDate ) {
-		Assert::parameterType( 'string', $importDate, '$importDate' );
+	private function setImportDate($importDate) {
+		Assert::parameterType('string', $importDate, '$importDate');
 
-		$timestamp = wfTimestamp( TS_MW, $importDate );
-		if ( !$timestamp ) {
-			throw new InvalidArgumentException( '$updatedAt has invalid timestamp format.' );
+		$timestamp = wfTimestamp(TS_MW, $importDate);
+		if (!$timestamp) {
+			throw new InvalidArgumentException('$updatedAt has invalid timestamp format.');
 		}
 
 		$this->importDate = $importDate;
@@ -213,13 +213,13 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setSourceUrl( $sourceUrl ) {
-		Assert::parameterType( 'string', $sourceUrl, '$sourceUrl' );
-		if ( strlen( $sourceUrl ) > 300 ) {
-			throw new InvalidArgumentException( '$sourceUrl must not be longer than 300 characters.' );
+	private function setSourceUrl($sourceUrl) {
+		Assert::parameterType('string', $sourceUrl, '$sourceUrl');
+		if (strlen($sourceUrl) > 300) {
+			throw new InvalidArgumentException('$sourceUrl must not be longer than 300 characters.');
 		}
-		if ( !filter_var( $sourceUrl, FILTER_VALIDATE_URL ) ) {
-			throw new InvalidArgumentException( '$sourceUrl is not a valid url.' );
+		if (!filter_var($sourceUrl, FILTER_VALIDATE_URL)) {
+			throw new InvalidArgumentException('$sourceUrl is not a valid url.');
 		}
 
 		$this->sourceUrl = $sourceUrl;
@@ -230,10 +230,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setSize( $size ) {
-		Assert::parameterType( 'integer', $size, '$size' );
-		if ( $size <= 0 ) {
-			throw new InvalidArgumentException( '$size must be positive integer.' );
+	private function setSize($size) {
+		Assert::parameterType('integer', $size, '$size');
+		if ($size <= 0) {
+			throw new InvalidArgumentException('$size must be positive integer.');
 		}
 
 		$this->size = $size;

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,52 +68,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 = 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 );
-			} 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;
 	}
@@ -122,31 +122,31 @@ 
 	 * 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 );
-				} catch ( \DBError $e ) {
-					exit( 'Unknown database error occurred.' );
+					$this->externalDataRepo->insertBatch($accumulator);
+				} 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;
 				}
 			}
@@ -154,16 +154,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;
 		}
 	}

includes/CrossCheck/CrossChecker.php

Spacing +55 added lines, -55 removed lines

@@ -95,22 +95,22 @@ 
 	 * @return CrossCheckResultList
 	 * @throws InvalidArgumentException
 	 */
-	public function crossCheckStatements( StatementList $entityStatements, StatementList $statements ) {
+	public function crossCheckStatements(StatementList $entityStatements, StatementList $statements) {
 		$statementsOfEntity = $entityStatements->toArray();
 
-		foreach ( $statements as $statement ) {
-			if ( !in_array( $statement, $statementsOfEntity ) ) {
-				throw new InvalidArgumentException( 'All statements in $statements must belong to the entity.' );
+		foreach ($statements as $statement) {
+			if (!in_array($statement, $statementsOfEntity)) {
+				throw new InvalidArgumentException('All statements in $statements must belong to the entity.');
 			}
 		}
 
 		$resultList = new CrossCheckResultList();
-		if ( $statements->count() > 0 ) {
-			$applicableDumps = $this->getApplicableDumps( $entityStatements );
-			foreach ( $applicableDumps as $identifierPropertyId => $dumpMetaInformationList ) {
-				$identifierPropertyId = new PropertyId( $identifierPropertyId );
+		if ($statements->count() > 0) {
+			$applicableDumps = $this->getApplicableDumps($entityStatements);
+			foreach ($applicableDumps as $identifierPropertyId => $dumpMetaInformationList) {
+				$identifierPropertyId = new PropertyId($identifierPropertyId);
 
-				if ( $this->isIdentifierProperty( $identifierPropertyId ) ) {
+				if ($this->isIdentifierProperty($identifierPropertyId)) {
 					$resultList->merge(
 						$this->crossCheckStatementsWithIdentifier(
 							$entityStatements,
@@ -133,17 +133,17 @@ 
 	 *
 	 * @return array[]
 	 */
-	private function getApplicableDumps( StatementList $statements ) {
+	private function getApplicableDumps(StatementList $statements) {
 		$applicableDumps = array();
 		$identifierPropertyIds = $statements->getPropertyIds();
 		$dumpMetaInformation = $this->dumpMetaInformationLookup->getWithIdentifierProperties(
 			$identifierPropertyIds
 		);
 
-		foreach ( $dumpMetaInformation as $dump ) {
-			foreach ( $dump->getIdentifierPropertyIds() as $identifierPropertyId ) {
+		foreach ($dumpMetaInformation as $dump) {
+			foreach ($dump->getIdentifierPropertyIds() as $identifierPropertyId) {
 				$serialization = $identifierPropertyId->getSerialization();
-				$applicableDumps[ $serialization ][ $dump->getDumpId() ] = $dump;
+				$applicableDumps[$serialization][$dump->getDumpId()] = $dump;
 			}
 		}
 
@@ -168,36 +168,36 @@ 
 	) {
 		$resultList = new CrossCheckResultList();
 
-		$externalIds = $this->getExternalIds( $entityStatements, $identifierPropertyId );
-		if ( !$externalIds ) {
+		$externalIds = $this->getExternalIds($entityStatements, $identifierPropertyId);
+		if (!$externalIds) {
 			return $resultList;
 		}
 
 		$dumpIds = array_map(
-			function ( DumpMetaInformation $dumpMetaInformation ) {
+			function(DumpMetaInformation $dumpMetaInformation) {
 				return $dumpMetaInformation->getDumpId();
 			},
 			$dumpMetaInformationList
 		);
-		$externalData = $this->externalDataRepo->getExternalData( $dumpIds, $externalIds, $statements->getPropertyIds() );
+		$externalData = $this->externalDataRepo->getExternalData($dumpIds, $externalIds, $statements->getPropertyIds());
 
-		foreach ( $externalData as $dumpId => $externalDataPerDump ) {
-			$dumpMetaInformation = $dumpMetaInformationList[ $dumpId ];
+		foreach ($externalData as $dumpId => $externalDataPerDump) {
+			$dumpMetaInformation = $dumpMetaInformationList[$dumpId];
 			$comparativeValueParser = $this->valueParserFactory->newComparativeValueParser(
 				$dumpMetaInformation->getLanguageCode()
 			);
 
-			foreach ( $externalDataPerDump as $externalId => $externalDataPerId ) {
+			foreach ($externalDataPerDump as $externalId => $externalDataPerId) {
 				$externalId = (string)$externalId;
-				foreach ( $externalDataPerId as $propertyId => $externalValues ) {
-					$propertyId = new PropertyId( $propertyId );
+				foreach ($externalDataPerId as $propertyId => $externalValues) {
+					$propertyId = new PropertyId($propertyId);
 					$resultList->merge(
 						$this->crossCheckExternalValues(
 							$dumpMetaInformation,
 							$identifierPropertyId,
 							$externalId,
 							$externalValues,
-							$statements->getByPropertyId( $propertyId ),
+							$statements->getByPropertyId($propertyId),
 							$comparativeValueParser
 						)
 					);
@@ -228,10 +228,10 @@ 
 	) {
 		$resultList = new CrossCheckResultList();
 
-		foreach ( $statements->toArray() as $statement ) {
-			$comparisonResult = $this->compareStatement( $statement, $externalValues, $comparativeValueParser );
+		foreach ($statements->toArray() as $statement) {
+			$comparisonResult = $this->compareStatement($statement, $externalValues, $comparativeValueParser);
 
-			if ( $comparisonResult ) {
+			if ($comparisonResult) {
 				$referencesResult = $this->referenceHandler->checkForReferences(
 					$statement,
 					$identifierPropertyId,
@@ -265,31 +265,31 @@ 
 	 * @return ComparisonResult|bool
 	 */
 	private function compareStatement(
-		Statement $statement,array $externalValues,
+		Statement $statement, array $externalValues,
 		ComparativeValueParser $comparativeValueParser
 	) {
 		$mainSnak = $statement->getMainSnak();
-		if ( $mainSnak instanceof PropertyValueSnak ) {
+		if ($mainSnak instanceof PropertyValueSnak) {
 			$dataValue = $mainSnak->getDataValue();
 
 			$results = array();
-			$comparativeValues = $this->parseExternalValues( $dataValue, $externalValues, $comparativeValueParser );
-			foreach ( $comparativeValues as $comparativeValue ) {
-				$result = $this->dataValueComparer->compare( $dataValue, $comparativeValue );
-				if ( $result ) {
+			$comparativeValues = $this->parseExternalValues($dataValue, $externalValues, $comparativeValueParser);
+			foreach ($comparativeValues as $comparativeValue) {
+				$result = $this->dataValueComparer->compare($dataValue, $comparativeValue);
+				if ($result) {
 					$results[] = $result;
 				}
 			}
 
-			if ( $results ) {
+			if ($results) {
 				$result = ComparisonResult::STATUS_MISMATCH;
-				if ( in_array( ComparisonResult::STATUS_MATCH, $results ) ) {
+				if (in_array(ComparisonResult::STATUS_MATCH, $results)) {
 					$result = ComparisonResult::STATUS_MATCH;
-				} elseif ( in_array( ComparisonResult::STATUS_PARTIAL_MATCH, $results ) ) {
+				} elseif (in_array(ComparisonResult::STATUS_PARTIAL_MATCH, $results)) {
 					$result = ComparisonResult::STATUS_PARTIAL_MATCH;
 				}
 
-				return new ComparisonResult( $dataValue, $comparativeValues, $result );
+				return new ComparisonResult($dataValue, $comparativeValues, $result);
 			}
 		}
 
@@ -309,13 +309,13 @@ 
 		ComparativeValueParser $comparativeValueParser
 	) {
 		$parsedValues = array();
-		foreach ( $externalValues as $externalValue ) {
+		foreach ($externalValues as $externalValue) {
 			try {
-				$parsedValue = $comparativeValueParser->parse( $externalValue, $dataValue->getType() );
-				if ( $parsedValue ) {
+				$parsedValue = $comparativeValueParser->parse($externalValue, $dataValue->getType());
+				if ($parsedValue) {
 					$parsedValues[] = $parsedValue;
 				}
-			} catch ( ParseException $e ) {
+			} catch (ParseException $e) {
 			}
 		}
 
@@ -330,12 +330,12 @@ 
 	 *
 	 * @return string[]
 	 */
-	private function getExternalIds( StatementList $statements, PropertyId $identifierPropertyId ) {
+	private function getExternalIds(StatementList $statements, PropertyId $identifierPropertyId) {
 		$externalIds = array();
-		$identifierStatements = $statements->getByPropertyId( $identifierPropertyId );
-		$values = $this->getDataValues( $identifierStatements );
-		foreach ( $values as $value ) {
-			if ( $value instanceof StringValue ) {
+		$identifierStatements = $statements->getByPropertyId($identifierPropertyId);
+		$values = $this->getDataValues($identifierStatements);
+		foreach ($values as $value) {
+			if ($value instanceof StringValue) {
 				$externalIds[] = $value->getValue();
 			}
 		}
@@ -347,15 +347,15 @@ 
 	 * @param PropertyId $identifierPropertyId
 	 * @return bool
 	 */
-	private function isIdentifierProperty( PropertyId $identifierPropertyId ) {
+	private function isIdentifierProperty(PropertyId $identifierPropertyId) {
 		global $wgWBQEVInstanceOfPID, $wgWBQEVIdentifierPropertyQID;
 		/** @var Property $property */
-		$property = $this->entityLookup->getEntity( $identifierPropertyId );
-		$instanceOfPropertyId = new PropertyId( $wgWBQEVInstanceOfPID );
-		$statements = $property->getStatements()->getByPropertyId( $instanceOfPropertyId );
-		$values = $this->getDataValues( $statements );
-		foreach ( $values as $value ) {
-			if ( $value instanceof EntityIdValue
+		$property = $this->entityLookup->getEntity($identifierPropertyId);
+		$instanceOfPropertyId = new PropertyId($wgWBQEVInstanceOfPID);
+		$statements = $property->getStatements()->getByPropertyId($instanceOfPropertyId);
+		$values = $this->getDataValues($statements);
+		foreach ($values as $value) {
+			if ($value instanceof EntityIdValue
 				&& $value->getEntityId()->getSerialization() === $wgWBQEVIdentifierPropertyQID
 			) {
 				return true;
@@ -371,12 +371,12 @@ 
 	 * @param StatementList $statementList
 	 * @return DataValue[]
 	 */
-	private function getDataValues( StatementList $statementList ) {
+	private function getDataValues(StatementList $statementList) {
 		$dataValues = array();
 
-		foreach ( $statementList->toArray() as $statement ) {
+		foreach ($statementList->toArray() as $statement) {
 			$mainSnak = $statement->getMainSnak();
-			if ( $mainSnak instanceof PropertyValueSnak ) {
+			if ($mainSnak instanceof PropertyValueSnak) {
 				$dataValues[] = $mainSnak->getDataValue();
 			}
 		}