wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/ConstraintCheck/DelegatingConstraintChecker.php

Spacing +140 added lines, -140 removed lines

@@ -144,20 +144,20 @@ 
 		callable $defaultResultsPerEntity = null
 	) {
 		$checkResults = [];
-		$entity = $this->entityLookup->getEntity( $entityId );
+		$entity = $this->entityLookup->getEntity($entityId);
 
-		if ( $entity instanceof StatementListProvider ) {
-			$startTime = microtime( true );
+		if ($entity instanceof StatementListProvider) {
+			$startTime = microtime(true);
 
 			$checkResults = $this->checkEveryStatement(
-				$this->entityLookup->getEntity( $entityId ),
+				$this->entityLookup->getEntity($entityId),
 				$constraintIds,
 				$defaultResultsPerContext
 			);
 
-			$endTime = microtime( true );
+			$endTime = microtime(true);
 
-			if ( $constraintIds === null ) { // only log full constraint checks
+			if ($constraintIds === null) { // only log full constraint checks
 				$this->loggingHelper->logConstraintCheckOnEntity(
 					$entityId,
 					$checkResults,
@@ -167,11 +167,11 @@ 
 			}
 		}
 
-		if ( $defaultResultsPerEntity !== null ) {
-			$checkResults = array_merge( $defaultResultsPerEntity( $entityId ), $checkResults );
+		if ($defaultResultsPerEntity !== null) {
+			$checkResults = array_merge($defaultResultsPerEntity($entityId), $checkResults);
 		}
 
-		return $this->sortResult( $checkResults );
+		return $this->sortResult($checkResults);
 	}
 
 	/**
@@ -193,19 +193,19 @@ 
 		callable $defaultResults = null
 	) {
 
-		$parsedGuid = $this->statementGuidParser->parse( $guid );
+		$parsedGuid = $this->statementGuidParser->parse($guid);
 		$entityId = $parsedGuid->getEntityId();
-		$entity = $this->entityLookup->getEntity( $entityId );
-		if ( $entity instanceof StatementListProvider ) {
-			$statement = $entity->getStatements()->getFirstStatementWithGuid( $guid );
-			if ( $statement ) {
+		$entity = $this->entityLookup->getEntity($entityId);
+		if ($entity instanceof StatementListProvider) {
+			$statement = $entity->getStatements()->getFirstStatementWithGuid($guid);
+			if ($statement) {
 				$result = $this->checkStatement(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResults
 				);
-				$output = $this->sortResult( $result );
+				$output = $this->sortResult($result);
 				return $output;
 			}
 		}
@@ -213,8 +213,8 @@ 
 		return [];
 	}
 
-	private function getAllowedContextTypes( Constraint $constraint ) {
-		if ( !array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+	private function getAllowedContextTypes(Constraint $constraint) {
+		if (!array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 			return [
 				Context::TYPE_STATEMENT,
 				Context::TYPE_QUALIFIER,
@@ -222,12 +222,12 @@ 
 			];
 		}
 
-		return array_keys( array_filter(
+		return array_keys(array_filter(
 			$this->checkerMap[$constraint->getConstraintTypeItemId()]->getSupportedContextTypes(),
-			function ( $resultStatus ) {
+			function($resultStatus) {
 				return $resultStatus !== CheckResult::STATUS_NOT_IN_SCOPE;
 			}
-		) );
+		));
 	}
 
 	/**
@@ -238,32 +238,32 @@ 
 	 *
 	 * @return ConstraintParameterException[]
 	 */
-	private function checkCommonConstraintParameters( Constraint $constraint ) {
+	private function checkCommonConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		try {
-			$this->constraintParameterParser->checkError( $constraintParameters );
-		} catch ( ConstraintParameterException $e ) {
-			return [ $e ];
+			$this->constraintParameterParser->checkError($constraintParameters);
+		} catch (ConstraintParameterException $e) {
+			return [$e];
 		}
 
 		$problems = [];
 		try {
-			$this->constraintParameterParser->parseExceptionParameter( $constraintParameters );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseExceptionParameter($constraintParameters);
+		} catch (ConstraintParameterException $e) {
 			$problems[] = $e;
 		}
 		try {
-			$this->constraintParameterParser->parseConstraintStatusParameter( $constraintParameters );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseConstraintStatusParameter($constraintParameters);
+		} catch (ConstraintParameterException $e) {
 			$problems[] = $e;
 		}
 		try {
 			$this->constraintParameterParser->parseConstraintScopeParameter(
 				$constraintParameters,
 				$constraint->getConstraintTypeItemId(),
-				$this->getAllowedContextTypes( $constraint )
+				$this->getAllowedContextTypes($constraint)
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$problems[] = $e;
 		}
 		return $problems;
@@ -276,16 +276,16 @@ 
 	 * @return ConstraintParameterException[][] first level indexed by constraint ID,
 	 * second level like checkConstraintParametersOnConstraintId (but without possibility of null)
 	 */
-	public function checkConstraintParametersOnPropertyId( PropertyId $propertyId ) {
-		$constraints = $this->constraintLookup->queryConstraintsForProperty( $propertyId );
+	public function checkConstraintParametersOnPropertyId(PropertyId $propertyId) {
+		$constraints = $this->constraintLookup->queryConstraintsForProperty($propertyId);
 		$result = [];
 
-		foreach ( $constraints as $constraint ) {
-			$problems = $this->checkCommonConstraintParameters( $constraint );
+		foreach ($constraints as $constraint) {
+			$problems = $this->checkCommonConstraintParameters($constraint);
 
-			if ( array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+			if (array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 				$checker = $this->checkerMap[$constraint->getConstraintTypeItemId()];
-				$problems = array_merge( $problems, $checker->checkConstraintParameters( $constraint ) );
+				$problems = array_merge($problems, $checker->checkConstraintParameters($constraint));
 			}
 
 			$result[$constraint->getConstraintId()] = $problems;
@@ -302,17 +302,17 @@ 
 	 * @return ConstraintParameterException[]|null list of constraint parameter exceptions
 	 * (empty means all parameters okay), or null if constraint is not found
 	 */
-	public function checkConstraintParametersOnConstraintId( $constraintId ) {
-		$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
-		$constraints = $this->constraintLookup->queryConstraintsForProperty( $propertyId );
+	public function checkConstraintParametersOnConstraintId($constraintId) {
+		$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
+		$constraints = $this->constraintLookup->queryConstraintsForProperty($propertyId);
 
-		foreach ( $constraints as $constraint ) {
-			if ( $constraint->getConstraintId() === $constraintId ) {
-				$problems = $this->checkCommonConstraintParameters( $constraint );
+		foreach ($constraints as $constraint) {
+			if ($constraint->getConstraintId() === $constraintId) {
+				$problems = $this->checkCommonConstraintParameters($constraint);
 
-				if ( array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+				if (array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 					$checker = $this->checkerMap[$constraint->getConstraintTypeItemId()];
-					$problems = array_merge( $problems, $checker->checkConstraintParameters( $constraint ) );
+					$problems = array_merge($problems, $checker->checkConstraintParameters($constraint));
 				}
 
 				return $problems;
@@ -337,14 +337,14 @@ 
 		$result = [];
 
 		/** @var Statement $statement */
-		foreach ( $entity->getStatements() as $statement ) {
-			$result = array_merge( $result,
+		foreach ($entity->getStatements() as $statement) {
+			$result = array_merge($result,
 				$this->checkStatement(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResultsPerContext
-				) );
+				));
 		}
 
 		return $result;
@@ -366,32 +366,32 @@ 
 	) {
 		$result = [];
 
-		$result = array_merge( $result,
+		$result = array_merge($result,
 			$this->checkConstraintsForMainSnak(
 				$entity,
 				$statement,
 				$constraintIds,
 				$defaultResultsPerContext
-			) );
+			));
 
-		if ( $this->checkQualifiers ) {
-			$result = array_merge( $result,
+		if ($this->checkQualifiers) {
+			$result = array_merge($result,
 				$this->checkConstraintsForQualifiers(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResultsPerContext
-				) );
+				));
 		}
 
-		if ( $this->checkReferences ) {
-			$result = array_merge( $result,
+		if ($this->checkReferences) {
+			$result = array_merge($result,
 				$this->checkConstraintsForReferences(
 					$entity,
 					$statement,
 					$constraintIds,
 					$defaultResultsPerContext
-				) );
+				));
 		}
 
 		return $result;
@@ -406,12 +406,12 @@ 
 	 * @param string[]|null $constraintIds
 	 * @return Constraint[]
 	 */
-	private function getConstraintsToUse( PropertyId $propertyId, array $constraintIds = null ) {
-		$constraints = $this->constraintLookup->queryConstraintsForProperty( $propertyId );
-		if ( $constraintIds !== null ) {
+	private function getConstraintsToUse(PropertyId $propertyId, array $constraintIds = null) {
+		$constraints = $this->constraintLookup->queryConstraintsForProperty($propertyId);
+		if ($constraintIds !== null) {
 			$constraintsToUse = [];
-			foreach ( $constraints as $constraint ) {
-				if ( in_array( $constraint->getConstraintId(), $constraintIds ) ) {
+			foreach ($constraints as $constraint) {
+				if (in_array($constraint->getConstraintId(), $constraintIds)) {
 					$constraintsToUse[] = $constraint;
 				}
 			}
@@ -435,29 +435,29 @@ 
 		array $constraintIds = null,
 		callable $defaultResults = null
 	) {
-		$context = new MainSnakContext( $entity, $statement );
+		$context = new MainSnakContext($entity, $statement);
 		$constraints = $this->getConstraintsToUse(
 			$statement->getPropertyId(),
 			$constraintIds
 		);
-		$result = $defaultResults !== null ? $defaultResults( $context ) : [];
+		$result = $defaultResults !== null ? $defaultResults($context) : [];
 
-		foreach ( $constraints as $constraint ) {
+		foreach ($constraints as $constraint) {
 			$parameters = $constraint->getConstraintParameters();
 			try {
-				$exceptions = $this->constraintParameterParser->parseExceptionParameter( $parameters );
-			} catch ( ConstraintParameterException $e ) {
-				$result[] = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
+				$exceptions = $this->constraintParameterParser->parseExceptionParameter($parameters);
+			} catch (ConstraintParameterException $e) {
+				$result[] = new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
 				continue;
 			}
 
-			if ( in_array( $entity->getId(), $exceptions ) ) {
-				$message = new ViolationMessage( 'wbqc-violation-message-exception' );
-				$result[] = new CheckResult( $context, $constraint, [], CheckResult::STATUS_EXCEPTION, $message );
+			if (in_array($entity->getId(), $exceptions)) {
+				$message = new ViolationMessage('wbqc-violation-message-exception');
+				$result[] = new CheckResult($context, $constraint, [], CheckResult::STATUS_EXCEPTION, $message);
 				continue;
 			}
 
-			$result[] = $this->getCheckResultFor( $context, $constraint );
+			$result[] = $this->getCheckResultFor($context, $constraint);
 		}
 
 		return $result;
@@ -479,24 +479,24 @@ 
 	) {
 		$result = [];
 
-		if ( in_array(
+		if (in_array(
 			$statement->getPropertyId()->getSerialization(),
 			$this->propertiesWithViolatingQualifiers
-		) ) {
+		)) {
 			return $result;
 		}
 
-		foreach ( $statement->getQualifiers() as $qualifier ) {
-			$qualifierContext = new QualifierContext( $entity, $statement, $qualifier );
-			if ( $defaultResultsPerContext !== null ) {
-				$result = array_merge( $result, $defaultResultsPerContext( $qualifierContext ) );
+		foreach ($statement->getQualifiers() as $qualifier) {
+			$qualifierContext = new QualifierContext($entity, $statement, $qualifier);
+			if ($defaultResultsPerContext !== null) {
+				$result = array_merge($result, $defaultResultsPerContext($qualifierContext));
 			}
 			$qualifierConstraints = $this->getConstraintsToUse(
 				$qualifierContext->getSnak()->getPropertyId(),
 				$constraintIds
 			);
-			foreach ( $qualifierConstraints as $qualifierConstraint ) {
-				$result[] = $this->getCheckResultFor( $qualifierContext, $qualifierConstraint );
+			foreach ($qualifierConstraints as $qualifierConstraint) {
+				$result[] = $this->getCheckResultFor($qualifierContext, $qualifierConstraint);
 			}
 		}
 
@@ -520,19 +520,19 @@ 
 		$result = [];
 
 		/** @var Reference $reference */
-		foreach ( $statement->getReferences() as $reference ) {
-			foreach ( $reference->getSnaks() as $snak ) {
+		foreach ($statement->getReferences() as $reference) {
+			foreach ($reference->getSnaks() as $snak) {
 				$referenceContext = new ReferenceContext(
 					$entity, $statement, $reference, $snak
 				);
-				if ( $defaultResultsPerContext !== null ) {
-					$result = array_merge( $result, $defaultResultsPerContext( $referenceContext ) );
+				if ($defaultResultsPerContext !== null) {
+					$result = array_merge($result, $defaultResultsPerContext($referenceContext));
 				}
 				$referenceConstraints = $this->getConstraintsToUse(
 					$referenceContext->getSnak()->getPropertyId(),
 					$constraintIds
 				);
-				foreach ( $referenceConstraints as $referenceConstraint ) {
+				foreach ($referenceConstraints as $referenceConstraint) {
 					$result[] = $this->getCheckResultFor(
 						$referenceContext,
 						$referenceConstraint
@@ -551,65 +551,65 @@ 
 	 * @throws InvalidArgumentException
 	 * @return CheckResult
 	 */
-	private function getCheckResultFor( Context $context, Constraint $constraint ) {
-		if ( array_key_exists( $constraint->getConstraintTypeItemId(), $this->checkerMap ) ) {
+	private function getCheckResultFor(Context $context, Constraint $constraint) {
+		if (array_key_exists($constraint->getConstraintTypeItemId(), $this->checkerMap)) {
 			$checker = $this->checkerMap[$constraint->getConstraintTypeItemId()];
-			$result = $this->handleScope( $checker, $context, $constraint );
+			$result = $this->handleScope($checker, $context, $constraint);
 
-			if ( $result !== null ) {
-				$this->addMetadata( $context, $result );
+			if ($result !== null) {
+				$this->addMetadata($context, $result);
 				return $result;
 			}
 
-			$startTime = microtime( true );
+			$startTime = microtime(true);
 			try {
-				$result = $checker->checkConstraint( $context, $constraint );
-			} catch ( ConstraintParameterException $e ) {
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
-			} catch ( SparqlHelperException $e ) {
-				$message = new ViolationMessage( 'wbqc-violation-message-sparql-error' );
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_TODO, $message );
+				$result = $checker->checkConstraint($context, $constraint);
+			} catch (ConstraintParameterException $e) {
+				$result = new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
+			} catch (SparqlHelperException $e) {
+				$message = new ViolationMessage('wbqc-violation-message-sparql-error');
+				$result = new CheckResult($context, $constraint, [], CheckResult::STATUS_TODO, $message);
 			}
-			$endTime = microtime( true );
+			$endTime = microtime(true);
 
-			$this->addMetadata( $context, $result );
+			$this->addMetadata($context, $result);
 
 			try {
 				$constraintStatus = $this->constraintParameterParser
-					->parseConstraintStatusParameter( $constraint->getConstraintParameters() );
-			} catch ( ConstraintParameterException $e ) {
-				$result = new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
+					->parseConstraintStatusParameter($constraint->getConstraintParameters());
+			} catch (ConstraintParameterException $e) {
+				$result = new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
 				$constraintStatus = null;
 			}
-			if ( $constraintStatus === null ) {
+			if ($constraintStatus === null) {
 				// downgrade violation to warning
-				if ( $result->getStatus() === CheckResult::STATUS_VIOLATION ) {
-					$result->setStatus( CheckResult::STATUS_WARNING );
+				if ($result->getStatus() === CheckResult::STATUS_VIOLATION) {
+					$result->setStatus(CheckResult::STATUS_WARNING);
 				}
 			} else {
-				if ( $constraintStatus !== 'mandatory' ) {
+				if ($constraintStatus !== 'mandatory') {
 					// @codeCoverageIgnoreStart
 					throw new LogicException(
-						"Unknown constraint status '$constraintStatus', " .
+						"Unknown constraint status '$constraintStatus', ".
 						"only known status is 'mandatory'"
 					);
 					// @codeCoverageIgnoreEnd
 				}
-				$result->addParameter( 'constraint_status', $constraintStatus );
+				$result->addParameter('constraint_status', $constraintStatus);
 			}
 
 			$this->loggingHelper->logConstraintCheck(
 				$context,
 				$constraint,
 				$result,
-				get_class( $checker ),
+				get_class($checker),
 				$endTime - $startTime,
 				__METHOD__
 			);
 
 			return $result;
 		} else {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_TODO, null );
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_TODO, null);
 		}
 	}
 
@@ -623,29 +623,29 @@ 
 				$constraint->getConstraintParameters(),
 				$constraint->getConstraintTypeItemId()
 			);
-		} catch ( ConstraintParameterException $e ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage() );
+		} catch (ConstraintParameterException $e) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_BAD_PARAMETERS, $e->getViolationMessage());
 		}
-		if ( $checkedContextTypes === null ) {
+		if ($checkedContextTypes === null) {
 			$checkedContextTypes = $checker->getDefaultContextTypes();
 		}
-		if ( !in_array( $context->getType(), $checkedContextTypes ) ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_NOT_IN_SCOPE, null );
+		if (!in_array($context->getType(), $checkedContextTypes)) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_NOT_IN_SCOPE, null);
 		}
-		if ( $checker->getSupportedContextTypes()[$context->getType()] === CheckResult::STATUS_TODO ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_TODO, null );
+		if ($checker->getSupportedContextTypes()[$context->getType()] === CheckResult::STATUS_TODO) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_TODO, null);
 		}
 		return null;
 	}
 
-	private function addMetadata( Context $context, CheckResult $result ) {
-		$result->withMetadata( Metadata::merge( [
+	private function addMetadata(Context $context, CheckResult $result) {
+		$result->withMetadata(Metadata::merge([
 			$result->getMetadata(),
-			Metadata::ofDependencyMetadata( DependencyMetadata::merge( [
-				DependencyMetadata::ofEntityId( $context->getEntity()->getId() ),
-				DependencyMetadata::ofEntityId( $result->getConstraint()->getPropertyId() ),
-			] ) ),
-		] ) );
+			Metadata::ofDependencyMetadata(DependencyMetadata::merge([
+				DependencyMetadata::ofEntityId($context->getEntity()->getId()),
+				DependencyMetadata::ofEntityId($result->getConstraint()->getPropertyId()),
+			])),
+		]));
 	}
 
 	/**
@@ -653,12 +653,12 @@ 
 	 *
 	 * @return CheckResult[]
 	 */
-	private function sortResult( array $result ) {
-		if ( count( $result ) < 2 ) {
+	private function sortResult(array $result) {
+		if (count($result) < 2) {
 			return $result;
 		}
 
-		$sortFunction = function ( CheckResult $a, CheckResult $b ) {
+		$sortFunction = function(CheckResult $a, CheckResult $b) {
 			$orderNum = 0;
 			$order = [
 				CheckResult::STATUS_BAD_PARAMETERS => $orderNum++,
@@ -674,55 +674,55 @@ 
 			$statusA = $a->getStatus();
 			$statusB = $b->getStatus();
 
-			$orderA = array_key_exists( $statusA, $order ) ? $order[ $statusA ] : $order[ 'other' ];
-			$orderB = array_key_exists( $statusB, $order ) ? $order[ $statusB ] : $order[ 'other' ];
+			$orderA = array_key_exists($statusA, $order) ? $order[$statusA] : $order['other'];
+			$orderB = array_key_exists($statusB, $order) ? $order[$statusB] : $order['other'];
 
-			if ( $orderA === $orderB ) {
+			if ($orderA === $orderB) {
 				$cursorA = $a->getContextCursor();
 				$cursorB = $b->getContextCursor();
 
-				if ( $cursorA instanceof EntityContextCursor ) {
+				if ($cursorA instanceof EntityContextCursor) {
 					return $cursorB instanceof EntityContextCursor ? 0 : -1;
 				}
-				if ( $cursorB instanceof EntityContextCursor ) {
+				if ($cursorB instanceof EntityContextCursor) {
 					return $cursorA instanceof EntityContextCursor ? 0 : 1;
 				}
 
 				$pidA = $cursorA->getSnakPropertyId();
 				$pidB = $cursorB->getSnakPropertyId();
 
-				if ( $pidA === $pidB ) {
+				if ($pidA === $pidB) {
 					$hashA = $cursorA->getSnakHash();
 					$hashB = $cursorB->getSnakHash();
 
-					if ( $hashA === $hashB ) {
-						if ( $a instanceof NullResult ) {
+					if ($hashA === $hashB) {
+						if ($a instanceof NullResult) {
 							return $b instanceof NullResult ? 0 : -1;
 						}
-						if ( $b instanceof NullResult ) {
+						if ($b instanceof NullResult) {
 							return $a instanceof NullResult ? 0 : 1;
 						}
 
 						$typeA = $a->getConstraint()->getConstraintTypeItemId();
 						$typeB = $b->getConstraint()->getConstraintTypeItemId();
 
-						if ( $typeA == $typeB ) {
+						if ($typeA == $typeB) {
 							return 0;
 						} else {
-							return ( $typeA > $typeB ) ? 1 : -1;
+							return ($typeA > $typeB) ? 1 : -1;
 						}
 					} else {
-						return ( $hashA > $hashB ) ? 1 : -1;
+						return ($hashA > $hashB) ? 1 : -1;
 					}
 				} else {
-					return ( $pidA > $pidB ) ? 1 : -1;
+					return ($pidA > $pidB) ? 1 : -1;
 				}
 			} else {
-				return ( $orderA > $orderB ) ? 1 : -1;
+				return ($orderA > $orderB) ? 1 : -1;
 			}
 		};
 
-		uasort( $result, $sortFunction );
+		uasort($result, $sortFunction);
 
 		return $result;
 	}

src/ConstraintCheck/Helper/TooManySparqlRequestsException.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 class TooManySparqlRequestsException extends SparqlHelperException {
 
 	public function __construct() {
-		parent::__construct( 'The SPARQL query endpoint reports too many requests.' );
+		parent::__construct('The SPARQL query endpoint reports too many requests.');
 	}
 
 }

src/ConstraintCheck/Helper/LoggingHelper.php

Spacing +35 added lines, -35 removed lines

@@ -53,12 +53,12 @@ 
 		$this->dataFactory = $dataFactory;
 		$this->logger = $logger;
 		$this->constraintCheckDurationLimits = [
-			'info' => $config->get( 'WBQualityConstraintsCheckDurationInfoSeconds' ),
-			'warning' => $config->get( 'WBQualityConstraintsCheckDurationWarningSeconds' ),
+			'info' => $config->get('WBQualityConstraintsCheckDurationInfoSeconds'),
+			'warning' => $config->get('WBQualityConstraintsCheckDurationWarningSeconds'),
 		];
 		$this->constraintCheckOnEntityDurationLimits = [
-			'info' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationInfoSeconds' ),
-			'warning' => $config->get( 'WBQualityConstraintsCheckOnEntityDurationWarningSeconds' ),
+			'info' => $config->get('WBQualityConstraintsCheckOnEntityDurationInfoSeconds'),
+			'warning' => $config->get('WBQualityConstraintsCheckOnEntityDurationWarningSeconds'),
 		];
 	}
 
@@ -69,23 +69,23 @@ 
 	 * @param float $durationSeconds
 	 * @return array [ $limitSeconds, $logLevel ]
 	 */
-	private function findLimit( $limits, $durationSeconds ) {
+	private function findLimit($limits, $durationSeconds) {
 		$limitSeconds = null;
 		$logLevel = null;
 
-		foreach ( $limits as $level => $limit ) {
+		foreach ($limits as $level => $limit) {
 			if (
 				// duration exceeds this limit
-				isset( $limit ) && $durationSeconds > $limit &&
+				isset($limit) && $durationSeconds > $limit &&
 				// this limit is longer than previous longest limit
-				( $limitSeconds === null || $limit > $limitSeconds )
+				($limitSeconds === null || $limit > $limitSeconds)
 			) {
 				$limitSeconds = $limit;
 				$logLevel = $level;
 			}
 		}
 
-		return [ $limitSeconds, $logLevel ];
+		return [$limitSeconds, $logLevel];
 	}
 
 	/**
@@ -110,31 +110,31 @@ 
 		$durationSeconds,
 		$method
 	) {
-		$constraintCheckerClassShortName = substr( strrchr( $constraintCheckerClass, '\\' ), 1 );
+		$constraintCheckerClassShortName = substr(strrchr($constraintCheckerClass, '\\'), 1);
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
 
 		$this->dataFactory->timing(
-			'wikibase.quality.constraints.check.timing.' .
-				$constraintTypeItemId . '-' .
+			'wikibase.quality.constraints.check.timing.'.
+				$constraintTypeItemId.'-'.
 				$constraintCheckerClassShortName,
 			$durationSeconds * 1000
 		);
 
 		// find the longest limit (and associated log level) that the duration exceeds
-		list( $limitSeconds, $logLevel ) = $this->findLimit(
+		list($limitSeconds, $logLevel) = $this->findLimit(
 			$this->constraintCheckDurationLimits,
 			$durationSeconds
 		);
-		if ( $limitSeconds === null ) {
+		if ($limitSeconds === null) {
 			return;
 		}
-		if ( $context->getType() !== Context::TYPE_STATEMENT ) {
+		if ($context->getType() !== Context::TYPE_STATEMENT) {
 			// TODO log less details but still log something
 			return;
 		}
 
 		$resultMessage = $result->getMessage();
-		if ( $resultMessage !== null ) {
+		if ($resultMessage !== null) {
 			$resultMessageKey = $resultMessage->getMessageKey();
 		} else {
 			$resultMessageKey = null;
@@ -142,8 +142,8 @@ 
 
 		$this->logger->log(
 			$logLevel,
-			'Constraint check with {constraintCheckerClassShortName} ' .
-			'took longer than {limitSeconds} second(s) ' .
+			'Constraint check with {constraintCheckerClassShortName} '.
+			'took longer than {limitSeconds} second(s) '.
 			'(duration: {durationSeconds} seconds).',
 			[
 				'method' => $method,
@@ -153,13 +153,13 @@ 
 				'constraintId' => $constraint->getConstraintId(),
 				'constraintPropertyId' => $constraint->getPropertyId()->getSerialization(),
 				'constraintTypeItemId' => $constraintTypeItemId,
-				'constraintParameters' => json_encode( $constraint->getConstraintParameters() ),
+				'constraintParameters' => json_encode($constraint->getConstraintParameters()),
 				'constraintCheckerClass' => $constraintCheckerClass,
 				'constraintCheckerClassShortName' => $constraintCheckerClassShortName,
 				'entityId' => $context->getEntity()->getId()->getSerialization(),
 				'statementGuid' => $context->getSnakStatement()->getGuid(),
 				'resultStatus' => $result->getStatus(),
-				'resultParameters' => json_encode( $result->getParameters() ),
+				'resultParameters' => json_encode($result->getParameters()),
 				'resultMessage' => $resultMessageKey,
 			]
 		);
@@ -189,18 +189,18 @@ 
 		);
 
 		// find the longest limit (and associated log level) that the duration exceeds
-		list( $limitSeconds, $logLevel ) = $this->findLimit(
+		list($limitSeconds, $logLevel) = $this->findLimit(
 			$this->constraintCheckOnEntityDurationLimits,
 			$durationSeconds
 		);
-		if ( $limitSeconds === null ) {
+		if ($limitSeconds === null) {
 			return;
 		}
 
 		$this->logger->log(
 			$logLevel,
-			'Full constraint check on {entityId} ' .
-			'took longer than {limitSeconds} second(s) ' .
+			'Full constraint check on {entityId} '.
+			'took longer than {limitSeconds} second(s) '.
 			'(duration: {durationSeconds} seconds).',
 			[
 				'method' => $method,
@@ -218,7 +218,7 @@ 
 	 *
 	 * @param EntityId $entityId
 	 */
-	public function logCheckConstraintsCacheHit( EntityId $entityId ) {
+	public function logCheckConstraintsCacheHit(EntityId $entityId) {
 		$this->dataFactory->increment(
 			'wikibase.quality.constraints.cache.entity.hit'
 		);
@@ -229,10 +229,10 @@ 
 	 *
 	 * @param EntityId[] $entityIds
 	 */
-	public function logCheckConstraintsCacheMisses( array $entityIds ) {
+	public function logCheckConstraintsCacheMisses(array $entityIds) {
 		$this->dataFactory->updateCount(
 			'wikibase.quality.constraints.cache.entity.miss',
-			count( $entityIds )
+			count($entityIds)
 		);
 	}
 
@@ -259,17 +259,17 @@ 
 	 * @param EntityId[] $entityIds
 	 * @param int $maxRevisionIds
 	 */
-	public function logHugeDependencyMetadata( array $entityIds, $maxRevisionIds ) {
+	public function logHugeDependencyMetadata(array $entityIds, $maxRevisionIds) {
 		$this->logger->log(
 			'warning',
-			'Dependency metadata for constraint check result has huge set of entity IDs ' .
-			'(count ' . count( $entityIds ) . ', limit ' . $maxRevisionIds . '); ' .
+			'Dependency metadata for constraint check result has huge set of entity IDs '.
+			'(count '.count($entityIds).', limit '.$maxRevisionIds.'); '.
 			'caching disabled for this check result.',
 			[
 				'loggingMethod' => __METHOD__,
 				'entityIds' => json_encode(
 					array_map(
-						function ( EntityId $entityId ) {
+						function(EntityId $entityId) {
 							return $entityId->getSerialization();
 						},
 						$entityIds
@@ -280,22 +280,22 @@ 
 		);
 	}
 
-	public function logSparqlHelperTooManyRequestsRetryAfterPresent( ConvertibleTimestamp $retryAfterTime, MWHttpRequest $request ) {
+	public function logSparqlHelperTooManyRequestsRetryAfterPresent(ConvertibleTimestamp $retryAfterTime, MWHttpRequest $request) {
 		$this->logger->notice(
 			'Sparql API replied with status 429 and a retry-after header. Requesting to retry after {retryAfterTime}',
 			[
 				'retryAfterTime' => $retryAfterTime,
-				'responseHeaders' => json_encode( $request->getResponseHeaders() ),
+				'responseHeaders' => json_encode($request->getResponseHeaders()),
 				'responseContent' => $request->getContent(),
 			]
 		);
 	}
 
-	public function logSparqlHelperTooManyRequestsRetryAfterInvalid( MWHttpRequest $request ) {
+	public function logSparqlHelperTooManyRequestsRetryAfterInvalid(MWHttpRequest $request) {
 		$this->logger->warning(
 			'Sparql API replied with status 429 and no valid retry-after header.',
 			[
-				'responseHeaders' => json_encode( $request->getResponseHeaders() ),
+				'responseHeaders' => json_encode($request->getResponseHeaders()),
 				'responseContent' => $request->getContent(),
 			]
 		);

src/ConstraintCheck/Helper/SparqlHelperException.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
  */
 class SparqlHelperException extends RuntimeException {
 
-	public function __construct( $msg = 'The SPARQL query endpoint returned an error.' ) {
-		parent::__construct( $msg );
+	public function __construct($msg = 'The SPARQL query endpoint returned an error.') {
+		parent::__construct($msg);
 	}
 
 }

src/ServiceWiring.php

Spacing +103 added lines, -103 removed lines

@@ -27,28 +27,28 @@ 
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
 
 return [
-	ConstraintsServices::EXPIRY_LOCK => function( MediaWikiServices $services ) {
-		return new ExpiryLock( ObjectCache::getInstance( CACHE_ANYTHING ) );
+	ConstraintsServices::EXPIRY_LOCK => function(MediaWikiServices $services) {
+		return new ExpiryLock(ObjectCache::getInstance(CACHE_ANYTHING));
 	},
 
-	ConstraintsServices::LOGGING_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) {
 		return new LoggingHelper(
 			$services->getStatsdDataFactory(),
-			LoggerFactory::getInstance( 'WikibaseQualityConstraints' ),
+			LoggerFactory::getInstance('WikibaseQualityConstraints'),
 			$services->getMainConfig()
 		);
 	},
 
-	ConstraintsServices::CONSTRAINT_REPOSITORY => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONSTRAINT_REPOSITORY => function(MediaWikiServices $services) {
 		return new ConstraintRepository();
 	},
 
-	ConstraintsServices::CONSTRAINT_LOOKUP => function( MediaWikiServices $services ) {
-		$constraintRepository = ConstraintsServices::getConstraintRepository( $services );
-		return new CachingConstraintLookup( $constraintRepository );
+	ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) {
+		$constraintRepository = ConstraintsServices::getConstraintRepository($services);
+		return new CachingConstraintLookup($constraintRepository);
 	},
 
-	ConstraintsServices::CHECK_RESULT_SERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) {
 		return new CheckResultSerializer(
 			new ConstraintSerializer(
 				false // constraint parameters are not exposed
@@ -59,7 +59,7 @@ 
 		);
 	},
 
-	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) {
 		// TODO in the future, get EntityIdParser and DataValueFactory from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$entityIdParser = $repo->getEntityIdParser();
@@ -76,11 +76,11 @@ 
 		);
 	},
 
-	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) {
 		return new ViolationMessageSerializer();
 	},
 
-	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) {
 		// TODO in the future, get EntityIdParser and DataValueFactory from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$entityIdParser = $repo->getEntityIdParser();
@@ -92,7 +92,7 @@ 
 		);
 	},
 
-	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) {
 		// TODO in the future, get DeserializerFactory and concept base URIs from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$deserializerFactory = $repo->getBaseDataModelDeserializerFactory();
@@ -105,11 +105,11 @@ 
 		);
 	},
 
-	ConstraintsServices::CONNECTION_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONNECTION_CHECKER_HELPER => function(MediaWikiServices $services) {
 		return new ConnectionCheckerHelper();
 	},
 
-	ConstraintsServices::RANGE_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::RANGE_CHECKER_HELPER => function(MediaWikiServices $services) {
 		// TODO in the future, get UnitConverter from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$unitConverter = $repo->getUnitConverter();
@@ -120,9 +120,9 @@ 
 		);
 	},
 
-	ConstraintsServices::SPARQL_HELPER => function( MediaWikiServices $services ) {
-		$endpoint = $services->getMainConfig()->get( 'WBQualityConstraintsSparqlEndpoint' );
-		if ( $endpoint === '' ) {
+	ConstraintsServices::SPARQL_HELPER => function(MediaWikiServices $services) {
+		$endpoint = $services->getMainConfig()->get('WBQualityConstraintsSparqlEndpoint');
+		if ($endpoint === '') {
 			return new DummySparqlHelper();
 		}
 
@@ -138,117 +138,117 @@ 
 			$entityIdParser,
 			$propertyDataTypeLookup,
 			$services->getMainWANObjectCache(),
-			ConstraintsServices::getViolationMessageSerializer( $services ),
-			ConstraintsServices::getViolationMessageDeserializer( $services ),
+			ConstraintsServices::getViolationMessageSerializer($services),
+			ConstraintsServices::getViolationMessageDeserializer($services),
 			$services->getStatsdDataFactory(),
-			ConstraintsServices::getExpiryLock( $services ),
+			ConstraintsServices::getExpiryLock($services),
 			ConstraintsServices::getLoggingHelper(),
-			wfWikiID() . ' WikibaseQualityConstraints ' . Http::userAgent(),
+			wfWikiID().' WikibaseQualityConstraints '.Http::userAgent(),
 			$services->getHttpRequestFactory()
 		);
 	},
 
-	ConstraintsServices::TYPE_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::TYPE_CHECKER_HELPER => function(MediaWikiServices $services) {
 		return new TypeCheckerHelper(
-			WikibaseServices::getEntityLookup( $services ),
+			WikibaseServices::getEntityLookup($services),
 			$services->getMainConfig(),
-			ConstraintsServices::getSparqlHelper( $services ),
+			ConstraintsServices::getSparqlHelper($services),
 			$services->getStatsdDataFactory()
 		);
 	},
 
-	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function(MediaWikiServices $services) {
 		// TODO in the future, get StatementGuidParser from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$statementGuidParser = $repo->getStatementGuidParser();
 
 		$config = $services->getMainConfig();
 		$checkerMap = [
-			$config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
-				=> ConstraintCheckerServices::getConflictsWithChecker( $services ),
-			$config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
-				=> ConstraintCheckerServices::getItemChecker( $services ),
-			$config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
-				=> ConstraintCheckerServices::getTargetRequiredClaimChecker( $services ),
-			$config->get( 'WBQualityConstraintsSymmetricConstraintId' )
-				=> ConstraintCheckerServices::getSymmetricChecker( $services ),
-			$config->get( 'WBQualityConstraintsInverseConstraintId' )
-				=> ConstraintCheckerServices::getInverseChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
-				=> ConstraintCheckerServices::getQualifierChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
-				=> ConstraintCheckerServices::getQualifiersChecker( $services ),
-			$config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
-				=> ConstraintCheckerServices::getMandatoryQualifiersChecker( $services ),
-			$config->get( 'WBQualityConstraintsRangeConstraintId' )
-				=> ConstraintCheckerServices::getRangeChecker( $services ),
-			$config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
-				=> ConstraintCheckerServices::getDiffWithinRangeChecker( $services ),
-			$config->get( 'WBQualityConstraintsTypeConstraintId' )
-				=> ConstraintCheckerServices::getTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsValueTypeConstraintId' )
-				=> ConstraintCheckerServices::getValueTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsSingleValueConstraintId' )
-				=> ConstraintCheckerServices::getSingleValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsMultiValueConstraintId' )
-				=> ConstraintCheckerServices::getMultiValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
-				=> ConstraintCheckerServices::getUniqueValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsFormatConstraintId' )
-				=> ConstraintCheckerServices::getFormatChecker( $services ),
-			$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
-				=> ConstraintCheckerServices::getCommonsLinkChecker( $services ),
-			$config->get( 'WBQualityConstraintsOneOfConstraintId' )
-				=> ConstraintCheckerServices::getOneOfChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
-				=> ConstraintCheckerServices::getValueOnlyChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
-				=> ConstraintCheckerServices::getReferenceChecker( $services ),
-			$config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
-				=> ConstraintCheckerServices::getNoBoundsChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
-				=> ConstraintCheckerServices::getAllowedUnitsChecker( $services ),
-			$config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
-				=> ConstraintCheckerServices::getSingleBestValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
-				=> ConstraintCheckerServices::getEntityTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsNoneOfConstraintId' )
-				=> ConstraintCheckerServices::getNoneOfChecker( $services ),
-			$config->get( 'WBQualityConstraintsIntegerConstraintId' )
-				=> ConstraintCheckerServices::getIntegerChecker( $services ),
-			$config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
-				=> ConstraintCheckerServices::getCitationNeededChecker( $services ),
-			$config->get( 'WBQualityConstraintsPropertyScopeConstraintId' )
-				=> ConstraintCheckerServices::getPropertyScopeChecker( $services ),
-			$config->get( 'WBQualityConstraintsContemporaryConstraintId' )
-				=> ConstraintCheckerServices::getContemporaryChecker( $services ),
+			$config->get('WBQualityConstraintsConflictsWithConstraintId')
+				=> ConstraintCheckerServices::getConflictsWithChecker($services),
+			$config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
+				=> ConstraintCheckerServices::getItemChecker($services),
+			$config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
+				=> ConstraintCheckerServices::getTargetRequiredClaimChecker($services),
+			$config->get('WBQualityConstraintsSymmetricConstraintId')
+				=> ConstraintCheckerServices::getSymmetricChecker($services),
+			$config->get('WBQualityConstraintsInverseConstraintId')
+				=> ConstraintCheckerServices::getInverseChecker($services),
+			$config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
+				=> ConstraintCheckerServices::getQualifierChecker($services),
+			$config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
+				=> ConstraintCheckerServices::getQualifiersChecker($services),
+			$config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
+				=> ConstraintCheckerServices::getMandatoryQualifiersChecker($services),
+			$config->get('WBQualityConstraintsRangeConstraintId')
+				=> ConstraintCheckerServices::getRangeChecker($services),
+			$config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
+				=> ConstraintCheckerServices::getDiffWithinRangeChecker($services),
+			$config->get('WBQualityConstraintsTypeConstraintId')
+				=> ConstraintCheckerServices::getTypeChecker($services),
+			$config->get('WBQualityConstraintsValueTypeConstraintId')
+				=> ConstraintCheckerServices::getValueTypeChecker($services),
+			$config->get('WBQualityConstraintsSingleValueConstraintId')
+				=> ConstraintCheckerServices::getSingleValueChecker($services),
+			$config->get('WBQualityConstraintsMultiValueConstraintId')
+				=> ConstraintCheckerServices::getMultiValueChecker($services),
+			$config->get('WBQualityConstraintsDistinctValuesConstraintId')
+				=> ConstraintCheckerServices::getUniqueValueChecker($services),
+			$config->get('WBQualityConstraintsFormatConstraintId')
+				=> ConstraintCheckerServices::getFormatChecker($services),
+			$config->get('WBQualityConstraintsCommonsLinkConstraintId')
+				=> ConstraintCheckerServices::getCommonsLinkChecker($services),
+			$config->get('WBQualityConstraintsOneOfConstraintId')
+				=> ConstraintCheckerServices::getOneOfChecker($services),
+			$config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
+				=> ConstraintCheckerServices::getValueOnlyChecker($services),
+			$config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
+				=> ConstraintCheckerServices::getReferenceChecker($services),
+			$config->get('WBQualityConstraintsNoBoundsConstraintId')
+				=> ConstraintCheckerServices::getNoBoundsChecker($services),
+			$config->get('WBQualityConstraintsAllowedUnitsConstraintId')
+				=> ConstraintCheckerServices::getAllowedUnitsChecker($services),
+			$config->get('WBQualityConstraintsSingleBestValueConstraintId')
+				=> ConstraintCheckerServices::getSingleBestValueChecker($services),
+			$config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
+				=> ConstraintCheckerServices::getEntityTypeChecker($services),
+			$config->get('WBQualityConstraintsNoneOfConstraintId')
+				=> ConstraintCheckerServices::getNoneOfChecker($services),
+			$config->get('WBQualityConstraintsIntegerConstraintId')
+				=> ConstraintCheckerServices::getIntegerChecker($services),
+			$config->get('WBQualityConstraintsCitationNeededConstraintId')
+				=> ConstraintCheckerServices::getCitationNeededChecker($services),
+			$config->get('WBQualityConstraintsPropertyScopeConstraintId')
+				=> ConstraintCheckerServices::getPropertyScopeChecker($services),
+			$config->get('WBQualityConstraintsContemporaryConstraintId')
+				=> ConstraintCheckerServices::getContemporaryChecker($services),
 		];
 
 		return new DelegatingConstraintChecker(
-			WikibaseServices::getEntityLookup( $services ),
+			WikibaseServices::getEntityLookup($services),
 			$checkerMap,
-			ConstraintsServices::getConstraintLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
+			ConstraintsServices::getConstraintLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
 			$statementGuidParser,
-			ConstraintsServices::getLoggingHelper( $services ),
-			$config->get( 'WBQualityConstraintsCheckQualifiers' ),
-			$config->get( 'WBQualityConstraintsCheckReferences' ),
-			$config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
+			ConstraintsServices::getLoggingHelper($services),
+			$config->get('WBQualityConstraintsCheckQualifiers'),
+			$config->get('WBQualityConstraintsCheckReferences'),
+			$config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
 		);
 	},
 
-	ConstraintsServices::RESULTS_SOURCE => function( MediaWikiServices $services ) {
+	ConstraintsServices::RESULTS_SOURCE => function(MediaWikiServices $services) {
 		$config = $services->getMainConfig();
 		$resultsSource = new CheckingResultsSource(
-			ConstraintsServices::getDelegatingConstraintChecker( $services )
+			ConstraintsServices::getDelegatingConstraintChecker($services)
 		);
 
-		if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
+		if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
 			$possiblyStaleConstraintTypes = [
-				$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
-				$config->get( 'WBQualityConstraintsTypeConstraintId' ),
-				$config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
-				$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
+				$config->get('WBQualityConstraintsCommonsLinkConstraintId'),
+				$config->get('WBQualityConstraintsTypeConstraintId'),
+				$config->get('WBQualityConstraintsValueTypeConstraintId'),
+				$config->get('WBQualityConstraintsDistinctValuesConstraintId'),
 			];
 			// TODO in the future, get EntityIdParser and WikiPageEntityMetaDataAccessor from $services?
 			$repo = WikibaseRepo::getDefaultInstance();
@@ -258,14 +258,14 @@ 
 			$resultsSource = new CachingResultsSource(
 				$resultsSource,
 				ResultsCache::getDefaultInstance(),
-				ConstraintsServices::getCheckResultSerializer( $services ),
-				ConstraintsServices::getCheckResultDeserializer( $services ),
+				ConstraintsServices::getCheckResultSerializer($services),
+				ConstraintsServices::getCheckResultDeserializer($services),
 				$wikiPageEntityMetaDataAccessor,
 				$entityIdParser,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
+				$config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
 				$possiblyStaleConstraintTypes,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
-				ConstraintsServices::getLoggingHelper( $services )
+				$config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
+				ConstraintsServices::getLoggingHelper($services)
 			);
 		}
 

src/ConstraintCheck/Checker/ValueTypeChecker.php

Spacing +32 added lines, -32 removed lines

@@ -91,37 +91,37 @@ 
 	 * @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs
 	 * @return CheckResult
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
 
 		$parameters = [];
 		$constraintParameters = $constraint->getConstraintParameters();
 
-		$classes = $this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
+		$classes = $this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId());
 		$parameters['class'] = array_map(
-			function( $id ) {
-				return new ItemId( $id );
+			function($id) {
+				return new ItemId($id);
 			},
 			$classes
 		);
 
-		$relation = $this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
+		$relation = $this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId());
 		$relationIds = [];
-		if ( $relation === 'instance' || $relation === 'instanceOrSubclass' ) {
-			$relationIds[] = $this->config->get( 'WBQualityConstraintsInstanceOfId' );
+		if ($relation === 'instance' || $relation === 'instanceOrSubclass') {
+			$relationIds[] = $this->config->get('WBQualityConstraintsInstanceOfId');
 		}
-		if ( $relation === 'subclass' || $relation === 'instanceOrSubclass' ) {
-			$relationIds[] = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+		if ($relation === 'subclass' || $relation === 'instanceOrSubclass') {
+			$relationIds[] = $this->config->get('WBQualityConstraintsSubclassOfId');
 		}
-		$parameters['relation'] = [ $relation ];
+		$parameters['relation'] = [$relation];
 
 		$snak = $context->getSnak();
 
-		if ( !$snak instanceof PropertyValueSnak ) {
+		if (!$snak instanceof PropertyValueSnak) {
 			// nothing to check
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
 		}
 
 		$dataValue = $snak->getDataValue();
@@ -130,24 +130,24 @@ 
 		 * error handling:
 		 *   type of $dataValue for properties with 'Value type' constraint has to be 'wikibase-entityid'
 		 */
-		if ( $dataValue->getType() !== 'wikibase-entityid' ) {
-			$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
-				->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM )
-				->withDataValueType( 'wikibase-entityid' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		if ($dataValue->getType() !== 'wikibase-entityid') {
+			$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
+				->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM)
+				->withDataValueType('wikibase-entityid');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 		/** @var EntityIdValue $dataValue */
 
 		try {
-			$item = $this->entityLookup->getEntity( $dataValue->getEntityId() );
-		} catch ( UnresolvedEntityRedirectException $e ) {
+			$item = $this->entityLookup->getEntity($dataValue->getEntityId());
+		} catch (UnresolvedEntityRedirectException $e) {
 			// Edge case (double redirect): Pretend the entity doesn't exist
 			$item = null;
 		}
 
-		if ( !( $item instanceof StatementListProvider ) ) {
-			$message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		if (!($item instanceof StatementListProvider)) {
+			$message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		$statements = $item->getStatements();
@@ -158,7 +158,7 @@ 
 			$classes
 		);
 
-		if ( $result->getBool() ) {
+		if ($result->getBool()) {
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
@@ -172,21 +172,21 @@ 
 			$status = CheckResult::STATUS_VIOLATION;
 		}
 
-		return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
-			->withMetadata( $result->getMetadata() );
+		return (new CheckResult($context, $constraint, $parameters, $status, $message))
+			->withMetadata($result->getMetadata());
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$exceptions = [];
 		try {
-			$this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
-			$this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/Checker/ContemporaryChecker.php

Spacing +42 added lines, -43 removed lines

@@ -78,7 +78,7 @@ 
 	 * @codeCoverageIgnore This method is purely declarative.
 	 */
 	public function getDefaultContextTypes() {
-		return [ Context::TYPE_STATEMENT ];
+		return [Context::TYPE_STATEMENT];
 	}
 
 	/**
@@ -90,30 +90,30 @@ 
 	 * @return CheckResult
 	 * @throws \ConfigException
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
 		$snak = $context->getSnak();
-		if ( !$snak instanceof PropertyValueSnak ) {
+		if (!$snak instanceof PropertyValueSnak) {
 			// nothing to check
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_COMPLIANCE );
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_COMPLIANCE);
 		}
-		if ( $snak->getDataValue()->getType() !== 'wikibase-entityid' ) {
+		if ($snak->getDataValue()->getType() !== 'wikibase-entityid') {
 			// wrong data type
-			$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
-				->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM )
-				->withDataValueType( 'wikibase-entityid' );
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message );
+			$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
+				->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM)
+				->withDataValueType('wikibase-entityid');
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		/** @var EntityId $objectId */
 		$objectId = $snak->getDataValue()->getEntityId();
-		$objectItem = $this->entityLookup->getEntity( $objectId );
-		if ( !( $objectItem instanceof StatementListProvider ) ) {
+		$objectItem = $this->entityLookup->getEntity($objectId);
+		if (!($objectItem instanceof StatementListProvider)) {
 			// object was deleted/doesn't exist
-			$message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' );
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_VIOLATION, $message );
+			$message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist');
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_VIOLATION, $message);
 		}
 		/** @var Statement[] $objectStatements */
 		$objectStatements = $objectItem->getStatements()->toArray();
@@ -123,9 +123,9 @@ 
 		/** @var Statement[] $subjectStatements */
 		$subjectStatements = $context->getEntity()->getStatements()->toArray();
 		/** @var String[] $startPropertyIds */
-		$startPropertyIds = $this->config->get( self::CONFIG_VARIABLE_START_PROPERTY_IDS );
+		$startPropertyIds = $this->config->get(self::CONFIG_VARIABLE_START_PROPERTY_IDS);
 		/** @var String[] $endPropertyIds */
-		$endPropertyIds = $this->config->get( self::CONFIG_VARIABLE_END_PROPERTY_IDS );
+		$endPropertyIds = $this->config->get(self::CONFIG_VARIABLE_END_PROPERTY_IDS);
 		$subjectStartValue = $this->getExtremeValue(
 			$startPropertyIds,
 			$subjectStatements,
@@ -147,15 +147,15 @@ 
 			'end'
 		);
 		if (
-			$this->rangeCheckerHelper->getComparison( $subjectStartValue, $subjectEndValue ) <= 0 &&
-			$this->rangeCheckerHelper->getComparison( $objectStartValue, $objectEndValue ) <= 0 && (
-				$this->rangeCheckerHelper->getComparison( $subjectEndValue, $objectStartValue ) < 0 ||
-				$this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectStartValue ) < 0
+			$this->rangeCheckerHelper->getComparison($subjectStartValue, $subjectEndValue) <= 0 &&
+			$this->rangeCheckerHelper->getComparison($objectStartValue, $objectEndValue) <= 0 && (
+				$this->rangeCheckerHelper->getComparison($subjectEndValue, $objectStartValue) < 0 ||
+				$this->rangeCheckerHelper->getComparison($objectEndValue, $subjectStartValue) < 0
 			)
 		) {
 			if (
 				$subjectEndValue == null ||
-				$this->rangeCheckerHelper->getComparison( $objectEndValue, $subjectEndValue ) < 0
+				$this->rangeCheckerHelper->getComparison($objectEndValue, $subjectEndValue) < 0
 			) {
 				$earlierEntityId = $objectId;
 				$minEndValue = $objectEndValue;
@@ -178,7 +178,7 @@ 
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		}
-		return new CheckResult( $context, $constraint, [], $status, $message );
+		return new CheckResult($context, $constraint, [], $status, $message);
 	}
 
 	/**
@@ -188,19 +188,19 @@ 
 	 *
 	 * @return DataValue|null
 	 */
-	private function getExtremeValue( $extremePropertyIds, $statements, $startOrEnd ) {
-		if ( $startOrEnd !== 'start' && $startOrEnd !== 'end' ) {
-			throw new \InvalidArgumentException( '$startOrEnd must be \'start\' or \'end\'.' );
+	private function getExtremeValue($extremePropertyIds, $statements, $startOrEnd) {
+		if ($startOrEnd !== 'start' && $startOrEnd !== 'end') {
+			throw new \InvalidArgumentException('$startOrEnd must be \'start\' or \'end\'.');
 		}
 		$extremeValue = null;
-		foreach ( $extremePropertyIds as $extremePropertyId ) {
-			$statementList = new StatementList( $statements );
-			$extremeStatements = $statementList->getByPropertyId( new PropertyId( $extremePropertyId ) );
+		foreach ($extremePropertyIds as $extremePropertyId) {
+			$statementList = new StatementList($statements);
+			$extremeStatements = $statementList->getByPropertyId(new PropertyId($extremePropertyId));
 			/** @var Statement $extremeStatement */
-			foreach ( $extremeStatements as $extremeStatement ) {
-				if ( $extremeStatement->getRank() !== Statement::RANK_DEPRECATED ) {
+			foreach ($extremeStatements as $extremeStatement) {
+				if ($extremeStatement->getRank() !== Statement::RANK_DEPRECATED) {
 					$snak = $extremeStatement->getMainSnak();
-					if ( !$snak instanceof PropertyValueSnak ) {
+					if (!$snak instanceof PropertyValueSnak) {
 						return null;
 					} else {
 						$comparison = $this->rangeCheckerHelper->getComparison(
@@ -209,8 +209,8 @@ 
 						);
 						if (
 							$extremeValue === null ||
-							( $startOrEnd === 'start' && $comparison < 0 ) ||
-							( $startOrEnd === 'end' && $comparison > 0 )
+							($startOrEnd === 'start' && $comparison < 0) ||
+							($startOrEnd === 'end' && $comparison > 0)
 						) {
 							$extremeValue = $snak->getDataValue();
 						}
@@ -240,17 +240,16 @@ 
 		DataValue $maxStartValue
 	) {
 		$messageKey = $earlierEntityId === $subjectId ?
-			'wbqc-violation-message-contemporary-subject-earlier' :
-			'wbqc-violation-message-contemporary-value-earlier';
-		return ( new ViolationMessage( $messageKey ) )
-			->withEntityId( $subjectId, Role::SUBJECT )
-			->withEntityId( $propertyId, Role::PREDICATE )
-			->withEntityId( $objectId, Role::OBJECT )
-			->withDataValue( $minEndValue, Role::OBJECT )
-			->withDataValue( $maxStartValue, Role::OBJECT );
+			'wbqc-violation-message-contemporary-subject-earlier' : 'wbqc-violation-message-contemporary-value-earlier';
+		return (new ViolationMessage($messageKey))
+			->withEntityId($subjectId, Role::SUBJECT)
+			->withEntityId($propertyId, Role::PREDICATE)
+			->withEntityId($objectId, Role::OBJECT)
+			->withDataValue($minEndValue, Role::OBJECT)
+			->withDataValue($maxStartValue, Role::OBJECT);
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		// no parameters
 		return [];
 	}

src/ConstraintCheck/Helper/DummySparqlHelper.php

Spacing +8 added lines, -8 removed lines

@@ -22,15 +22,15 @@ 
 		// no parent::__construct() call
 	}
 
-	public function hasType( $id, array $classes ) {
-		throw new LogicException( 'methods of this class should never be called' );
+	public function hasType($id, array $classes) {
+		throw new LogicException('methods of this class should never be called');
 	}
 
 	public function findEntitiesWithSameStatement(
 		Statement $statement,
 		$ignoreDeprecatedStatements
 	) {
-		throw new LogicException( 'methods of this class should never be called' );
+		throw new LogicException('methods of this class should never be called');
 	}
 
 	public function findEntitiesWithSameQualifierOrReference(
@@ -39,15 +39,15 @@ 
 		$type,
 		$ignoreDeprecatedStatements
 	) {
-		throw new LogicException( 'methods of this class should never be called' );
+		throw new LogicException('methods of this class should never be called');
 	}
 
-	public function matchesRegularExpression( $text, $regex ) {
-		throw new LogicException( 'methods of this class should never be called' );
+	public function matchesRegularExpression($text, $regex) {
+		throw new LogicException('methods of this class should never be called');
 	}
 
-	public function runQuery( $query, $needsPrefixes = true ) {
-		throw new LogicException( 'methods of this class should never be called' );
+	public function runQuery($query, $needsPrefixes = true) {
+		throw new LogicException('methods of this class should never be called');
 	}
 
 }

src/ConstraintCheck/Helper/SparqlHelper.php

Spacing +165 added lines, -168 removed lines

@@ -161,19 +161,19 @@ 
 		$this->loggingHelper = $loggingHelper;
 		$this->defaultUserAgent = $defaultUserAgent;
 		$this->requestFactory = $requestFactory;
-		$this->entityPrefix = $rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY );
+		$this->entityPrefix = $rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY);
 		$this->prefixes = <<<EOT
-PREFIX wd: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ENTITY )}>
-PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}>
-PREFIX wdt: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_DIRECT_CLAIM )}>
-PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}>
-PREFIX p: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM )}>
-PREFIX ps: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_CLAIM_STATEMENT )}>
-PREFIX pq: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER )}>
-PREFIX pqv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_QUALIFIER_VALUE )}>
-PREFIX pr: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE )}>
-PREFIX prv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NSP_REFERENCE_VALUE )}>
-PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ONTOLOGY )}>
+PREFIX wd: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ENTITY)}>
+PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}>
+PREFIX wdt: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_DIRECT_CLAIM)}>
+PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}>
+PREFIX p: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM)}>
+PREFIX ps: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_CLAIM_STATEMENT)}>
+PREFIX pq: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER)}>
+PREFIX pqv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_QUALIFIER_VALUE)}>
+PREFIX pr: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE)}>
+PREFIX prv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NSP_REFERENCE_VALUE)}>
+PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ONTOLOGY)}>
 EOT;
 	}
 
@@ -184,22 +184,21 @@ 
 	 * @return CachedBool
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 */
-	public function hasType( $id, array $classes ) {
-		$subclassOfId = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+	public function hasType($id, array $classes) {
+		$subclassOfId = $this->config->get('WBQualityConstraintsSubclassOfId');
 		// TODO hint:gearing is a workaround for T168973 and can hopefully be removed eventually
-		$gearingHint = $this->config->get( 'WBQualityConstraintsSparqlHasWikibaseSupport' ) ?
-			' hint:Prior hint:gearing "forward".' :
-			'';
+		$gearingHint = $this->config->get('WBQualityConstraintsSparqlHasWikibaseSupport') ?
+			' hint:Prior hint:gearing "forward".' : '';
 
 		$metadatas = [];
 
-		foreach ( array_chunk( $classes, 20 ) as $classesChunk ) {
-			$classesValues = implode( ' ', array_map(
-				function( $class ) {
-					return 'wd:' . $class;
+		foreach (array_chunk($classes, 20) as $classesChunk) {
+			$classesValues = implode(' ', array_map(
+				function($class) {
+					return 'wd:'.$class;
 				},
 				$classesChunk
-			) );
+			));
 
 			$query = <<<EOF
 ASK {
@@ -209,19 +208,19 @@ 
 }
 EOF;
 
-			$result = $this->runQuery( $query );
+			$result = $this->runQuery($query);
 			$metadatas[] = $result->getMetadata();
-			if ( $result->getArray()['boolean'] ) {
+			if ($result->getArray()['boolean']) {
 				return new CachedBool(
 					true,
-					Metadata::merge( $metadatas )
+					Metadata::merge($metadatas)
 				);
 			}
 		}
 
 		return new CachedBool(
 			false,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
@@ -237,10 +236,10 @@ 
 		$ignoreDeprecatedStatements
 	) {
 		$pid = $statement->getPropertyId()->serialize();
-		$guid = str_replace( '$', '-', $statement->getGuid() );
+		$guid = str_replace('$', '-', $statement->getGuid());
 
 		$deprecatedFilter = '';
-		if ( $ignoreDeprecatedStatements ) {
+		if ($ignoreDeprecatedStatements) {
 			$deprecatedFilter = 'MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }';
 		}
 
@@ -259,9 +258,9 @@ 
 LIMIT 10
 EOF;
 
-		$result = $this->runQuery( $query );
+		$result = $this->runQuery($query);
 
-		return $this->getOtherEntities( $result );
+		return $this->getOtherEntities($result);
 	}
 
 	/**
@@ -286,16 +285,15 @@ 
 		$dataType = $this->propertyDataTypeLookup->getDataTypeIdForProperty(
 			$snak->getPropertyId()
 		);
-		list( $value, $isFullValue ) = $this->getRdfLiteral( $dataType, $dataValue );
-		if ( $isFullValue ) {
+		list($value, $isFullValue) = $this->getRdfLiteral($dataType, $dataValue);
+		if ($isFullValue) {
 			$prefix .= 'v';
 		}
 		$path = $type === Context::TYPE_QUALIFIER ?
-			"$prefix:$pid" :
-			"prov:wasDerivedFrom/$prefix:$pid";
+			"$prefix:$pid" : "prov:wasDerivedFrom/$prefix:$pid";
 
 		$deprecatedFilter = '';
-		if ( $ignoreDeprecatedStatements ) {
+		if ($ignoreDeprecatedStatements) {
 			$deprecatedFilter = <<< EOF
   MINUS { ?otherStatement wikibase:rank wikibase:DeprecatedRank. }
 EOF;
@@ -315,9 +313,9 @@ 
 LIMIT 10
 EOF;
 
-		$result = $this->runQuery( $query );
+		$result = $this->runQuery($query);
 
-		return $this->getOtherEntities( $result );
+		return $this->getOtherEntities($result);
 	}
 
 	/**
@@ -327,8 +325,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function stringLiteral( $text ) {
-		return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"';
+	private function stringLiteral($text) {
+		return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"';
 	}
 
 	/**
@@ -338,17 +336,17 @@ 
 	 *
 	 * @return CachedEntityIds
 	 */
-	private function getOtherEntities( CachedQueryResults $results ) {
-		return new CachedEntityIds( array_map(
-			function ( $resultBindings ) {
+	private function getOtherEntities(CachedQueryResults $results) {
+		return new CachedEntityIds(array_map(
+			function($resultBindings) {
 				$entityIRI = $resultBindings['otherEntity']['value'];
-				$entityPrefixLength = strlen( $this->entityPrefix );
-				if ( substr( $entityIRI, 0, $entityPrefixLength ) === $this->entityPrefix ) {
+				$entityPrefixLength = strlen($this->entityPrefix);
+				if (substr($entityIRI, 0, $entityPrefixLength) === $this->entityPrefix) {
 					try {
 						return $this->entityIdParser->parse(
-							substr( $entityIRI, $entityPrefixLength )
+							substr($entityIRI, $entityPrefixLength)
 						);
-					} catch ( EntityIdParsingException $e ) {
+					} catch (EntityIdParsingException $e) {
 						// fall through
 					}
 				}
@@ -356,7 +354,7 @@ 
 				return null;
 			},
 			$results->getArray()['results']['bindings']
-		), $results->getMetadata() );
+		), $results->getMetadata());
 	}
 
 	// @codingStandardsIgnoreStart cyclomatic complexity of this function is too high
@@ -369,47 +367,47 @@ 
 	 * @return array the literal or IRI as a string in SPARQL syntax,
 	 * and a boolean indicating whether it refers to a full value node or not
 	 */
-	private function getRdfLiteral( $dataType, DataValue $dataValue ) {
-		switch ( $dataType ) {
+	private function getRdfLiteral($dataType, DataValue $dataValue) {
+		switch ($dataType) {
 			case 'string':
 			case 'external-id':
-				return [ $this->stringLiteral( $dataValue->getValue() ), false ];
+				return [$this->stringLiteral($dataValue->getValue()), false];
 			case 'commonsMedia':
-				$url = $this->rdfVocabulary->getMediaFileURI( $dataValue->getValue() );
-				return [ '<' . $url . '>', false ];
+				$url = $this->rdfVocabulary->getMediaFileURI($dataValue->getValue());
+				return ['<'.$url.'>', false];
 			case 'geo-shape':
-				$url = $this->rdfVocabulary->getGeoShapeURI( $dataValue->getValue() );
-				return [ '<' . $url . '>', false ];
+				$url = $this->rdfVocabulary->getGeoShapeURI($dataValue->getValue());
+				return ['<'.$url.'>', false];
 			case 'tabular-data':
-				$url = $this->rdfVocabulary->getTabularDataURI( $dataValue->getValue() );
-				return [ '<' . $url . '>', false ];
+				$url = $this->rdfVocabulary->getTabularDataURI($dataValue->getValue());
+				return ['<'.$url.'>', false];
 			case 'url':
 				$url = $dataValue->getValue();
-				if ( !preg_match( '/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url ) ) {
+				if (!preg_match('/^[^<>"{}\\\\|^`\\x00-\\x20]*$/D', $url)) {
 					// not a valid URL for SPARQL (see SPARQL spec, production 139 IRIREF)
 					// such an URL should never reach us, so just throw
-					throw new InvalidArgumentException( 'invalid URL: ' . $url );
+					throw new InvalidArgumentException('invalid URL: '.$url);
 				}
-				return [ '<' . $url . '>', false ];
+				return ['<'.$url.'>', false];
 			case 'wikibase-item':
 			case 'wikibase-property':
 				/** @var EntityIdValue $dataValue */
-				return [ 'wd:' . $dataValue->getEntityId()->getSerialization(), false ];
+				return ['wd:'.$dataValue->getEntityId()->getSerialization(), false];
 			case 'monolingualtext':
 				/** @var MonolingualTextValue $dataValue */
 				$lang = $dataValue->getLanguageCode();
-				if ( !preg_match( '/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang ) ) {
+				if (!preg_match('/^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/D', $lang)) {
 					// not a valid language tag for SPARQL (see SPARQL spec, production 145 LANGTAG)
 					// such a language tag should never reach us, so just throw
-					throw new InvalidArgumentException( 'invalid language tag: ' . $lang );
+					throw new InvalidArgumentException('invalid language tag: '.$lang);
 				}
-				return [ $this->stringLiteral( $dataValue->getText() ) . '@' . $lang, false ];
+				return [$this->stringLiteral($dataValue->getText()).'@'.$lang, false];
 			case 'globe-coordinate':
 			case 'quantity':
 			case 'time':
-				return [ 'wdv:' . $dataValue->getHash(), true ];
+				return ['wdv:'.$dataValue->getHash(), true];
 			default:
-				throw new InvalidArgumentException( 'unknown data type: ' . $dataType );
+				throw new InvalidArgumentException('unknown data type: '.$dataType);
 		}
 	}
 	// @codingStandardsIgnoreEnd
@@ -422,44 +420,44 @@ 
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 * @throws ConstraintParameterException if the $regex is invalid
 	 */
-	public function matchesRegularExpression( $text, $regex ) {
+	public function matchesRegularExpression($text, $regex) {
 		// caching wrapper around matchesRegularExpressionWithSparql
 
-		$textHash = hash( 'sha256', $text );
+		$textHash = hash('sha256', $text);
 		$cacheKey = $this->cache->makeKey(
 			'WikibaseQualityConstraints', // extension
 			'regex', // action
 			'WDQS-Java', // regex flavor
-			hash( 'sha256', $regex )
+			hash('sha256', $regex)
 		);
-		$cacheMapSize = $this->config->get( 'WBQualityConstraintsFormatCacheMapSize' );
+		$cacheMapSize = $this->config->get('WBQualityConstraintsFormatCacheMapSize');
 
 		$cacheMapArray = $this->cache->getWithSetCallback(
 			$cacheKey,
 			WANObjectCache::TTL_DAY,
-			function( $cacheMapArray ) use ( $text, $regex, $textHash, $cacheMapSize ) {
+			function($cacheMapArray) use ($text, $regex, $textHash, $cacheMapSize) {
 				// Initialize the cache map if not set
-				if ( $cacheMapArray === false ) {
+				if ($cacheMapArray === false) {
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.init';
-					$this->dataFactory->increment( $key );
+					$this->dataFactory->increment($key);
 					return [];
 				}
 
 				$key = 'wikibase.quality.constraints.regex.cache.refresh';
-				$this->dataFactory->increment( $key );
-				$cacheMap = MapCacheLRU::newFromArray( $cacheMapArray, $cacheMapSize );
-				if ( $cacheMap->has( $textHash ) ) {
+				$this->dataFactory->increment($key);
+				$cacheMap = MapCacheLRU::newFromArray($cacheMapArray, $cacheMapSize);
+				if ($cacheMap->has($textHash)) {
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.hit';
-					$this->dataFactory->increment( $key );
-					$cacheMap->get( $textHash ); // ping cache
+					$this->dataFactory->increment($key);
+					$cacheMap->get($textHash); // ping cache
 				} else {
 					$key = 'wikibase.quality.constraints.regex.cache.refresh.miss';
-					$this->dataFactory->increment( $key );
+					$this->dataFactory->increment($key);
 					try {
-						$matches = $this->matchesRegularExpressionWithSparql( $text, $regex );
-					} catch ( ConstraintParameterException $e ) {
-						$matches = $this->serializeConstraintParameterException( $e );
-					} catch ( SparqlHelperException $e ) {
+						$matches = $this->matchesRegularExpressionWithSparql($text, $regex);
+					} catch (ConstraintParameterException $e) {
+						$matches = $this->serializeConstraintParameterException($e);
+					} catch (SparqlHelperException $e) {
 						// don’t cache this
 						return $cacheMap->toArray();
 					}
@@ -483,42 +481,42 @@ 
 			]
 		);
 
-		if ( isset( $cacheMapArray[$textHash] ) ) {
+		if (isset($cacheMapArray[$textHash])) {
 			$key = 'wikibase.quality.constraints.regex.cache.hit';
-			$this->dataFactory->increment( $key );
+			$this->dataFactory->increment($key);
 			$matches = $cacheMapArray[$textHash];
-			if ( is_bool( $matches ) ) {
+			if (is_bool($matches)) {
 				return $matches;
-			} elseif ( is_array( $matches ) &&
-				$matches['type'] == ConstraintParameterException::class ) {
-				throw $this->deserializeConstraintParameterException( $matches );
+			} elseif (is_array($matches) &&
+				$matches['type'] == ConstraintParameterException::class) {
+				throw $this->deserializeConstraintParameterException($matches);
 			} else {
 				throw new MWException(
-					'Value of unknown type in object cache (' .
-					'cache key: ' . $cacheKey . ', ' .
-					'cache map key: ' . $textHash . ', ' .
-					'value type: ' . gettype( $matches ) . ')'
+					'Value of unknown type in object cache ('.
+					'cache key: '.$cacheKey.', '.
+					'cache map key: '.$textHash.', '.
+					'value type: '.gettype($matches).')'
 				);
 			}
 		} else {
 			$key = 'wikibase.quality.constraints.regex.cache.miss';
-			$this->dataFactory->increment( $key );
-			return $this->matchesRegularExpressionWithSparql( $text, $regex );
+			$this->dataFactory->increment($key);
+			return $this->matchesRegularExpressionWithSparql($text, $regex);
 		}
 	}
 
-	private function serializeConstraintParameterException( ConstraintParameterException $cpe ) {
+	private function serializeConstraintParameterException(ConstraintParameterException $cpe) {
 		return [
 			'type' => ConstraintParameterException::class,
-			'violationMessage' => $this->violationMessageSerializer->serialize( $cpe->getViolationMessage() ),
+			'violationMessage' => $this->violationMessageSerializer->serialize($cpe->getViolationMessage()),
 		];
 	}
 
-	private function deserializeConstraintParameterException( array $serialization ) {
+	private function deserializeConstraintParameterException(array $serialization) {
 		$message = $this->violationMessageDeserializer->deserialize(
 			$serialization['violationMessage']
 		);
-		return new ConstraintParameterException( $message );
+		return new ConstraintParameterException($message);
 	}
 
 	/**
@@ -532,25 +530,25 @@ 
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 * @throws ConstraintParameterException if the $regex is invalid
 	 */
-	public function matchesRegularExpressionWithSparql( $text, $regex ) {
-		$textStringLiteral = $this->stringLiteral( $text );
-		$regexStringLiteral = $this->stringLiteral( '^(?:' . $regex . ')$' );
+	public function matchesRegularExpressionWithSparql($text, $regex) {
+		$textStringLiteral = $this->stringLiteral($text);
+		$regexStringLiteral = $this->stringLiteral('^(?:'.$regex.')$');
 
 		$query = <<<EOF
 SELECT (REGEX($textStringLiteral, $regexStringLiteral) AS ?matches) {}
 EOF;
 
-		$result = $this->runQuery( $query, false );
+		$result = $this->runQuery($query, false);
 
 		$vars = $result->getArray()['results']['bindings'][0];
-		if ( array_key_exists( 'matches', $vars ) ) {
+		if (array_key_exists('matches', $vars)) {
 			// true or false ⇒ regex okay, text matches or not
 			return $vars['matches']['value'] === 'true';
 		} else {
 			// empty result: regex broken
 			throw new ConstraintParameterException(
-				( new ViolationMessage( 'wbqc-violation-message-parameter-regex' ) )
-					->withInlineCode( $regex, Role::CONSTRAINT_PARAMETER_VALUE )
+				(new ViolationMessage('wbqc-violation-message-parameter-regex'))
+					->withInlineCode($regex, Role::CONSTRAINT_PARAMETER_VALUE)
 			);
 		}
 	}
@@ -562,14 +560,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function isTimeout( $responseContent ) {
-		$timeoutRegex = implode( '|', array_map(
-			function ( $fqn ) {
-				return preg_quote( $fqn, '/' );
+	public function isTimeout($responseContent) {
+		$timeoutRegex = implode('|', array_map(
+			function($fqn) {
+				return preg_quote($fqn, '/');
 			},
-			$this->config->get( 'WBQualityConstraintsSparqlTimeoutExceptionClasses' )
-		) );
-		return (bool)preg_match( '/' . $timeoutRegex . '/', $responseContent );
+			$this->config->get('WBQualityConstraintsSparqlTimeoutExceptionClasses')
+		));
+		return (bool) preg_match('/'.$timeoutRegex.'/', $responseContent);
 	}
 
 	/**
@@ -581,17 +579,17 @@ 
 	 * @return int|boolean the max-age (in seconds)
 	 * or a plain boolean if no max-age can be determined
 	 */
-	public function getCacheMaxAge( $responseHeaders ) {
+	public function getCacheMaxAge($responseHeaders) {
 		if (
-			array_key_exists( 'x-cache-status', $responseHeaders ) &&
-			preg_match( '/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0] )
+			array_key_exists('x-cache-status', $responseHeaders) &&
+			preg_match('/^hit(?:-.*)?$/', $responseHeaders['x-cache-status'][0])
 		) {
 			$maxage = [];
 			if (
-				array_key_exists( 'cache-control', $responseHeaders ) &&
-				preg_match( '/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage )
+				array_key_exists('cache-control', $responseHeaders) &&
+				preg_match('/\bmax-age=(\d+)\b/', $responseHeaders['cache-control'][0], $maxage)
 			) {
-				return intval( $maxage[1] );
+				return intval($maxage[1]);
 			} else {
 				return true;
 			}
@@ -613,33 +611,33 @@ 
 	 * or SparlHelper::INVALID_RETRY_AFTER if there is something wrong with the format
 	 *
 	 */
-	public function getThrottling( array $responseHeaders ) {
-		if ( !array_key_exists( 'Retry-After', $responseHeaders ) ) {
+	public function getThrottling(array $responseHeaders) {
+		if (!array_key_exists('Retry-After', $responseHeaders)) {
 			return self::NO_RETRY_AFTER;
 		}
 
-		$trimmedRetryAfterValue = trim( $responseHeaders[ 'Retry-After' ] );
-		if ( empty( $trimmedRetryAfterValue ) ) {
+		$trimmedRetryAfterValue = trim($responseHeaders['Retry-After']);
+		if (empty($trimmedRetryAfterValue)) {
 			return self::EMPTY_RETRY_AFTER;
 		}
 
-		if ( is_numeric( $trimmedRetryAfterValue ) ) {
-			$delaySeconds = (int)$trimmedRetryAfterValue;
-			if ( $delaySeconds >= 0 ) {
-				return $this->getTimestampInFuture( new DateInterval( 'PT' . $delaySeconds . 'S' ) );
+		if (is_numeric($trimmedRetryAfterValue)) {
+			$delaySeconds = (int) $trimmedRetryAfterValue;
+			if ($delaySeconds >= 0) {
+				return $this->getTimestampInFuture(new DateInterval('PT'.$delaySeconds.'S'));
 			}
 		} else {
-			$return = strtotime( $responseHeaders[ 'Retry-After' ] );
-			if ( !empty( $return ) ) {
-				return new ConvertibleTimestamp( $return );
+			$return = strtotime($responseHeaders['Retry-After']);
+			if (!empty($return)) {
+				return new ConvertibleTimestamp($return);
 			}
 		}
 		return self::INVALID_RETRY_AFTER;
 	}
 
-	private function getTimestampInFuture( DateInterval $delta ) {
+	private function getTimestampInFuture(DateInterval $delta) {
 		$now = new ConvertibleTimestamp();
-		return new ConvertibleTimestamp( $now->timestamp->add( $delta ) );
+		return new ConvertibleTimestamp($now->timestamp->add($delta));
 	}
 
 	/**
@@ -653,97 +651,96 @@ 
 	 *
 	 * @throws SparqlHelperException if the query times out or some other error occurs
 	 */
-	public function runQuery( $query, $needsPrefixes = true ) {
+	public function runQuery($query, $needsPrefixes = true) {
 
-		if ( $this->throttlingLock->isLocked( self::EXPIRY_LOCK_ID ) ) {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
+		if ($this->throttlingLock->isLocked(self::EXPIRY_LOCK_ID)) {
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
 			throw new TooManySparqlRequestsException();
 		}
 
-		$endpoint = $this->config->get( 'WBQualityConstraintsSparqlEndpoint' );
-		$maxQueryTimeMillis = $this->config->get( 'WBQualityConstraintsSparqlMaxMillis' );
-		$fallbackBlockDuration = (int)$this->config->get( 'WBQualityConstraintsSparqlThrottlingFallbackDuration' );
+		$endpoint = $this->config->get('WBQualityConstraintsSparqlEndpoint');
+		$maxQueryTimeMillis = $this->config->get('WBQualityConstraintsSparqlMaxMillis');
+		$fallbackBlockDuration = (int) $this->config->get('WBQualityConstraintsSparqlThrottlingFallbackDuration');
 
-		if ( $fallbackBlockDuration < 0 ) {
-			throw new InvalidArgumentException( 'Fallback duration must be positive int but is: '.
-				$fallbackBlockDuration );
+		if ($fallbackBlockDuration < 0) {
+			throw new InvalidArgumentException('Fallback duration must be positive int but is: '.
+				$fallbackBlockDuration);
 		}
 
-		if ( $this->config->get( 'WBQualityConstraintsSparqlHasWikibaseSupport' ) ) {
+		if ($this->config->get('WBQualityConstraintsSparqlHasWikibaseSupport')) {
 			$needsPrefixes = false;
 		}
 
-		if ( $needsPrefixes ) {
-			$query = $this->prefixes . $query;
+		if ($needsPrefixes) {
+			$query = $this->prefixes.$query;
 		}
-		$query = "#wbqc\n" . $query;
+		$query = "#wbqc\n".$query;
 
-		$url = $endpoint . '?' . http_build_query(
+		$url = $endpoint.'?'.http_build_query(
 			[
 				'query' => $query,
 				'format' => 'json',
 				'maxQueryTimeMillis' => $maxQueryTimeMillis,
 			],
-			null, ini_get( 'arg_separator.output' ),
+			null, ini_get('arg_separator.output'),
 			// encode spaces with %20, not +
 			PHP_QUERY_RFC3986
 		);
 
 		$options = [
 			'method' => 'GET',
-			'timeout' => (int)round( ( $maxQueryTimeMillis + 1000 ) / 1000 ),
+			'timeout' => (int) round(($maxQueryTimeMillis + 1000) / 1000),
 			'connectTimeout' => 'default',
 			'userAgent' => $this->defaultUserAgent,
 		];
-		$request = $this->requestFactory->create( $url, $options );
-		$startTime = microtime( true );
+		$request = $this->requestFactory->create($url, $options);
+		$startTime = microtime(true);
 		$status = $request->execute();
-		$endTime = microtime( true );
+		$endTime = microtime(true);
 		$this->dataFactory->timing(
 			'wikibase.quality.constraints.sparql.timing',
-			( $endTime - $startTime ) * 1000
+			($endTime - $startTime) * 1000
 		);
 
-		if ( $request->getStatus() === self::HTTP_TOO_MANY_REQUESTS ) {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.throttling' );
-			$throttlingUntil = $this->getThrottling( $request->getResponseHeaders() );
-			if ( !( $throttlingUntil instanceof ConvertibleTimestamp ) ) {
-				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid( $request );
+		if ($request->getStatus() === self::HTTP_TOO_MANY_REQUESTS) {
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.throttling');
+			$throttlingUntil = $this->getThrottling($request->getResponseHeaders());
+			if (!($throttlingUntil instanceof ConvertibleTimestamp)) {
+				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterInvalid($request);
 				$this->throttlingLock->lock(
 					self::EXPIRY_LOCK_ID,
-					$this->getTimestampInFuture( new DateInterval( 'PT' . $fallbackBlockDuration . 'S' ) )
+					$this->getTimestampInFuture(new DateInterval('PT'.$fallbackBlockDuration.'S'))
 				);
 			} else {
-				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent( $throttlingUntil, $request );
-				$this->throttlingLock->lock( self::EXPIRY_LOCK_ID, $throttlingUntil );
+				$this->loggingHelper->logSparqlHelperTooManyRequestsRetryAfterPresent($throttlingUntil, $request);
+				$this->throttlingLock->lock(self::EXPIRY_LOCK_ID, $throttlingUntil);
 			}
 			throw new TooManySparqlRequestsException();
 		}
 
-		$maxAge = $this->getCacheMaxAge( $request->getResponseHeaders() );
-		if ( $maxAge ) {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.cached' );
+		$maxAge = $this->getCacheMaxAge($request->getResponseHeaders());
+		if ($maxAge) {
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.cached');
 		}
 
-		if ( $status->isOK() ) {
+		if ($status->isOK()) {
 			$json = $request->getContent();
-			$arr = json_decode( $json, true );
+			$arr = json_decode($json, true);
 			return new CachedQueryResults(
 				$arr,
 				Metadata::ofCachingMetadata(
 					$maxAge ?
-						CachingMetadata::ofMaximumAgeInSeconds( $maxAge ) :
-						CachingMetadata::fresh()
+						CachingMetadata::ofMaximumAgeInSeconds($maxAge) : CachingMetadata::fresh()
 				)
 			);
 		} else {
-			$this->dataFactory->increment( 'wikibase.quality.constraints.sparql.error' );
+			$this->dataFactory->increment('wikibase.quality.constraints.sparql.error');
 
 			$this->dataFactory->increment(
 				"wikibase.quality.constraints.sparql.error.http.{$request->getStatus()}"
 			);
 
-			if ( $this->isTimeout( $request->getContent() ) ) {
+			if ($this->isTimeout($request->getContent())) {
 				$this->dataFactory->increment(
 					'wikibase.quality.constraints.sparql.error.timeout'
 				);