wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/Serializer/SerializerFactory.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param Serializer $dataValueSerializer
 	 * @param Serializer $referenceSerializer
 	 */
-	public function __construct( Serializer $dataValueSerializer, Serializer $referenceSerializer ) {
+	public function __construct(Serializer $dataValueSerializer, Serializer $referenceSerializer) {
 		$this->dataValueSerializer = $dataValueSerializer;
 		$this->referenceSerializer = $referenceSerializer;
 	}
@@ -47,7 +47,7 @@ 
 	 * @return Serializer
 	 */
 	public function newComparisonResultSerializer() {
-		return new ComparisonResultSerializer( $this->dataValueSerializer );
+		return new ComparisonResultSerializer($this->dataValueSerializer);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @return Serializer
 	 */
 	public function newReferenceResultSerializer() {
-		return new ReferenceResultSerializer( $this->referenceSerializer );
+		return new ReferenceResultSerializer($this->referenceSerializer);
 	}
 
 }

includes/UpdateExternalData/CsvImportSettings.php

Spacing +5 added lines, -5 removed lines

@@ -43,11 +43,11 @@
 	 * @param int $batchSize
 	 * @param bool $quiet
 	 */
-	public function __construct( $externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false ) {
-		Assert::parameterType( 'string', $externalValuesFilePath, '$externalValuesFilePath' );
-		Assert::parameterType( 'string', $dumpInformationFilePath, '$dumpInformationFilePath' );
-		Assert::parameterType( 'integer', $batchSize, '$batchSize' );
-		Assert::parameterType( 'boolean', $quiet, '$quiet' );
+	public function __construct($externalValuesFilePath, $dumpInformationFilePath, $batchSize, $quiet = false) {
+		Assert::parameterType('string', $externalValuesFilePath, '$externalValuesFilePath');
+		Assert::parameterType('string', $dumpInformationFilePath, '$dumpInformationFilePath');
+		Assert::parameterType('integer', $batchSize, '$batchSize');
+		Assert::parameterType('boolean', $quiet, '$quiet');
 
 		$this->externalValuesFilePath = $externalValuesFilePath;
 		$this->dumpInformationFilePath = $dumpInformationFilePath;

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.');
 				}
 				wfWaitForSlaves();
 
-				$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.' );
 				}
 				wfWaitForSlaves();

maintenance/UpdateExternalData.php

Spacing +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings;
 use WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter;
 
-$basePath = getenv( 'MW_INSTALL_PATH' ) !== false
-	? getenv( 'MW_INSTALL_PATH' )
+$basePath = getenv('MW_INSTALL_PATH') !== false
+	? getenv('MW_INSTALL_PATH')
 	: __DIR__ . '/../../..';
 require_once $basePath . '/maintenance/Maintenance.php';
 
@@ -26,15 +26,15 @@ 
 		parent::__construct();
 
 		$this->mDescription = "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->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()
 		);