wikimedia / mediawiki-extensions-WikibaseQualityConstraints

WikibaseQualityConstraints.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( function_exists( 'wfLoadExtension' ) ) {
-	wfLoadExtension( 'WikibaseQualityConstraints', __DIR__ . '/extension.json' );
+if (function_exists('wfLoadExtension')) {
+	wfLoadExtension('WikibaseQualityConstraints', __DIR__.'/extension.json');
 	// Keep i18n globals so mergeMessageFileList.php doesn't break
-	$wgMessagesDirs['WikibaseQualityConstraints'] = __DIR__ . '/i18n';
-	$wgExtensionMessagesFiles['WikibaseQualityConstraintsAlias'] = __DIR__ . '/WikibaseQualityConstraints.alias.php';
+	$wgMessagesDirs['WikibaseQualityConstraints'] = __DIR__.'/i18n';
+	$wgExtensionMessagesFiles['WikibaseQualityConstraintsAlias'] = __DIR__.'/WikibaseQualityConstraints.alias.php';
 	/* wfWarn(
 		'Deprecated PHP entry point used for WikibaseQualityConstraints extension. ' .
 		'Please use wfLoadExtension instead, ' .
@@ -12,5 +12,5 @@ 
 	); */
 	return;
 } else {
-	die( 'This version of the WikibaseQualityConstraints extension requires MediaWiki 1.25+' );
+	die('This version of the WikibaseQualityConstraints extension requires MediaWiki 1.25+');
 }

WikibaseQualityConstraints.alias.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 
 /** English (English) */
 $specialPageAliases['en'] = [
-	'ConstraintReport' => [ 'ConstraintReport', 'Constraint Report' ],
+	'ConstraintReport' => ['ConstraintReport', 'Constraint Report'],
 ];

maintenance/ImportConstraintStatements.php

Spacing +13 added lines, -13 removed lines

@@ -8,10 +8,10 @@ 
 use WikibaseQuality\ConstraintReport\UpdateConstraintsTableJob;
 use Wikibase\Repo\WikibaseRepo;
 
-$basePath = getenv( "MW_INSTALL_PATH" ) !== false
-	? getenv( "MW_INSTALL_PATH" ) : __DIR__ . "/../../..";
+$basePath = getenv("MW_INSTALL_PATH") !== false
+	? getenv("MW_INSTALL_PATH") : __DIR__."/../../..";
 
-require_once $basePath . "/maintenance/Maintenance.php";
+require_once $basePath."/maintenance/Maintenance.php";
 
 /**
  * Runs {@link UpdateConstraintsTableJob} once for every property.
@@ -23,23 +23,23 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->addDescription( 'Imports property constraints from statements on properties' );
+		$this->addDescription('Imports property constraints from statements on properties');
 	}
 
 	public function execute() {
-		if ( !MediaWikiServices::getInstance()->getMainConfig()->get( 'WBQualityConstraintsEnableConstraintsImportFromStatements' ) ) {
-			$this->error( 'Constraint statements are not enabled. Aborting.', 1 );
+		if (!MediaWikiServices::getInstance()->getMainConfig()->get('WBQualityConstraintsEnableConstraintsImportFromStatements')) {
+			$this->error('Constraint statements are not enabled. Aborting.', 1);
 		}
 
 		$propertyInfoLookup = WikibaseRepo::getDefaultInstance()->getStore()->getPropertyInfoLookup();
-		foreach ( $propertyInfoLookup->getAllPropertyInfo() as $propertyIdSerialization => $info ) {
-			$this->output( sprintf( 'Importing constraint statements for % 6s... ', $propertyIdSerialization ), $propertyIdSerialization );
-			$startTime = microtime( true );
-			$job = UpdateConstraintsTableJob::newFromGlobalState( Title::newMainPage(), [ 'propertyId' => $propertyIdSerialization ] );
+		foreach ($propertyInfoLookup->getAllPropertyInfo() as $propertyIdSerialization => $info) {
+			$this->output(sprintf('Importing constraint statements for % 6s... ', $propertyIdSerialization), $propertyIdSerialization);
+			$startTime = microtime(true);
+			$job = UpdateConstraintsTableJob::newFromGlobalState(Title::newMainPage(), ['propertyId' => $propertyIdSerialization]);
 			$job->run();
-			$endTime = microtime( true );
-			$millis = ( $endTime - $startTime ) * 1000;
-			$this->output( sprintf( 'done in % 6.2f ms.', $millis ), $propertyIdSerialization );
+			$endTime = microtime(true);
+			$millis = ($endTime - $startTime) * 1000;
+			$this->output(sprintf('done in % 6.2f ms.', $millis), $propertyIdSerialization);
 		}
 	}
 

src/Api/CheckConstraintParameters.php

Spacing +50 added lines, -50 removed lines

@@ -59,10 +59,10 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$constraintReportFactory = ConstraintReportFactory::getDefaultInstance();
 		$repo = WikibaseRepo::getDefaultInstance();
-		$helperFactory = $repo->getApiHelperFactory( RequestContext::getMain() );
+		$helperFactory = $repo->getApiHelperFactory(RequestContext::getMain());
 		return new self(
 			$main,
 			$name,
@@ -89,53 +89,53 @@ 
 		DelegatingConstraintChecker $delegatingConstraintChecker,
 		StatementGuidParser $statementGuidParser
 	) {
-		parent::__construct( $main, $name, $prefix );
+		parent::__construct($main, $name, $prefix);
 
-		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter( $this );
+		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter($this);
 		$this->delegatingConstraintChecker = $delegatingConstraintChecker;
 		$this->statementGuidParser = $statementGuidParser;
 	}
 
 	public function execute() {
 		MediaWikiServices::getInstance()->getStatsdDataFactory()
-			->increment( 'wikibase.quality.constraints.api.checkConstraintParameters.execute' );
+			->increment('wikibase.quality.constraints.api.checkConstraintParameters.execute');
 
 		$params = $this->extractRequestParams();
 		$result = $this->getResult();
 
-		$propertyIds = $this->parsePropertyIds( $params[self::PARAM_PROPERTY_ID] );
-		$constraintIds = $this->parseConstraintIds( $params[self::PARAM_CONSTRAINT_ID] );
+		$propertyIds = $this->parsePropertyIds($params[self::PARAM_PROPERTY_ID]);
+		$constraintIds = $this->parseConstraintIds($params[self::PARAM_CONSTRAINT_ID]);
 
-		$this->checkPropertyIds( $propertyIds, $result );
-		$this->checkConstraintIds( $constraintIds, $result );
+		$this->checkPropertyIds($propertyIds, $result);
+		$this->checkConstraintIds($constraintIds, $result);
 
-		$result->addValue( null, 'success', 1 );
+		$result->addValue(null, 'success', 1);
 	}
 
 	/**
 	 * @param array|null $propertyIdSerializations
 	 * @return PropertyId[]
 	 */
-	private function parsePropertyIds( $propertyIdSerializations ) {
-		if ( $propertyIdSerializations === null ) {
+	private function parsePropertyIds($propertyIdSerializations) {
+		if ($propertyIdSerializations === null) {
 			return [];
-		} elseif ( empty( $propertyIdSerializations ) ) {
+		} elseif (empty($propertyIdSerializations)) {
 			$this->apiErrorReporter->dieError(
-				'If ' . self::PARAM_PROPERTY_ID . ' is specified, it must be nonempty.',
+				'If '.self::PARAM_PROPERTY_ID.' is specified, it must be nonempty.',
 				'no-data'
 			);
 		}
 
 		return array_map(
-			function( $propertyIdSerialization ) {
+			function($propertyIdSerialization) {
 				try {
-					return new PropertyId( $propertyIdSerialization );
-				} catch ( InvalidArgumentException $e ) {
+					return new PropertyId($propertyIdSerialization);
+				} catch (InvalidArgumentException $e) {
 					$this->apiErrorReporter->dieError(
 						"Invalid id: $propertyIdSerialization",
 						'invalid-property-id',
 						0, // default argument
-						[ self::PARAM_PROPERTY_ID => $propertyIdSerialization ]
+						[self::PARAM_PROPERTY_ID => $propertyIdSerialization]
 					);
 				}
 			},
@@ -147,35 +147,35 @@ 
 	 * @param array|null $constraintIds
 	 * @return string[]
 	 */
-	private function parseConstraintIds( $constraintIds ) {
-		if ( $constraintIds === null ) {
+	private function parseConstraintIds($constraintIds) {
+		if ($constraintIds === null) {
 			return [];
-		} elseif ( empty( $constraintIds ) ) {
+		} elseif (empty($constraintIds)) {
 			$this->apiErrorReporter->dieError(
-				'If ' . self::PARAM_CONSTRAINT_ID . ' is specified, it must be nonempty.',
+				'If '.self::PARAM_CONSTRAINT_ID.' is specified, it must be nonempty.',
 				'no-data'
 			);
 		}
 
 		return array_map(
-			function( $constraintId ) {
+			function($constraintId) {
 				try {
-					$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
-					if ( !$propertyId instanceof PropertyId ) {
+					$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
+					if (!$propertyId instanceof PropertyId) {
 						$this->apiErrorReporter->dieError(
 							"Invalid property ID: {$propertyId->getSerialization()}",
 							'invalid-property-id',
 							0, // default argument
-							[ self::PARAM_CONSTRAINT_ID => $constraintId ]
+							[self::PARAM_CONSTRAINT_ID => $constraintId]
 						);
 					}
 					return $constraintId;
-				} catch ( StatementGuidParsingException $e ) {
+				} catch (StatementGuidParsingException $e) {
 					$this->apiErrorReporter->dieError(
 						"Invalid statement GUID: $constraintId",
 						'invalid-guid',
 						0, // default argument
-						[ self::PARAM_CONSTRAINT_ID => $constraintId ]
+						[self::PARAM_CONSTRAINT_ID => $constraintId]
 					);
 				}
 			},
@@ -187,12 +187,12 @@ 
 	 * @param PropertyId[] $propertyIds
 	 * @param ApiResult $result
 	 */
-	private function checkPropertyIds( array $propertyIds, ApiResult $result ) {
-		foreach ( $propertyIds as $propertyId ) {
-			$result->addArrayType( $this->getResultPathForPropertyId( $propertyId ), 'assoc' );
-			$allConstraintExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnPropertyId( $propertyId );
-			foreach ( $allConstraintExceptions as $constraintId => $constraintParameterExceptions ) {
-				$this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result );
+	private function checkPropertyIds(array $propertyIds, ApiResult $result) {
+		foreach ($propertyIds as $propertyId) {
+			$result->addArrayType($this->getResultPathForPropertyId($propertyId), 'assoc');
+			$allConstraintExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnPropertyId($propertyId);
+			foreach ($allConstraintExceptions as $constraintId => $constraintParameterExceptions) {
+				$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
 			}
 		}
 	}
@@ -201,14 +201,14 @@ 
 	 * @param string[] $constraintIds
 	 * @param ApiResult $result
 	 */
-	private function checkConstraintIds( array $constraintIds, ApiResult $result ) {
-		foreach ( $constraintIds as $constraintId ) {
-			if ( $result->getResultData( $this->getResultPathForConstraintId( $constraintId ) ) ) {
+	private function checkConstraintIds(array $constraintIds, ApiResult $result) {
+		foreach ($constraintIds as $constraintId) {
+			if ($result->getResultData($this->getResultPathForConstraintId($constraintId))) {
 				// already checked as part of checkPropertyIds()
 				continue;
 			}
-			$constraintParameterExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnConstraintId( $constraintId );
-			$this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result );
+			$constraintParameterExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnConstraintId($constraintId);
+			$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
 		}
 	}
 
@@ -216,17 +216,17 @@ 
 	 * @param PropertyId $propertyId
 	 * @return string[]
 	 */
-	private function getResultPathForPropertyId( PropertyId $propertyId ) {
-		return [ $this->getModuleName(), $propertyId->getSerialization() ];
+	private function getResultPathForPropertyId(PropertyId $propertyId) {
+		return [$this->getModuleName(), $propertyId->getSerialization()];
 	}
 
 	/**
 	 * @param string $constraintId
 	 * @return string[]
 	 */
-	private function getResultPathForConstraintId( $constraintId ) {
-		$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
-		return array_merge( $this->getResultPathForPropertyId( $propertyId ), [ $constraintId ] );
+	private function getResultPathForConstraintId($constraintId) {
+		$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
+		return array_merge($this->getResultPathForPropertyId($propertyId), [$constraintId]);
 	}
 
 	/**
@@ -236,9 +236,9 @@ 
 	 * @param ConstraintParameterException[]|null $constraintParameterExceptions
 	 * @param ApiResult $result
 	 */
-	private function addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, ApiResult $result ) {
-		$path = $this->getResultPathForConstraintId( $constraintId );
-		if ( $constraintParameterExceptions === null ) {
+	private function addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, ApiResult $result) {
+		$path = $this->getResultPathForConstraintId($constraintId);
+		if ($constraintParameterExceptions === null) {
 			$result->addValue(
 				$path,
 				self::KEY_STATUS,
@@ -248,12 +248,12 @@ 
 			$result->addValue(
 				$path,
 				self::KEY_STATUS,
-				empty( $constraintParameterExceptions ) ? self::STATUS_OKAY : self::STATUS_NOT_OKAY
+				empty($constraintParameterExceptions) ? self::STATUS_OKAY : self::STATUS_NOT_OKAY
 			);
 			$result->addValue(
 				$path,
 				self::KEY_PROBLEMS,
-				array_map( [ $this, 'formatConstraintParameterException' ], $constraintParameterExceptions )
+				array_map([$this, 'formatConstraintParameterException'], $constraintParameterExceptions)
 			);
 		}
 	}
@@ -264,7 +264,7 @@ 
 	 * @param ConstraintParameterException $e
 	 * @return array
 	 */
-	private function formatConstraintParameterException( ConstraintParameterException $e ) {
+	private function formatConstraintParameterException(ConstraintParameterException $e) {
 		return [
 			self::KEY_MESSAGE_HTML => $e->getMessage(),
 		];

src/ConstraintLookup.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 	 *
 	 * @return Constraint[]
 	 */
-	public function queryConstraintsForProperty( PropertyId $propertyId );
+	public function queryConstraintsForProperty(PropertyId $propertyId);
 
 }

src/UpdateConstraintsTableJob.php

Spacing +17 added lines, -17 removed lines

@@ -26,8 +26,8 @@ 
 
 	const BATCH_SIZE = 10;
 
-	public static function newFromGlobalState( Title $title, array $params ) {
-		Assert::parameterType( 'string', $params['propertyId'], '$params["propertyId"]' );
+	public static function newFromGlobalState(Title $title, array $params) {
+		Assert::parameterType('string', $params['propertyId'], '$params["propertyId"]');
 		$repo = WikibaseRepo::getDefaultInstance();
 		return new UpdateConstraintsTableJob(
 			$title,
@@ -83,7 +83,7 @@ 
 		EntityLookup $entityLookup,
 		Serializer $snakSerializer
 	) {
-		parent::__construct( 'constraintsTableUpdate', $title, $params );
+		parent::__construct('constraintsTableUpdate', $title, $params);
 
 		$this->propertyId = $propertyId;
 		$this->config = $config;
@@ -92,11 +92,11 @@ 
 		$this->snakSerializer = $snakSerializer;
 	}
 
-	public function extractParametersFromQualifiers( SnakList $qualifiers ) {
+	public function extractParametersFromQualifiers(SnakList $qualifiers) {
 		$parameters = [];
-		foreach ( $qualifiers as $qualifier ) {
+		foreach ($qualifiers as $qualifier) {
 			$qualifierId = $qualifier->getPropertyId()->getSerialization();
-			$paramSerialization = $this->snakSerializer->serialize( $qualifier );
+			$paramSerialization = $this->snakSerializer->serialize($qualifier);
 			$parameters[$qualifierId][] = $paramSerialization;
 		}
 		return $parameters;
@@ -108,7 +108,7 @@ 
 	) {
 		$constraintId = $constraintStatement->getGuid();
 		$constraintTypeQid = $constraintStatement->getMainSnak()->getDataValue()->getEntityId()->getSerialization();
-		$parameters = $this->extractParametersFromQualifiers( $constraintStatement->getQualifiers() );
+		$parameters = $this->extractParametersFromQualifiers($constraintStatement->getQualifiers());
 		return new Constraint(
 			$constraintId,
 			$propertyId,
@@ -122,16 +122,16 @@ 
 		ConstraintRepository $constraintRepo,
 		PropertyId $propertyConstraintPropertyId
 	) {
-		$constraintsStatements = $property->getStatements()->getByPropertyId( $propertyConstraintPropertyId );
+		$constraintsStatements = $property->getStatements()->getByPropertyId($propertyConstraintPropertyId);
 		$constraints = [];
-		foreach ( $constraintsStatements->getIterator() as $constraintStatement ) {
-			$constraints[] = $this->extractConstraintFromStatement( $property->getId(), $constraintStatement );
-			if ( count( $constraints ) >= self::BATCH_SIZE ) {
-				$constraintRepo->insertBatch( $constraints );
+		foreach ($constraintsStatements->getIterator() as $constraintStatement) {
+			$constraints[] = $this->extractConstraintFromStatement($property->getId(), $constraintStatement);
+			if (count($constraints) >= self::BATCH_SIZE) {
+				$constraintRepo->insertBatch($constraints);
 				$constraints = [];
 			}
 		}
-		$constraintRepo->insertBatch( $constraints );
+		$constraintRepo->insertBatch($constraints);
 	}
 
 	/**
@@ -142,14 +142,14 @@ 
 	public function run() {
 		// TODO in the future: only touch constraints affected by the edit (requires T163465)
 
-		$propertyId = new PropertyId( $this->propertyId );
-		$this->constraintRepo->deleteForPropertyWhereConstraintIdIsStatementId( $propertyId );
+		$propertyId = new PropertyId($this->propertyId);
+		$this->constraintRepo->deleteForPropertyWhereConstraintIdIsStatementId($propertyId);
 
-		$property = $this->entityLookup->getEntity( $propertyId );
+		$property = $this->entityLookup->getEntity($propertyId);
 		$this->importConstraintsForProperty(
 			$property,
 			$this->constraintRepo,
-			new PropertyId( $this->config->get( 'WBQualityConstraintsPropertyConstraintId' ) )
+			new PropertyId($this->config->get('WBQualityConstraintsPropertyConstraintId'))
 		);
 
 		return true;

src/ConstraintRepository.php

Spacing +42 added lines, -42 removed lines

@@ -20,23 +20,23 @@ 
 	 *
 	 * @return Constraint[]
 	 */
-	public function queryConstraintsForProperty( PropertyId $propertyId ) {
-		$db = wfGetDB( DB_REPLICA );
+	public function queryConstraintsForProperty(PropertyId $propertyId) {
+		$db = wfGetDB(DB_REPLICA);
 
 		$results = $db->select(
 			'wbqc_constraints',
 			'*',
-			[ 'pid' => $propertyId->getNumericId() ]
+			['pid' => $propertyId->getNumericId()]
 		);
 
-		return $this->convertToConstraints( $results );
+		return $this->convertToConstraints($results);
 	}
 
-	private function encodeConstraintParameters( array $constraintParameters ) {
-		$json = json_encode( $constraintParameters, JSON_FORCE_OBJECT );
+	private function encodeConstraintParameters(array $constraintParameters) {
+		$json = json_encode($constraintParameters, JSON_FORCE_OBJECT);
 
-		if ( strlen( $json ) > 50000 ) {
-			$json = json_encode( [ '@error' => [ 'toolong' => true ] ] );
+		if (strlen($json) > 50000) {
+			$json = json_encode(['@error' => ['toolong' => true]]);
 		}
 
 		return $json;
@@ -48,21 +48,21 @@ 
 	 * @throws DBUnexpectedError
 	 * @return bool
 	 */
-	public function insertBatch( array $constraints ) {
+	public function insertBatch(array $constraints) {
 		$accumulator = array_map(
-			function ( Constraint $constraint ) {
+			function(Constraint $constraint) {
 				return [
 					'constraint_guid' => $constraint->getConstraintId(),
 					'pid' => $constraint->getPropertyId()->getNumericId(),
 					'constraint_type_qid' => $constraint->getConstraintTypeItemId(),
-					'constraint_parameters' => $this->encodeConstraintParameters( $constraint->getConstraintParameters() )
+					'constraint_parameters' => $this->encodeConstraintParameters($constraint->getConstraintParameters())
 				];
 			},
 			$constraints
 		);
 
-		$db = wfGetDB( DB_MASTER );
-		return $db->insert( 'wbqc_constraints', $accumulator );
+		$db = wfGetDB(DB_MASTER);
+		return $db->insert('wbqc_constraints', $accumulator);
 	}
 
 	/**
@@ -70,13 +70,13 @@ 
 	 *
 	 * @return array
 	 */
-	private function uuidPattern( LikeMatch $any ) {
+	private function uuidPattern(LikeMatch $any) {
 		return array_merge(
-			array_fill( 0, 8, $any ), [ '-' ],
-			array_fill( 0, 4, $any ), [ '-' ],
-			array_fill( 0, 4, $any ), [ '-' ],
-			array_fill( 0, 4, $any ), [ '-' ],
-			array_fill( 0, 12, $any )
+			array_fill(0, 8, $any), ['-'],
+			array_fill(0, 4, $any), ['-'],
+			array_fill(0, 4, $any), ['-'],
+			array_fill(0, 4, $any), ['-'],
+			array_fill(0, 12, $any)
 		);
 	}
 
@@ -87,11 +87,11 @@ 
 	 * @throws DBUnexpectedError
 	 */
 	public function deleteWhereConstraintIdIsUuid() {
-		$db = wfGetDB( DB_MASTER );
+		$db = wfGetDB(DB_MASTER);
 		$db->delete(
 			'wbqc_constraints',
 			// WHERE constraint_guid LIKE ________-____-____-____-____________
-			'constraint_guid ' . $db->buildLike( $this->uuidPattern( $db->anyChar() ) )
+			'constraint_guid '.$db->buildLike($this->uuidPattern($db->anyChar()))
 		);
 	}
 
@@ -101,14 +101,14 @@ 
 	 *
 	 * @throws DBUnexpectedError
 	 */
-	public function deleteForPropertyWhereConstraintIdIsStatementId( PropertyId $propertyId ) {
-		$db = wfGetDB( DB_MASTER );
+	public function deleteForPropertyWhereConstraintIdIsStatementId(PropertyId $propertyId) {
+		$db = wfGetDB(DB_MASTER);
 		$db->delete(
 			'wbqc_constraints',
 			[
 				'pid' => $propertyId->getNumericId(),
 				// AND constraint_guid LIKE %$________-____-____-____-____________
-				'constraint_guid ' . $db->buildLike( array_merge( [ $db->anyString(), '$' ], $this->uuidPattern( $db->anyChar() ) ) )
+				'constraint_guid '.$db->buildLike(array_merge([$db->anyString(), '$'], $this->uuidPattern($db->anyChar())))
 			]
 		);
 	}
@@ -119,20 +119,20 @@ 
 	 * @throws InvalidArgumentException
 	 * @throws DBUnexpectedError
 	 */
-	public function deleteAll( $batchSize = 1000 ) {
-		if ( !is_int( $batchSize ) ) {
+	public function deleteAll($batchSize = 1000) {
+		if (!is_int($batchSize)) {
 			throw new InvalidArgumentException();
 		}
-		$db = wfGetDB( DB_MASTER );
-		if ( $db->getType() === 'sqlite' ) {
-			$db->delete( 'wbqc_constraints', '*' );
+		$db = wfGetDB(DB_MASTER);
+		if ($db->getType() === 'sqlite') {
+			$db->delete('wbqc_constraints', '*');
 		} else {
 			do {
-				$db->commit( __METHOD__, 'flush' );
+				$db->commit(__METHOD__, 'flush');
 				wfGetLBFactory()->waitForReplication();
-				$table = $db->tableName( 'wbqc_constraints' );
-				$db->query( sprintf( 'DELETE FROM %s LIMIT %d', $table, $batchSize ) );
-			} while ( $db->affectedRows() > 0 );
+				$table = $db->tableName('wbqc_constraints');
+				$db->query(sprintf('DELETE FROM %s LIMIT %d', $table, $batchSize));
+			} while ($db->affectedRows() > 0);
 		}
 	}
 
@@ -141,26 +141,26 @@ 
 	 *
 	 * @return Constraint[]
 	 */
-	private function convertToConstraints( ResultWrapper $results ) {
+	private function convertToConstraints(ResultWrapper $results) {
 		$constraints = [];
-		foreach ( $results as $result ) {
+		foreach ($results as $result) {
 			$constraintTypeItemId = $result->constraint_type_qid;
-			$constraintParameters = json_decode( $result->constraint_parameters, true );
+			$constraintParameters = json_decode($result->constraint_parameters, true);
 
-			if ( $constraintParameters === null ) {
+			if ($constraintParameters === null) {
 				// T171295
-				LoggerFactory::getInstance( 'WikibaseQualityConstraints' )
-					->warning( 'Constraint {constraintId} has invalid constraint parameters.', [
+				LoggerFactory::getInstance('WikibaseQualityConstraints')
+					->warning('Constraint {constraintId} has invalid constraint parameters.', [
 						'method' => __METHOD__,
 						'constraintId' => $result->constraint_guid,
 						'constraintParameters' => $result->constraint_parameters,
-					] );
-				$constraintParameters = [ '@error' => [ /* unknown */ ] ];
+					]);
+				$constraintParameters = ['@error' => [/* unknown */]];
 			}
 
 			$constraints[] = new Constraint(
 				$result->constraint_guid,
-				PropertyId::newFromNumber( $result->pid ),
+				PropertyId::newFromNumber($result->pid),
 				$constraintTypeItemId,
 				$constraintParameters
 			);

src/WikibaseQualityConstraintsHooks.php

Spacing +13 added lines, -13 removed lines

@@ -25,36 +25,36 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function onCreateSchema( DatabaseUpdater $updater ) {
-		$updater->addExtensionTable( 'wbqc_constraints', __DIR__ . '/../sql/create_wbqc_constraints.sql' );
+	public static function onCreateSchema(DatabaseUpdater $updater) {
+		$updater->addExtensionTable('wbqc_constraints', __DIR__.'/../sql/create_wbqc_constraints.sql');
 		return true;
 	}
 
-	public static function onWikibaseChange( Change $change ) {
+	public static function onWikibaseChange(Change $change) {
 		$config = MediaWikiServices::getInstance()->getMainConfig();
-		if ( $config->get( 'WBQualityConstraintsEnableConstraintsImportFromStatements' ) &&
-			self::isConstraintStatementsChange( $config, $change )
+		if ($config->get('WBQualityConstraintsEnableConstraintsImportFromStatements') &&
+			self::isConstraintStatementsChange($config, $change)
 		) {
 			/** @var EntityChange $change */
 			$title = Title::newMainPage();
-			$params = [ 'propertyId' => $change->getEntityId()->getSerialization() ];
+			$params = ['propertyId' => $change->getEntityId()->getSerialization()];
 			JobQueueGroup::singleton()->push(
-				new JobSpecification( 'constraintsTableUpdate', $params, [], $title )
+				new JobSpecification('constraintsTableUpdate', $params, [], $title)
 			);
 		}
 	}
 
-	public static function isConstraintStatementsChange( Config $config, Change $change ) {
-		if ( !( $change instanceof EntityChange ) ||
+	public static function isConstraintStatementsChange(Config $config, Change $change) {
+		if (!($change instanceof EntityChange) ||
 			 $change->getAction() !== EntityChange::UPDATE ||
-			 !( $change->getEntityId() instanceof PropertyId )
+			 !($change->getEntityId() instanceof PropertyId)
 		) {
 			return false;
 		}
 
 		$info = $change->getInfo();
 
-		if ( !array_key_exists( 'compactDiff', $info ) ) {
+		if (!array_key_exists('compactDiff', $info)) {
 			// the non-compact diff ($info['diff']) does not contain statement diffs (T110996),
 			// so we only know that the change *might* affect the constraint statements
 			return true;
@@ -63,8 +63,8 @@ 
 		/** @var EntityDiffChangedAspects $aspects */
 		$aspects = $info['compactDiff'];
 
-		$propertyConstraintId = $config->get( 'WBQualityConstraintsPropertyConstraintId' );
-		return in_array( $propertyConstraintId, $aspects->getStatementChanges() );
+		$propertyConstraintId = $config->get('WBQualityConstraintsPropertyConstraintId');
+		return in_array($propertyConstraintId, $aspects->getStatementChanges());
 	}
 
 }

src/Specials/SpecialConstraintReport.php

Spacing +110 added lines, -110 removed lines

@@ -131,7 +131,7 @@ 
 		DelegatingConstraintChecker $constraintChecker,
 		Config $config
 	) {
-		parent::__construct( 'ConstraintReport' );
+		parent::__construct('ConstraintReport');
 
 		$this->entityLookup = $entityLookup;
 		$this->entityTitleLookup = $entityTitleLookup;
@@ -140,13 +140,13 @@ 
 		$language = $this->getLanguage();
 
 		$formatterOptions = new FormatterOptions();
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
 		$this->dataValueFormatter = $valueFormatterFactory->getValueFormatter(
 			SnakFormatter::FORMAT_HTML,
 			$formatterOptions
 		);
 
-		$labelLookup = $fallbackLabelDescLookupFactory->newLabelDescriptionLookup( $language );
+		$labelLookup = $fallbackLabelDescLookupFactory->newLabelDescriptionLookup($language);
 
 		$this->entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter(
 			$labelLookup
@@ -158,7 +158,7 @@ 
 
 		$this->constraintChecker = $constraintChecker;
 
-		$this->constraintParameterRenderer = new ConstraintParameterRenderer( $this->entityIdLabelFormatter, $this->dataValueFormatter );
+		$this->constraintParameterRenderer = new ConstraintParameterRenderer($this->entityIdLabelFormatter, $this->dataValueFormatter);
 
 		$this->config = $config;
 	}
@@ -169,7 +169,7 @@ 
 	 * @return array
 	 */
 	private function getModules() {
-		return [ 'SpecialConstraintReportPage' ];
+		return ['SpecialConstraintReportPage'];
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function getDescription() {
-		return $this->msg( 'wbqc-constraintreport' )->escaped();
+		return $this->msg('wbqc-constraintreport')->escaped();
 	}
 
 	/**
@@ -199,60 +199,60 @@ 
 	 * @throws EntityIdParsingException
 	 * @throws UnexpectedValueException
 	 */
-	public function execute( $subPage ) {
+	public function execute($subPage) {
 		$out = $this->getOutput();
 
-		$postRequest = $this->getContext()->getRequest()->getVal( 'entityid' );
-		if ( $postRequest ) {
-			$out->redirect( $this->getPageTitle( strtoupper( $postRequest ) )->getLocalURL() );
+		$postRequest = $this->getContext()->getRequest()->getVal('entityid');
+		if ($postRequest) {
+			$out->redirect($this->getPageTitle(strtoupper($postRequest))->getLocalURL());
 			return;
 		}
 
-		$out->addModules( $this->getModules() );
+		$out->addModules($this->getModules());
 
 		$this->setHeaders();
 
-		$out->addHTML( $this->getExplanationText() );
+		$out->addHTML($this->getExplanationText());
 		$this->buildEntityIdForm();
 
-		if ( !$subPage ) {
+		if (!$subPage) {
 			return;
 		}
 
-		if ( !is_string( $subPage ) ) {
-			throw new InvalidArgumentException( '$subPage must be string.' );
+		if (!is_string($subPage)) {
+			throw new InvalidArgumentException('$subPage must be string.');
 		}
 
 		try {
-			$entityId = $this->entityIdParser->parse( $subPage );
-		} catch ( EntityIdParsingException $e ) {
+			$entityId = $this->entityIdParser->parse($subPage);
+		} catch (EntityIdParsingException $e) {
 			$out->addHTML(
-				$this->buildNotice( 'wbqc-constraintreport-invalid-entity-id', true )
+				$this->buildNotice('wbqc-constraintreport-invalid-entity-id', true)
 			);
 			return;
 		}
 
-		if ( !$this->entityLookup->hasEntity( $entityId ) ) {
+		if (!$this->entityLookup->hasEntity($entityId)) {
 			$out->addHTML(
-				$this->buildNotice( 'wbqc-constraintreport-not-existent-entity', true )
+				$this->buildNotice('wbqc-constraintreport-not-existent-entity', true)
 			);
 			return;
 		}
 
 		MediaWikiServices::getInstance()->getStatsdDataFactory()
-			->increment( 'wikibase.quality.constraints.specials.specialConstraintReport.executeCheck' );
-		$results = $this->constraintChecker->checkAgainstConstraintsOnEntityId( $entityId );
+			->increment('wikibase.quality.constraints.specials.specialConstraintReport.executeCheck');
+		$results = $this->constraintChecker->checkAgainstConstraintsOnEntityId($entityId);
 
-		if ( count( $results ) > 0 ) {
+		if (count($results) > 0) {
 			$out->addHTML(
-				$this->buildResultHeader( $entityId )
-				. $this->buildSummary( $results )
-				. $this->buildResultTable( $entityId, $results )
+				$this->buildResultHeader($entityId)
+				. $this->buildSummary($results)
+				. $this->buildResultTable($entityId, $results)
 			);
 		} else {
 			$out->addHTML(
-				$this->buildResultHeader( $entityId )
-				. $this->buildNotice( 'wbqc-constraintreport-empty-result' )
+				$this->buildResultHeader($entityId)
+				. $this->buildNotice('wbqc-constraintreport-empty-result')
 			);
 		}
 	}
@@ -268,15 +268,15 @@ 
 				'name' => 'entityid',
 				'label-message' => 'wbqc-constraintreport-form-entityid-label',
 				'cssclass' => 'wbqc-constraintreport-form-entity-id',
-				'placeholder' => $this->msg( 'wbqc-constraintreport-form-entityid-placeholder' )->escaped()
+				'placeholder' => $this->msg('wbqc-constraintreport-form-entityid-placeholder')->escaped()
 			]
 		];
-		$htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext(), 'wbqc-constraintreport-form' );
-		$htmlForm->setSubmitText( $this->msg( 'wbqc-constraintreport-form-submit-label' )->escaped() );
-		$htmlForm->setSubmitCallback( function() {
+		$htmlForm = HTMLForm::factory('ooui', $formDescriptor, $this->getContext(), 'wbqc-constraintreport-form');
+		$htmlForm->setSubmitText($this->msg('wbqc-constraintreport-form-submit-label')->escaped());
+		$htmlForm->setSubmitCallback(function() {
 			return false;
 		} );
-		$htmlForm->setMethod( 'post' );
+		$htmlForm->setMethod('post');
 		$htmlForm->show();
 	}
 
@@ -290,16 +290,16 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildNotice( $messageKey, $error = false ) {
-		if ( !is_string( $messageKey ) ) {
-			throw new InvalidArgumentException( '$message must be string.' );
+	private function buildNotice($messageKey, $error = false) {
+		if (!is_string($messageKey)) {
+			throw new InvalidArgumentException('$message must be string.');
 		}
-		if ( !is_bool( $error ) ) {
-			throw new InvalidArgumentException( '$error must be bool.' );
+		if (!is_bool($error)) {
+			throw new InvalidArgumentException('$error must be bool.');
 		}
 
 		$cssClasses = 'wbqc-constraintreport-notice';
-		if ( $error ) {
+		if ($error) {
 			$cssClasses .= ' wbqc-constraintreport-notice-error';
 		}
 
@@ -308,7 +308,7 @@ 
 				[
 					'class' => $cssClasses
 				],
-				$this->msg( $messageKey )->escaped()
+				$this->msg($messageKey)->escaped()
 			);
 	}
 
@@ -318,16 +318,16 @@ 
 	private function getExplanationText() {
 		return Html::rawElement(
 			'div',
-			[ 'class' => 'wbqc-explanation' ],
+			['class' => 'wbqc-explanation'],
 			Html::rawElement(
 				'p',
 				[],
-				$this->msg( 'wbqc-constraintreport-explanation-part-one' )->escaped()
+				$this->msg('wbqc-constraintreport-explanation-part-one')->escaped()
 			)
 			. Html::rawElement(
 				'p',
 				[],
-				$this->msg( 'wbqc-constraintreport-explanation-part-two' )->escaped()
+				$this->msg('wbqc-constraintreport-explanation-part-two')->escaped()
 			)
 		);
 	}
@@ -338,69 +338,69 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildResultTable( EntityId $entityId, array $results ) {
+	private function buildResultTable(EntityId $entityId, array $results) {
 		// Set table headers
 		$table = new HtmlTableBuilder(
 			[
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-status' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-status')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-claim' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-claim')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-constraint' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-constraint')->escaped(),
 					true
 				)
 			]
 		);
 
-		foreach ( $results as $result ) {
-			$table = $this->appendToResultTable( $table, $entityId, $result );
+		foreach ($results as $result) {
+			$table = $this->appendToResultTable($table, $entityId, $result);
 		}
 
 		return $table->toHtml();
 	}
 
-	private function appendToResultTable( HtmlTableBuilder $table, EntityId $entityId, CheckResult $result ) {
+	private function appendToResultTable(HtmlTableBuilder $table, EntityId $entityId, CheckResult $result) {
 		// Status column
 		$statusColumn = $this->buildTooltipElement(
-			$this->formatStatus( $result->getStatus() ),
+			$this->formatStatus($result->getStatus()),
 			$result->getMessage(),
 			'[?]'
 		);
 
 		// Claim column
-		$property = $this->entityIdLabelFormatter->formatEntityId( $result->getContext()->getSnak()->getPropertyId() );
-		if ( $result->getSnakType() === 'value' ) {
-			$value = $this->constraintParameterRenderer->formatValue( $result->getDataValue() );
+		$property = $this->entityIdLabelFormatter->formatEntityId($result->getContext()->getSnak()->getPropertyId());
+		if ($result->getSnakType() === 'value') {
+			$value = $this->constraintParameterRenderer->formatValue($result->getDataValue());
 		} else {
-			$value = htmlspecialchars( $result->getSnakType() );
+			$value = htmlspecialchars($result->getSnakType());
 		}
 
 		$claimColumn = $this->getClaimLink(
 			$entityId,
 			$result->getContext()->getSnak()->getPropertyId(),
-			$property . ': ' . $value
+			$property.': '.$value
 		);
 
 		// Constraint column
 		$constraintTypeItemId = $result->getConstraint()->getConstraintTypeItemId();
 		try {
-			$constraintTypeLabel = $this->entityIdLabelFormatter->formatEntityId( new ItemId( $constraintTypeItemId ) );
-		} catch ( InvalidArgumentException $e ) {
-			$constraintTypeLabel = htmlspecialchars( $constraintTypeItemId );
+			$constraintTypeLabel = $this->entityIdLabelFormatter->formatEntityId(new ItemId($constraintTypeItemId));
+		} catch (InvalidArgumentException $e) {
+			$constraintTypeLabel = htmlspecialchars($constraintTypeItemId);
 		}
 		$constraintLink = $this->getClaimLink(
 			$result->getContext()->getSnak()->getPropertyId(),
-			new PropertyId( $this->config->get( 'WBQualityConstraintsPropertyConstraintId' ) ),
+			new PropertyId($this->config->get('WBQualityConstraintsPropertyConstraintId')),
 			$constraintTypeLabel
 		);
 		$constraintColumn = $this->buildExpandableElement(
 			$constraintLink,
-			$this->constraintParameterRenderer->formatParameters( $result->getParameters() ),
+			$this->constraintParameterRenderer->formatParameters($result->getParameters()),
 			'[...]'
 		);
 
@@ -435,15 +435,15 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildResultHeader( EntityId $entityId ) {
-		$entityLink = sprintf( '%s (%s)',
-							   $this->entityIdLinkFormatter->formatEntityId( $entityId ),
-							   htmlspecialchars( $entityId->getSerialization() ) );
+	protected function buildResultHeader(EntityId $entityId) {
+		$entityLink = sprintf('%s (%s)',
+							   $this->entityIdLinkFormatter->formatEntityId($entityId),
+							   htmlspecialchars($entityId->getSerialization()));
 
 		return Html::rawElement(
 			'h3',
 			[],
-			sprintf( '%s %s', $this->msg( 'wbqc-constraintreport-result-headline' )->escaped(), $entityLink )
+			sprintf('%s %s', $this->msg('wbqc-constraintreport-result-headline')->escaped(), $entityLink)
 		);
 	}
 
@@ -454,24 +454,24 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildSummary( array $results ) {
+	protected function buildSummary(array $results) {
 		$statuses = [];
-		foreach ( $results as $result ) {
-			$status = strtolower( $result->getStatus() );
-			$statuses[$status] = isset( $statuses[$status] ) ? $statuses[$status] + 1 : 1;
+		foreach ($results as $result) {
+			$status = strtolower($result->getStatus());
+			$statuses[$status] = isset($statuses[$status]) ? $statuses[$status] + 1 : 1;
 		}
 
 		$statusElements = [];
-		foreach ( $statuses as $status => $count ) {
-			if ( $count > 0 ) {
+		foreach ($statuses as $status => $count) {
+			if ($count > 0) {
 				$statusElements[] =
-					$this->formatStatus( $status )
+					$this->formatStatus($status)
 					. ': '
 					. $count;
 			}
 		}
 
-		return Html::rawElement( 'p', [], implode( ', ', $statusElements ) );
+		return Html::rawElement('p', [], implode(', ', $statusElements));
 	}
 
 	/**
@@ -486,15 +486,15 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildTooltipElement( $content, $tooltipContent, $indicator ) {
-		if ( !is_string( $content ) ) {
-			throw new InvalidArgumentException( '$content has to be string.' );
+	protected function buildTooltipElement($content, $tooltipContent, $indicator) {
+		if (!is_string($content)) {
+			throw new InvalidArgumentException('$content has to be string.');
 		}
-		if ( $tooltipContent && ( !is_string( $tooltipContent ) ) ) {
-			throw new InvalidArgumentException( '$tooltipContent, if provided, has to be string.' );
+		if ($tooltipContent && (!is_string($tooltipContent))) {
+			throw new InvalidArgumentException('$tooltipContent, if provided, has to be string.');
 		}
 
-		if ( empty( $tooltipContent ) ) {
+		if (empty($tooltipContent)) {
 			return $content;
 		}
 
@@ -511,13 +511,13 @@ 
 			[
 				'class' => 'wbqc-indicator'
 			],
-			htmlspecialchars( $indicator ) . $tooltip
+			htmlspecialchars($indicator).$tooltip
 		);
 
 		return Html::rawElement(
 			'span',
 			[],
-			sprintf( '%s %s', $content, $tooltipIndicator )
+			sprintf('%s %s', $content, $tooltipIndicator)
 		);
 	}
 
@@ -533,15 +533,15 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildExpandableElement( $content, $expandableContent, $indicator ) {
-		if ( !is_string( $content ) ) {
-			throw new InvalidArgumentException( '$content has to be string.' );
+	protected function buildExpandableElement($content, $expandableContent, $indicator) {
+		if (!is_string($content)) {
+			throw new InvalidArgumentException('$content has to be string.');
 		}
-		if ( $expandableContent && ( !is_string( $expandableContent ) ) ) {
-			throw new InvalidArgumentException( '$tooltipContent, if provided, has to be string.' );
+		if ($expandableContent && (!is_string($expandableContent))) {
+			throw new InvalidArgumentException('$tooltipContent, if provided, has to be string.');
 		}
 
-		if ( empty( $expandableContent ) ) {
+		if (empty($expandableContent)) {
 			return $content;
 		}
 
@@ -562,7 +562,7 @@ 
 		);
 
 		return
-			sprintf( '%s %s %s', $content, $tooltipIndicator, $expandableContent );
+			sprintf('%s %s %s', $content, $tooltipIndicator, $expandableContent);
 	}
 
 	/**
@@ -574,16 +574,16 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function formatStatus( $status ) {
-		$messageName = "wbqc-constraintreport-status-" . strtolower( $status );
+	private function formatStatus($status) {
+		$messageName = "wbqc-constraintreport-status-".strtolower($status);
 
 		$formattedStatus =
 			Html::element(
 				'span',
 				[
-					'class' => 'wbqc-status wbqc-status-' . $status
+					'class' => 'wbqc-status wbqc-status-'.$status
 				],
-				$this->msg( $messageName )->text()
+				$this->msg($messageName)->text()
 			);
 
 		return $formattedStatus;
@@ -599,26 +599,26 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function formatDataValues( $dataValues, $separator = ', ' ) {
-		if ( $dataValues instanceof DataValue ) {
-			$dataValues = [ $dataValues ];
-		} elseif ( !is_array( $dataValues ) ) {
-			throw new InvalidArgumentException( '$dataValues has to be instance of DataValue or an array of DataValues.' );
+	protected function formatDataValues($dataValues, $separator = ', ') {
+		if ($dataValues instanceof DataValue) {
+			$dataValues = [$dataValues];
+		} elseif (!is_array($dataValues)) {
+			throw new InvalidArgumentException('$dataValues has to be instance of DataValue or an array of DataValues.');
 		}
 
 		$formattedDataValues = [];
-		foreach ( $dataValues as $dataValue ) {
-			if ( !( $dataValue instanceof DataValue ) ) {
-				throw new InvalidArgumentException( '$dataValues has to be instance of DataValue or an array of DataValues.' );
+		foreach ($dataValues as $dataValue) {
+			if (!($dataValue instanceof DataValue)) {
+				throw new InvalidArgumentException('$dataValues has to be instance of DataValue or an array of DataValues.');
 			}
-			if ( $dataValue instanceof EntityIdValue ) {
-				$formattedDataValues[ ] = $this->entityIdLabelFormatter->formatEntityId( $dataValue->getEntityId() );
+			if ($dataValue instanceof EntityIdValue) {
+				$formattedDataValues[] = $this->entityIdLabelFormatter->formatEntityId($dataValue->getEntityId());
 			} else {
-				$formattedDataValues[ ] = $this->dataValueFormatter->format( $dataValue );
+				$formattedDataValues[] = $this->dataValueFormatter->format($dataValue);
 			}
 		}
 
-		return implode( $separator, $formattedDataValues );
+		return implode($separator, $formattedDataValues);
 	}
 
 	/**
@@ -630,12 +630,12 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function getClaimLink( EntityId $entityId, PropertyId $propertyId, $text ) {
+	private function getClaimLink(EntityId $entityId, PropertyId $propertyId, $text) {
 		return
 			Html::rawElement(
 				'a',
 				[
-					'href' => $this->getClaimUrl( $entityId, $propertyId ),
+					'href' => $this->getClaimUrl($entityId, $propertyId),
 					'target' => '_blank'
 				],
 				$text
@@ -650,9 +650,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function getClaimUrl( EntityId $entityId, PropertyId $propertyId ) {
-		$title = $this->entityTitleLookup->getTitleForId( $entityId );
-		$entityUrl = sprintf( '%s#%s', $title->getLocalURL(), $propertyId->getSerialization() );
+	private function getClaimUrl(EntityId $entityId, PropertyId $propertyId) {
+		$title = $this->entityTitleLookup->getTitleForId($entityId);
+		$entityUrl = sprintf('%s#%s', $title->getLocalURL(), $propertyId->getSerialization());
 
 		return $entityUrl;
 	}