wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/CrossCheck/Result/ComparisonResult.php

Spacing +8 added lines, -8 removed lines

@@ -45,12 +45,12 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( DataValue $localValue, array $externalValues, $status ) {
-		Assert::parameterElementType( DataValue::class, $externalValues, '$externalValues' );
+	public function __construct(DataValue $localValue, array $externalValues, $status) {
+		Assert::parameterElementType(DataValue::class, $externalValues, '$externalValues');
 
 		$this->localValue = $localValue;
 		$this->externalValues = $externalValues;
-		$this->setStatus( $status );
+		$this->setStatus($status);
 	}
 
 	/**
@@ -79,14 +79,14 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setStatus( $status ) {
-		Assert::parameterType( 'string', $status, '$status' );
-		if ( !in_array(
+	private function setStatus($status) {
+		Assert::parameterType('string', $status, '$status');
+		if (!in_array(
 			$status,
-			array( self::STATUS_MATCH, self::STATUS_PARTIAL_MATCH, self::STATUS_MISMATCH )
+			array(self::STATUS_MATCH, self::STATUS_PARTIAL_MATCH, self::STATUS_MISMATCH)
 		)
 		) {
-			throw new InvalidArgumentException( '$status must be one of the status constants.' );
+			throw new InvalidArgumentException('$status must be one of the status constants.');
 		}
 
 		$this->status = $status;

includes/CrossCheck/Comparer/EntityIdValueComparer.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param TermIndex $termIndex
 	 * @param StringComparer $stringComparer
 	 */
-	public function __construct( TermIndex $termIndex, StringComparer $stringComparer ) {
+	public function __construct(TermIndex $termIndex, StringComparer $stringComparer) {
 		$this->termIndex = $termIndex;
 		$this->stringComparer = $stringComparer;
 	}
@@ -45,9 +45,9 @@ 
 	 *
 	 * @return string|null One of the ComparisonResult::STATUS_... constants.
 	 */
-	public function compare( DataValue $value, DataValue $comparativeValue ) {
-		Assert::parameterType( EntityIdValue::class, $value, '$value' );
-		Assert::parameterType( MonolingualTextValue::class, $comparativeValue, '$comparativeValue' );
+	public function compare(DataValue $value, DataValue $comparativeValue) {
+		Assert::parameterType(EntityIdValue::class, $value, '$value');
+		Assert::parameterType(MonolingualTextValue::class, $comparativeValue, '$comparativeValue');
 
 		/**
 		 * @var EntityIdValue $value
@@ -56,10 +56,10 @@ 
 
 		$entityId = $value->getEntityId();
 		$language = $comparativeValue->getLanguageCode();
-		$terms = $this->getTerms( $entityId, $language );
+		$terms = $this->getTerms($entityId, $language);
 
-		if ( $terms ) {
-			return $this->stringComparer->compareWithArray( $comparativeValue->getText(), $terms );
+		if ($terms) {
+			return $this->stringComparer->compareWithArray($comparativeValue->getText(), $terms);
 		}
 
 		return null;
@@ -73,18 +73,18 @@ 
 	 *
 	 * @return array
 	 */
-	private function getTerms( EntityId $entityId, $language ) {
+	private function getTerms(EntityId $entityId, $language) {
 		$terms = $this->termIndex->getTermsOfEntity(
 			$entityId,
 			array(
 				TermIndexEntry::TYPE_LABEL,
 				TermIndexEntry::TYPE_ALIAS
 			),
-			array( $language )
+			array($language)
 		);
 
 		return array_map(
-			function( TermIndexEntry $term ) {
+			function(TermIndexEntry $term) {
 				return $term->getText();
 			},
 			$terms
@@ -98,7 +98,7 @@ 
 	 * @param DataValue $comparativeValue
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof EntityIdValue && $comparativeValue instanceof MonolingualTextValue;
 	}
 

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

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

Braces +3 added lines, -6 removed lines

@@ -95,16 +95,14 @@ 
 					intval( $data[6] ),
 					new ItemId( $data[7] )
 				);
-			}
-			catch( \InvalidArgumentException $e ) {
+			} catch( \InvalidArgumentException $e ) {
 				exit( 'Input file has bad formatted values.' );
 			}
 			$dumpIds[] = $dumpMetaInformation->getDumpId();
 
 			try {
 				$this->dumpMetaInformationStore->save( $dumpMetaInformation );
-			}
-			catch( \DBError $e ) {
+			} catch( \DBError $e ) {
 				exit( 'Unknown database error occurred.' );
 			}
 
@@ -138,8 +136,7 @@ 
 			if ( $data === false || ++$i % $this->importSettings->getBatchSize() === 0 ) {
 				try {
 					$this->externalDataRepo->insertBatch( $accumulator );
-				}
-				catch( \DBError $e ) {
+				} catch( \DBError $e ) {
 					exit( 'Unknown database error occurred.' );
 				}
 				wfGetLBFactory()->waitForReplication();