wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php

Spacing +42 added lines, -42 removed lines

@@ -29,15 +29,15 @@ 
 	 * @return DumpMetaInformation[]
 	 * @throws InvalidArgumentException
 	 */
-	public function getWithIds( array $dumpIds ) {
-		foreach ( $dumpIds as $dumpId ) {
-			if ( !is_string( $dumpId ) ) {
-				throw new InvalidArgumentException( '$dumpIds must contain only strings.' );
+	public function getWithIds(array $dumpIds) {
+		foreach ($dumpIds as $dumpId) {
+			if (!is_string($dumpId)) {
+				throw new InvalidArgumentException('$dumpIds must contain only strings.');
 			}
 		}
 
-		if( count( $dumpIds ) > 0 ) {
-			$db = wfGetDB( DB_SLAVE );
+		if (count($dumpIds) > 0) {
+			$db = wfGetDB(DB_SLAVE);
 			$result = $db->select(
 				array(
 					self::META_TABLE_NAME,
@@ -57,7 +57,7 @@ 
 				)
 			);
 
-			return $this->buildDumpMetaInformationFromResult( $result );
+			return $this->buildDumpMetaInformationFromResult($result);
 		}
 
 		return array();
@@ -72,17 +72,17 @@ 
 	 * @throws InvalidArgumentException
 	 * @return DumpMetaInformation[]
 	 */
-	public function getWithIdentifierProperties( array $identifierPropertyIds ) {
-		foreach ( $identifierPropertyIds as $propertyId ) {
-			if ( !( $propertyId instanceof PropertyId ) ) {
-				throw new InvalidArgumentException( '$identifierProperties must contain only PropertyIds.' );
+	public function getWithIdentifierProperties(array $identifierPropertyIds) {
+		foreach ($identifierPropertyIds as $propertyId) {
+			if (!($propertyId instanceof PropertyId)) {
+				throw new InvalidArgumentException('$identifierProperties must contain only PropertyIds.');
 			}
 		}
 
-		if( count( $identifierPropertyIds ) > 0 ) {
-			$db = wfGetDB( DB_SLAVE );
+		if (count($identifierPropertyIds) > 0) {
+			$db = wfGetDB(DB_SLAVE);
 			$identifierPropertyIds = array_map(
-				function( PropertyId $id ) {
+				function(PropertyId $id) {
 					return $id->getSerialization();
 				},
 				$identifierPropertyIds
@@ -95,13 +95,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);
 		}
 
 		return array();
@@ -114,7 +114,7 @@ 
 	 * @return DumpMetaInformation[]
 	 */
 	public function getAll() {
-		$db = wfGetDB( DB_SLAVE );
+		$db = wfGetDB(DB_SLAVE);
 		$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_SLAVE );
+	public function save(DumpMetaInformation $dumpMetaInformation) {
+		$db = wfGetDB(DB_SLAVE);
 		$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/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

api/RunCrossCheck.php

Spacing +32 added lines, -32 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())
 		);
 	}
 
@@ -91,17 +91,17 @@ 
 	 * @param SerializerFactory $serializerFactory
 	 * @param ApiHelperFactory $apiHelperFactory
 	 */
-	public function __construct( ApiMain $main, $name, $prefix = '', EntityIdParser $entityIdParser,
+	public function __construct(ApiMain $main, $name, $prefix = '', EntityIdParser $entityIdParser,
 								 StatementGuidValidator $statementGuidValidator, CrossCheckInteractor $crossCheckInteractor,
-								 SerializerFactory $serializerFactory, ApiHelperFactory $apiHelperFactory ) {
-		parent::__construct( $main, $name, $prefix );
+								 SerializerFactory $serializerFactory, ApiHelperFactory $apiHelperFactory) {
+		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);
 	}
 
 	/**
@@ -110,24 +110,24 @@ 
 	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->dieError(
 				'Either provide the ids of entities or ids of claims, that should be cross-checked.',
@@ -137,7 +137,7 @@ 
 		}
 
 		// Print result lists
-		$this->writeResultOutput( $resultLists );
+		$this->writeResultOutput($resultLists);
 	}
 
 	/**
@@ -145,9 +145,9 @@ 
 	 *
 	 * @return EntityId[]
 	 */
-	private function parseEntityIds( array $entityIds ) {
+	private function parseEntityIds(array $entityIds) {
 		return array_map(
-			array( $this->entityIdParser, 'parse' ),
+			array($this->entityIdParser, 'parse'),
 			$entityIds
 		);
 	}
@@ -155,10 +155,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');
 			}
 		}
 	}
@@ -170,13 +170,13 @@ 
 	 *
 	 * @return array
 	 */
-	private function writeResultOutput( array $resultLists ) {
+	private function writeResultOutput(array $resultLists) {
 		$serializer = $this->serializerFactory->newCrossCheckResultListSerializer();
 
 		$output = array();
-		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 {
@@ -186,10 +186,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);
 	}
 
 	/**

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