wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

WikibaseQualityExternalValidationHooks.php

Spacing +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@
 	 *
 	 * @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;
 	}

includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php

Spacing +42 added lines, -42 removed lines

@@ -28,18 +28,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(
 			[
 				self::META_TABLE_NAME,
@@ -59,7 +59,7 @@ 
 			]
 		);
 
-		return $this->buildDumpMetaInformationFromResult( $result );
+		return $this->buildDumpMetaInformationFromResult($result);
 	}
 
 	/**
@@ -71,20 +71,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
@@ -97,13 +97,13 @@ 
 			]
 		);
 		$dumpIds = [];
-		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);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 * @return DumpMetaInformation[]
 	 */
 	public function getAll() {
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$result = $db->select(
 			[
 				self::META_TABLE_NAME,
@@ -131,7 +131,7 @@ 
 			]
 		);
 
-		return $this->buildDumpMetaInformationFromResult( $result );
+		return $this->buildDumpMetaInformationFromResult($result);
 	}
 
 	/**
@@ -139,34 +139,34 @@ 
 	 * @return null|array
 	 * @throws UnexpectedValueException
 	 */
-	private function buildDumpMetaInformationFromResult( IResultWrapper $result ) {
+	private function buildDumpMetaInformationFromResult(IResultWrapper $result) {
 		$aggregatedRows = [];
-		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 = [ $propertyId ];
+				if ($row->identifier_pid !== null) {
+					$propertyId = new PropertyId($row->identifier_pid);
+					$row->identifier_pid = [$propertyId];
 				}
 				$aggregatedRows[$row->id] = $row;
 			}
 		}
 
 		$dumpMetaInformation = [];
-		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,
@@ -185,22 +185,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,
-			[ 'id' ],
-			[ 'id' => $dumpId ]
+			['id'],
+			['id' => $dumpId]
 		);
 
-		if ( $existing ) {
+		if ($existing) {
 			$db->update(
 				self::META_TABLE_NAME,
 				$accumulator,
-				[ 'id' => $dumpId ]
+				['id' => $dumpId]
 			);
 		} else {
 			$db->insert(
@@ -211,12 +211,12 @@ 
 
 		$db->delete(
 			self::IDENTIFIER_PROPERTIES_TABLE_NAME,
-			[ 'dump_id' => $dumpId ]
+			['dump_id' => $dumpId]
 		);
 		$db->insert(
 			self::IDENTIFIER_PROPERTIES_TABLE_NAME,
 			array_map(
-				function ( PropertyId $identifierPropertyId ) use ( $dumpId ) {
+				function(PropertyId $identifierPropertyId) use ($dumpId) {
 					return [
 						'dump_id' => $dumpId,
 						'identifier_pid' => $identifierPropertyId->getSerialization()
@@ -232,11 +232,11 @@ 
 	 * @param DumpMetaInformation $dumpMetaInformation
 	 * @return array
 	 */
-	private function getDumpInformationFields( IDatabase $db, DumpMetaInformation $dumpMetaInformation ) {
+	private function getDumpInformationFields(IDatabase $db, DumpMetaInformation $dumpMetaInformation) {
 		return [
 			'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/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,22 +117,22 @@ 
 	 * @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');
 
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-		$db = $lbFactory->getMainLB()->getConnection( DB_MASTER );
-		if ( $db->getType() === 'sqlite' ) {
-			$db->delete( self::TABLE_NAME, [ 'dump_id' => $dumpId ] );
+		$db = $lbFactory->getMainLB()->getConnection(DB_MASTER);
+		if ($db->getType() === 'sqlite') {
+			$db->delete(self::TABLE_NAME, ['dump_id' => $dumpId]);
 		} else {
 			do {
-				$db->commit( __METHOD__, 'flush' );
+				$db->commit(__METHOD__, 'flush');
 				$lbFactory->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);
 		}
 	}
 

includes/UpdateExternalData/ExternalDataImporter.php

Spacing +41 added lines, -41 removed lines

@@ -47,13 +47,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();
 	}
@@ -64,52 +64,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;
 	}
@@ -118,32 +118,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 = [];
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-		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.');
 				}
 				$lbFactory->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;
 				}
 			}
@@ -151,16 +151,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;
 		}
 	}