wikimedia / mediawiki-extensions-WikibaseQualityExternalValidation

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

WikibaseQualityExternalValidation.php

Spacing +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-	require_once __DIR__ . '/vendor/autoload.php';
+if (is_readable(__DIR__.'/vendor/autoload.php')) {
+	require_once __DIR__.'/vendor/autoload.php';
 }
 
-call_user_func( function () {
+call_user_func(function() {
 	// Set credits
 	$GLOBALS['wgExtensionCredits']['wikibase'][] = array(
 		'path' => __FILE__,
@@ -17,8 +17,8 @@ 
 	);
 
 	// Initialize localization and aliases
-	$GLOBALS['wgMessagesDirs']['WikibaseQualityExternalValidation'] = __DIR__ . '/i18n';
-	$GLOBALS['wgExtensionMessagesFiles']['WikibaseQualityExternalValidationAlias'] = __DIR__ . '/WikibaseQualityExternalValidation.alias.php';
+	$GLOBALS['wgMessagesDirs']['WikibaseQualityExternalValidation'] = __DIR__.'/i18n';
+	$GLOBALS['wgExtensionMessagesFiles']['WikibaseQualityExternalValidationAlias'] = __DIR__.'/WikibaseQualityExternalValidation.alias.php';
 
 	// Initalize hooks for creating database tables
 	$GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
@@ -37,8 +37,8 @@ 
 	// Define API modules
 	$GLOBALS['wgAPIModules']['wbqevcrosscheck'] = array(
 		'class' => 'WikibaseQuality\ExternalValidation\Api\RunCrossCheck',
-		'factory' => function( ApiMain $main, $action ) {
-			return \WikibaseQuality\ExternalValidation\Api\RunCrossCheck::newFromGlobalState( $main, $action );
+		'factory' => function(ApiMain $main, $action) {
+			return \WikibaseQuality\ExternalValidation\Api\RunCrossCheck::newFromGlobalState($main, $action);
 		}
 	);
 

includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php

Spacing +42 added lines, -42 removed lines

@@ -29,18 +29,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(
 			array(
 				self::META_TABLE_NAME,
@@ -60,7 +60,7 @@ 
 			)
 		);
 
-		return $this->buildDumpMetaInformationFromResult( $result );
+		return $this->buildDumpMetaInformationFromResult($result);
 	}
 
 	/**
@@ -72,20 +72,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
@@ -98,13 +98,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);
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @return DumpMetaInformation[]
 	 */
 	public function getAll() {
-		$db = wfGetDB( DB_REPLICA );
+		$db = wfGetDB(DB_REPLICA);
 		$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_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,
-			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/DumpMetaInformation.php

Spacing +30 added lines, -30 removed lines

@@ -83,27 +83,27 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( $dumpId,
+	public function __construct($dumpId,
 								 ItemId $sourceItemId,
 								 array $identifierPropertyIds,
 								 $importDate,
 								 $languageCode,
 								 $sourceUrl,
 								 $size,
-								 ItemId $licenseItemId ) {
+								 ItemId $licenseItemId) {
 		Assert::parameterElementType(
 			PropertyId::class,
 			$identifierPropertyIds,
 			'$identifierPropertyIds'
 		);
 
-		$this->setDumpId( $dumpId );
+		$this->setDumpId($dumpId);
 		$this->sourceItemId = $sourceItemId;
 		$this->identifierPropertyIds = $identifierPropertyIds;
-		$this->setImportDate( $importDate );
-		$this->setLanguageCode( $languageCode );
-		$this->setSourceUrl( $sourceUrl );
-		$this->setSize( $size );
+		$this->setImportDate($importDate);
+		$this->setLanguageCode($languageCode);
+		$this->setSourceUrl($sourceUrl);
+		$this->setSize($size);
 		$this->licenseItemId = $licenseItemId;
 	}
 
@@ -168,10 +168,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setDumpId( $dumpId ) {
-		Assert::parameterType( 'string', $dumpId, '$dumpId' );
-		$length = strlen( $dumpId );
-		if ( $length < 1 || $length > 25 ) {
+	private function setDumpId($dumpId) {
+		Assert::parameterType('string', $dumpId, '$dumpId');
+		$length = strlen($dumpId);
+		if ($length < 1 || $length > 25) {
 			throw new InvalidArgumentException('$dumpId must be between 1 and 25 characters.');
 		}
 
@@ -183,10 +183,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setLanguageCode( $languageCode ) {
-		Assert::parameterType( 'string', $languageCode, '$languageCode' );
-		if ( !Language::isValidCode( $languageCode ) ) {
-			throw new InvalidArgumentException( '$languageCode is not valid.' );
+	private function setLanguageCode($languageCode) {
+		Assert::parameterType('string', $languageCode, '$languageCode');
+		if (!Language::isValidCode($languageCode)) {
+			throw new InvalidArgumentException('$languageCode is not valid.');
 		}
 
 		$this->languageCode = $languageCode;
@@ -197,12 +197,12 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setImportDate( $importDate ) {
-		Assert::parameterType( 'string', $importDate, '$importDate' );
+	private function setImportDate($importDate) {
+		Assert::parameterType('string', $importDate, '$importDate');
 
-		$timestamp = wfTimestamp( TS_MW, $importDate );
-		if ( !$timestamp ) {
-			throw new InvalidArgumentException( '$updatedAt has invalid timestamp format.' );
+		$timestamp = wfTimestamp(TS_MW, $importDate);
+		if (!$timestamp) {
+			throw new InvalidArgumentException('$updatedAt has invalid timestamp format.');
 		}
 
 		$this->importDate = $importDate;
@@ -213,13 +213,13 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setSourceUrl( $sourceUrl ) {
-		Assert::parameterType( 'string', $sourceUrl, '$sourceUrl' );
-		if ( strlen( $sourceUrl ) > 300 ) {
-			throw new InvalidArgumentException( '$sourceUrl must not be longer than 300 characters.' );
+	private function setSourceUrl($sourceUrl) {
+		Assert::parameterType('string', $sourceUrl, '$sourceUrl');
+		if (strlen($sourceUrl) > 300) {
+			throw new InvalidArgumentException('$sourceUrl must not be longer than 300 characters.');
 		}
-		if ( !filter_var( $sourceUrl, FILTER_VALIDATE_URL ) ) {
-			throw new InvalidArgumentException( '$sourceUrl is not a valid url.' );
+		if (!filter_var($sourceUrl, FILTER_VALIDATE_URL)) {
+			throw new InvalidArgumentException('$sourceUrl is not a valid url.');
 		}
 
 		$this->sourceUrl = $sourceUrl;
@@ -230,10 +230,10 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function setSize( $size ) {
-		Assert::parameterType( 'integer', $size, '$size' );
-		if ( $size <= 0 ) {
-			throw new InvalidArgumentException( '$size must be positive integer.' );
+	private function setSize($size) {
+		Assert::parameterType('integer', $size, '$size');
+		if ($size <= 0) {
+			throw new InvalidArgumentException('$size must be positive integer.');
 		}
 
 		$this->size = $size;

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,52 +68,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 = 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 );
-			} 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;
 	}
@@ -122,31 +122,31 @@ 
 	 * 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 );
-				} catch ( \DBError $e ) {
-					exit( 'Unknown database error occurred.' );
+					$this->externalDataRepo->insertBatch($accumulator);
+				} 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;
 				}
 			}
@@ -154,16 +154,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;
 		}
 	}