wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/CrossCheck/Result/CrossCheckResultList.php

Spacing +13 added lines, -13 removed lines

@@ -26,8 +26,8 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( array $results = [] ) {
-		Assert::parameterElementType( CrossCheckResult::class, $results, '$results' );
+	public function __construct(array $results = []) {
+		Assert::parameterElementType(CrossCheckResult::class, $results, '$results');
 
 		$this->results = $results;
 	}
@@ -37,7 +37,7 @@ 
 	 *
 	 * @param CrossCheckResult $result
 	 */
-	public function add( CrossCheckResult $result ) {
+	public function add(CrossCheckResult $result) {
 		$this->results[] = $result;
 	}
 
@@ -46,8 +46,8 @@ 
 	 *
 	 * @param self $resultList
 	 */
-	public function merge( self $resultList ) {
-		$this->results = array_merge( $this->results, $resultList->results );
+	public function merge(self $resultList) {
+		$this->results = array_merge($this->results, $resultList->results);
 	}
 
 	/**
@@ -58,9 +58,9 @@ 
 	public function getPropertyIds() {
 		$propertyIds = [];
 
-		foreach ( $this->results as $result ) {
+		foreach ($this->results as $result) {
 			$propertyId = $result->getPropertyId();
-			if ( !in_array( $propertyId, $propertyIds ) ) {
+			if (!in_array($propertyId, $propertyIds)) {
 				$propertyIds[] = $propertyId;
 			}
 		}
@@ -75,16 +75,16 @@ 
 	 *
 	 * @return self
 	 */
-	public function getByPropertyId( PropertyId $propertyId ) {
+	public function getByPropertyId(PropertyId $propertyId) {
 		$results = [];
 
-		foreach ( $this->results as $result ) {
-			if ( $result->getPropertyId()->equals( $propertyId ) ) {
+		foreach ($this->results as $result) {
+			if ($result->getPropertyId()->equals($propertyId)) {
 				$results[] = $result;
 			}
 		}
 
-		return new self( $results );
+		return new self($results);
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public function getIterator() {
-		return new ArrayIterator( $this->results );
+		return new ArrayIterator($this->results);
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->results );
+		return count($this->results);
 	}
 
 }

includes/CrossCheck/Comparer/DispatchingDataValueComparer.php

Spacing +12 added lines, -12 removed lines

@@ -20,8 +20,8 @@ 
 	/**
 	 * @param DataValueComparer[] $dataValueComparers
 	 */
-	public function __construct( array $dataValueComparers = [] ) {
-		$this->assertAreDataValueComparer( $dataValueComparers );
+	public function __construct(array $dataValueComparers = []) {
+		$this->assertAreDataValueComparer($dataValueComparers);
 		$this->dataValueComparers = $dataValueComparers;
 	}
 
@@ -30,9 +30,9 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	protected function assertAreDataValueComparer( array $dataValueComparers ) {
-		foreach ( $dataValueComparers as $dataValueComparer ) {
-			if ( !is_object( $dataValueComparer ) || !( $dataValueComparer instanceof DataValueComparer ) ) {
+	protected function assertAreDataValueComparer(array $dataValueComparers) {
+		foreach ($dataValueComparers as $dataValueComparer) {
+			if (!is_object($dataValueComparer) || !($dataValueComparer instanceof DataValueComparer)) {
 				throw new InvalidArgumentException(
 					'All $dataValueComparers need to implement the DataValueComparer interface'
 				);
@@ -48,9 +48,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
-		foreach ( $this->dataValueComparers as $dataValueComparer ) {
-			if ( $dataValueComparer->canCompare( $value, $comparativeValue ) ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
+		foreach ($this->dataValueComparers as $dataValueComparer) {
+			if ($dataValueComparer->canCompare($value, $comparativeValue)) {
 				return true;
 			}
 		}
@@ -67,10 +67,10 @@ 
 	 * @throws InvalidArgumentException
 	 * @return string One of the ComparisonResult::STATUS_... constants.
 	 */
-	public function compare( DataValue $value, DataValue $comparativeValue ) {
-		foreach ( $this->dataValueComparers as $dataValueComparer ) {
-			if ( $dataValueComparer->canCompare( $value, $comparativeValue ) ) {
-				return $dataValueComparer->compare( $value, $comparativeValue );
+	public function compare(DataValue $value, DataValue $comparativeValue) {
+		foreach ($this->dataValueComparers as $dataValueComparer) {
+			if ($dataValueComparer->canCompare($value, $comparativeValue)) {
+				return $dataValueComparer->compare($value, $comparativeValue);
 			}
 		}
 

includes/DumpMetaInformation/DumpMetaInformation.php

Spacing +29 added lines, -29 removed lines

@@ -99,13 +99,13 @@ 
 			'$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;
 	}
 
@@ -170,11 +170,11 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	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.' );
+	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.');
 		}
 
 		$this->dumpId = $dumpId;
@@ -185,10 +185,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;
@@ -199,12 +199,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;
@@ -215,13 +215,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;
@@ -232,10 +232,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/CrossCheck/Result/CrossCheckResult.php

Spacing +2 added lines, -2 removed lines

@@ -73,8 +73,8 @@
 		ComparisonResult $comparisonResult,
 		ReferenceResult $referenceResult
 	) {
-		Assert::parameterType( 'string', $claimGuid, '$claimGuid' );
-		Assert::parameterType( 'string', $externalId, '$externalId' );
+		Assert::parameterType('string', $claimGuid, '$claimGuid');
+		Assert::parameterType('string', $externalId, '$externalId');
 
 		$this->propertyId = $propertyId;
 		$this->claimGuid = $claimGuid;

includes/ExternalValidationServices.php

Spacing +12 added lines, -12 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @fixme inject specific things needed here instead of the WikibaseRepo factory. (T112105)
 	 */
-	public function __construct( WikibaseRepo $wikibaseRepo ) {
+	public function __construct(WikibaseRepo $wikibaseRepo) {
 		$this->wikibaseRepo = $wikibaseRepo;
 	}
 
@@ -85,10 +85,10 @@ 
 	public static function getDefaultInstance() {
 		static $instance = null;
 
-		if ( $instance === null ) {
+		if ($instance === null) {
 			$wikibaseRepo = WikibaseRepo::getDefaultInstance();
 
-			$instance = new self( $wikibaseRepo );
+			$instance = new self($wikibaseRepo);
 		}
 
 		return $instance;
@@ -98,7 +98,7 @@ 
 	 * @return CrossChecker
 	 */
 	public function getCrossChecker() {
-		if ( $this->crossChecker === null ) {
+		if ($this->crossChecker === null) {
 			$this->crossChecker = new CrossChecker(
 				$this->wikibaseRepo->getEntityLookup(),
 				$this->getComparativeValueParserFactory(),
@@ -116,7 +116,7 @@ 
 	 * @return CrossCheckInteractor
 	 */
 	public function getCrossCheckInteractor() {
-		if ( $this->crossCheckInteractor === null ) {
+		if ($this->crossCheckInteractor === null) {
 			$this->crossCheckInteractor = new CrossCheckInteractor(
 				$this->wikibaseRepo->getEntityLookup(),
 				$this->wikibaseRepo->getStatementGuidParser(),
@@ -131,7 +131,7 @@ 
 	 * @return ComparativeValueParserFactory
 	 */
 	public function getComparativeValueParserFactory() {
-		if ( $this->comparativeValueParserFactory === null ) {
+		if ($this->comparativeValueParserFactory === null) {
 			$this->comparativeValueParserFactory = new ComparativeValueParserFactory(
 				$this->wikibaseRepo->getDataTypeDefinitions(),
 				new StringNormalizer()
@@ -145,7 +145,7 @@ 
 	 * @return DataValueComparerFactory
 	 */
 	public function getDataValueComparerFactory() {
-		if ( $this->dataValueComparerFactory === null ) {
+		if ($this->dataValueComparerFactory === null) {
 			$this->dataValueComparerFactory = new DataValueComparerFactory(
 				$this->wikibaseRepo->getStore()->getTermIndex(),
 				$this->wikibaseRepo->getStringNormalizer()
@@ -159,7 +159,7 @@ 
 	 * @return DumpMetaInformationLookup
 	 */
 	public function getDumpMetaInformationLookup() {
-		if ( $this->dumpMetaInformationLookup === null ) {
+		if ($this->dumpMetaInformationLookup === null) {
 			$this->dumpMetaInformationLookup = new SqlDumpMetaInformationRepo();
 		}
 
@@ -170,7 +170,7 @@ 
 	 * @return DumpMetaInformationStore
 	 */
 	public function getDumpMetaInformationStore() {
-		if ( $this->dumpMetaInformationStore === null ) {
+		if ($this->dumpMetaInformationStore === null) {
 			$this->dumpMetaInformationStore = new SqlDumpMetaInformationRepo();
 		}
 
@@ -181,7 +181,7 @@ 
 	 * @return ExternalDataRepo
 	 */
 	public function getExternalDataRepo() {
-		if ( $this->externalDataRepo === null ) {
+		if ($this->externalDataRepo === null) {
 			$this->externalDataRepo = new ExternalDataRepo();
 		}
 
@@ -192,9 +192,9 @@ 
 	 * @return SerializerFactory
 	 */
 	public function getSerializerFactory() {
-		if ( $this->serializerFactory === null ) {
+		if ($this->serializerFactory === null) {
 			$dataValueSerializer = new DataValueSerializer();
-			$dataModelSerializerFactory = new \Wikibase\DataModel\SerializerFactory( $dataValueSerializer );
+			$dataModelSerializerFactory = new \Wikibase\DataModel\SerializerFactory($dataValueSerializer);
 			$this->serializerFactory = new SerializerFactory(
 				$dataValueSerializer,
 				$dataModelSerializerFactory->newReferenceSerializer()

api/RunCrossCheck.php

Spacing +31 added lines, -31 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$repo = WikibaseRepo::getDefaultInstance();
 		$externalValidationServices = ExternalValidationServices::getDefaultInstance();
 
@@ -77,7 +77,7 @@ 
 			$repo->getStatementGuidValidator(),
 			$externalValidationServices->getCrossCheckInteractor(),
 			$externalValidationServices->getSerializerFactory(),
-			$repo->getApiHelperFactory( RequestContext::getMain() )
+			$repo->getApiHelperFactory(RequestContext::getMain())
 		);
 	}
 
@@ -101,14 +101,14 @@ 
 		SerializerFactory $serializerFactory,
 		ApiHelperFactory $apiHelperFactory
 	) {
-		parent::__construct( $main, $name, $prefix );
+		parent::__construct($main, $name, $prefix);
 
 		$this->entityIdParser = $entityIdParser;
 		$this->statementGuidValidator = $statementGuidValidator;
 		$this->crossCheckInteractor = $crossCheckInteractor;
 		$this->serializerFactory = $serializerFactory;
-		$this->resultBuilder = $apiHelperFactory->getResultBuilder( $this );
-		$this->errorReporter = $apiHelperFactory->getErrorReporter( $this );
+		$this->resultBuilder = $apiHelperFactory->getResultBuilder($this);
+		$this->errorReporter = $apiHelperFactory->getErrorReporter($this);
 	}
 
 	/**
@@ -117,34 +117,34 @@ 
 	public function execute() {
 		$params = $this->extractRequestParams();
 
-		if ( $params['entities'] && $params['claims'] ) {
+		if ($params['entities'] && $params['claims']) {
 			$this->errorReporter->dieError(
 				'Either provide the ids of entities or ids of claims, that should be cross-checked.',
 				'param-invalid'
 			);
 			throw new LogicException();
-		} elseif ( $params['entities'] ) {
-			$entityIds = $this->parseEntityIds( $params['entities'] );
-			if ( $params['properties'] ) {
-				$propertyIds = $this->parseEntityIds( $params['properties'] );
-				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIdWithProperties( $entityIds, $propertyIds );
+		} elseif ($params['entities']) {
+			$entityIds = $this->parseEntityIds($params['entities']);
+			if ($params['properties']) {
+				$propertyIds = $this->parseEntityIds($params['properties']);
+				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIdWithProperties($entityIds, $propertyIds);
 			} else {
-				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIds( $entityIds );
+				$resultLists = $this->crossCheckInteractor->crossCheckEntitiesByIds($entityIds);
 			}
-		} elseif ( $params['claims'] ) {
+		} elseif ($params['claims']) {
 			$guids = $params['claims'];
-			$this->assertAreValidClaimGuids( $guids );
-			$resultLists = $this->crossCheckInteractor->crossCheckStatementsByGuids( $guids );
+			$this->assertAreValidClaimGuids($guids);
+			$resultLists = $this->crossCheckInteractor->crossCheckStatementsByGuids($guids);
 		} else {
 			$this->errorReporter->dieWithError(
-				[ 'wikibase-api-param-missing', 'entities|claims' ],
+				['wikibase-api-param-missing', 'entities|claims'],
 				'param-missing'
 			);
 			throw new LogicException();
 		}
 
 		// Print result lists
-		$this->writeResultOutput( $resultLists );
+		$this->writeResultOutput($resultLists);
 	}
 
 	/**
@@ -152,9 +152,9 @@ 
 	 *
 	 * @return EntityId[]
 	 */
-	private function parseEntityIds( array $entityIds ) {
+	private function parseEntityIds(array $entityIds) {
 		return array_map(
-			[ $this->entityIdParser, 'parse' ],
+			[$this->entityIdParser, 'parse'],
 			$entityIds
 		);
 	}
@@ -162,10 +162,10 @@ 
 	/**
 	 * @param string[] $guids
 	 */
-	private function assertAreValidClaimGuids( array $guids ) {
-		foreach ( $guids as $guid ) {
-			if ( $this->statementGuidValidator->validateFormat( $guid ) === false ) {
-				$this->errorReporter->dieError( 'Invalid claim guid.', 'invalid-guid' );
+	private function assertAreValidClaimGuids(array $guids) {
+		foreach ($guids as $guid) {
+			if ($this->statementGuidValidator->validateFormat($guid) === false) {
+				$this->errorReporter->dieError('Invalid claim guid.', 'invalid-guid');
 			}
 		}
 	}
@@ -177,13 +177,13 @@ 
 	 *
 	 * @return array
 	 */
-	private function writeResultOutput( array $resultLists ) {
+	private function writeResultOutput(array $resultLists) {
 		$serializer = $this->serializerFactory->newCrossCheckResultListSerializer();
 
 		$output = [];
-		foreach ( $resultLists as $entityId => $resultList ) {
-			if ( $resultList ) {
-				$serializedResultList = $serializer->serialize( $resultList );
+		foreach ($resultLists as $entityId => $resultList) {
+			if ($resultList) {
+				$serializedResultList = $serializer->serialize($resultList);
 
 				$output[$entityId] = $serializedResultList;
 			} else {
@@ -193,10 +193,10 @@ 
 			}
 		}
 
-		$this->getResult()->setIndexedTagName( $output, 'entity' );
-		$this->getResult()->setArrayType( $output, 'kvp', 'id' );
-		$this->getResult()->addValue( null, 'results', $output );
-		$this->resultBuilder->markSuccess( 1 );
+		$this->getResult()->setIndexedTagName($output, 'entity');
+		$this->getResult()->setArrayType($output, 'kvp', 'id');
+		$this->getResult()->addValue(null, 'results', $output);
+		$this->resultBuilder->markSuccess(1);
 	}
 
 	/**

WikibaseQualityExternalValidation.php

Spacing +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-	require_once __DIR__ . '/vendor/autoload.php';
+if (is_readable(__DIR__.'/vendor/autoload.php')) {
+	require_once __DIR__.'/vendor/autoload.php';
 }
 
-call_user_func( function () {
+call_user_func(function() {
 	// Set credits
 	$GLOBALS['wgExtensionCredits']['wikibase'][] = [
 		'path' => __FILE__,
@@ -17,9 +17,9 @@ 
 	];
 
 	// Initialize localization and aliases
-	$GLOBALS['wgMessagesDirs']['WikibaseQualityExternalValidation'] = __DIR__ . '/i18n';
+	$GLOBALS['wgMessagesDirs']['WikibaseQualityExternalValidation'] = __DIR__.'/i18n';
 	$GLOBALS['wgExtensionMessagesFiles']['WikibaseQualityExternalValidationAlias'] =
-		__DIR__ . '/WikibaseQualityExternalValidation.alias.php';
+		__DIR__.'/WikibaseQualityExternalValidation.alias.php';
 
 	// Initalize hooks for creating database tables
 	$GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
@@ -38,8 +38,8 @@ 
 	// Define API modules
 	$GLOBALS['wgAPIModules']['wbqevcrosscheck'] = [
 		'class' => WikibaseQuality\ExternalValidation\Api\RunCrossCheck::class,
-		'factory' => function( ApiMain $main, $action ) {
-			return WikibaseQuality\ExternalValidation\Api\RunCrossCheck::newFromGlobalState( $main, $action );
+		'factory' => function(ApiMain $main, $action) {
+			return WikibaseQuality\ExternalValidation\Api\RunCrossCheck::newFromGlobalState($main, $action);
 		}
 	];
 

includes/UpdateExternalData/ExternalDataImporter.php

Spacing +41 added lines, -41 removed lines

@@ -52,13 +52,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();
 	}
@@ -69,52 +69,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;
 	}
@@ -123,31 +123,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 = [];
-		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 = [];
 
-				if ( $data === false ) {
+				if ($data === false) {
 					break;
 				}
 			}
@@ -155,16 +155,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/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,21 +117,21 @@ 
 	 * @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');
 
-		$db = wfGetDB( DB_MASTER );
-		if ( $db->getType() === 'sqlite' ) {
-			$db->delete( self::TABLE_NAME, [ 'dump_id' => $dumpId ] );
+		$db = wfGetDB(DB_MASTER);
+		if ($db->getType() === 'sqlite') {
+			$db->delete(self::TABLE_NAME, ['dump_id' => $dumpId]);
 		} else {
 			do {
-				$db->commit( __METHOD__, 'flush' );
+				$db->commit(__METHOD__, 'flush');
 				wfGetLBFactory()->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);
 		}
 	}