wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

includes/Serializer/CrossCheckResultSerializer.php

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isSerializerFor( $object ) {
+	public function isSerializerFor($object) {
 		return $object instanceof CrossCheckResult;
 	}
 
@@ -63,25 +63,25 @@ 
 	 * @return array
 	 * @throws UnsupportedObjectException
 	 */
-	public function serialize( $object ) {
-		if ( !$this->isSerializerFor( $object ) ) {
+	public function serialize($object) {
+		if (!$this->isSerializerFor($object)) {
 			throw new UnsupportedObjectException(
 				$object,
 				'CrossCheckResultSerializer can only serialize CrossCheckResult objects.'
 			);
 		}
 
-		return $this->getSerialized( $object );
+		return $this->getSerialized($object);
 	}
 
-	private function getSerialized( CrossCheckResult $crossCheckResult ) {
+	private function getSerialized(CrossCheckResult $crossCheckResult) {
 		return array(
 			'propertyId' => $crossCheckResult->getPropertyId()->getSerialization(),
 			'claimGuid' => $crossCheckResult->getClaimGuid(),
 			'externalId' => $crossCheckResult->getExternalId(),
-			'dataSource' => $this->dumpMetaInformationSerializer->serialize( $crossCheckResult->getDumpMetaInformation() ),
-			'comparisonResult' => $this->comparisonResultSerializer->serialize( $crossCheckResult->getComparisonResult() ),
-			'referenceResult' => $this->referenceResultSerializer->serialize( $crossCheckResult->getReferenceResult() )
+			'dataSource' => $this->dumpMetaInformationSerializer->serialize($crossCheckResult->getDumpMetaInformation()),
+			'comparisonResult' => $this->comparisonResultSerializer->serialize($crossCheckResult->getComparisonResult()),
+			'referenceResult' => $this->referenceResultSerializer->serialize($crossCheckResult->getReferenceResult())
 		);
 	}
 

maintenance/UpdateExternalData.php

Spacing +11 added lines, -11 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,17 +25,17 @@ 
 	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()
 		);

includes/CrossCheck/Comparer/QuantityValueComparer.php

Spacing +6 added lines, -6 removed lines

@@ -23,9 +23,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.');
 		}
 
 		/**
@@ -33,8 +33,8 @@ 
 		 * @var QuantityValue $comparativeValue
 		 */
 
-		if ( $comparativeValue->getLowerBound()->compare( $value->getUpperBound() ) <= 0 &&
-			$comparativeValue->getUpperBound()->compare( $value->getLowerBound() ) >= 0
+		if ($comparativeValue->getLowerBound()->compare($value->getUpperBound()) <= 0 &&
+			$comparativeValue->getUpperBound()->compare($value->getLowerBound()) >= 0
 		) {
 			return ComparisonResult::STATUS_MATCH;
 		}
@@ -50,7 +50,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canCompare( DataValue $value, DataValue $comparativeValue ) {
+	public function canCompare(DataValue $value, DataValue $comparativeValue) {
 		return $value instanceof QuantityValue && $comparativeValue instanceof QuantityValue;
 	}
 

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 = array(
 			'dump_id' => $dumpIds,
 			'external_id' => $externalIds
 		);
-		if ( $propertyIds ) {
+		if ($propertyIds) {
 			$conditions['pid'] = $propertyIds;
 		}
 
 		$externalData = array();
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$result = $db->select(
 			self::TABLE_NAME,
 			array(
@@ -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 = array( func_get_args() );
-		return $this->insertBatch( $externalDataBatch );
+		$externalDataBatch = array(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 array(
 					'dump_id' => $externalData[0],
 					'external_id' => $externalData[1],
@@ -100,10 +100,10 @@ 
 
 		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;
 		}
@@ -118,21 +118,21 @@ 
 	 * @param int $batchSize
 	 * @throws \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, array( 'dump_id' => $dumpId ) );
+		$db = wfGetDB(DB_MASTER);
+		if ($db->getType() === 'sqlite') {
+			$db->delete(self::TABLE_NAME, array('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);
 		}
 	}