wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/ConstraintCheck/Checker/ValueTypeChecker.php

Spacing +28 added lines, -28 removed lines

@@ -91,9 +91,9 @@ 
 	 * @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 = [];
@@ -105,8 +105,8 @@ 
 			$constraintTypeItemId
 		);
 		$parameters['class'] = array_map(
-			function( $id ) {
-				return new ItemId( $id );
+			function($id) {
+				return new ItemId($id);
 			},
 			$classes
 		);
@@ -116,19 +116,19 @@ 
 			$constraintTypeItemId
 		);
 		$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();
@@ -137,23 +137,23 @@ 
 		 * error handling:
 		 *   type of $dataValue for properties with 'Value type' constraint has to be 'wikibase-entityid'
 		 */
-		if ( !$dataValue instanceof EntityIdValue ) {
-			$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
-				->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM )
-				->withDataValueType( 'wikibase-entityid' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		if (!$dataValue instanceof EntityIdValue) {
+			$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
+				->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM)
+				->withDataValueType('wikibase-entityid');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		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 StatementListProvidingEntity ) ) {
-			$message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		if (!($item instanceof StatementListProvidingEntity)) {
+			$message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		$statements = $item->getStatements();
@@ -164,7 +164,7 @@ 
 			$classes
 		);
 
-		if ( $result->getBool() ) {
+		if ($result->getBool()) {
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
@@ -178,11 +178,11 @@ 
 			$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();
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
 		$exceptions = [];
@@ -191,7 +191,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
@@ -199,7 +199,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/Helper/RangeCheckerHelper.php

Spacing +43 added lines, -43 removed lines

@@ -53,7 +53,7 @@ 
 		$this->config = $config;
 		$this->timeParser = new IsoTimestampParser();
 		$this->timeCalculator = new TimeValueCalculator();
-		$this->timeValueComparer = new TimeValueComparer( $this->timeCalculator );
+		$this->timeValueComparer = new TimeValueComparer($this->timeCalculator);
 		$this->unitConverter = $unitConverter;
 	}
 
@@ -61,10 +61,10 @@ 
 	 * @param UnboundedQuantityValue $value
 	 * @return UnboundedQuantityValue $value converted to standard units if possible, otherwise unchanged $value.
 	 */
-	private function standardize( UnboundedQuantityValue $value ) {
-		if ( $this->unitConverter !== null ) {
-			$standard = $this->unitConverter->toStandardUnits( $value );
-			if ( $standard !== null ) {
+	private function standardize(UnboundedQuantityValue $value) {
+		if ($this->unitConverter !== null) {
+			$standard = $this->unitConverter->toStandardUnits($value);
+			if ($standard !== null) {
 				return $standard;
 			} else {
 				return $value;
@@ -86,33 +86,33 @@ 
 	 *                 when $lhs is respectively less than, equal to, or greater than $rhs.
 	 *                 (In other words, just like the “spaceship” operator <=>.)
 	 */
-	public function getComparison( DataValue $lhs = null, DataValue $rhs = null ) {
-		if ( $lhs === null || $rhs === null ) {
+	public function getComparison(DataValue $lhs = null, DataValue $rhs = null) {
+		if ($lhs === null || $rhs === null) {
 			return 0;
 		}
 
-		if ( $lhs->getType() !== $rhs->getType() ) {
-			throw new InvalidArgumentException( 'Different data value types' );
+		if ($lhs->getType() !== $rhs->getType()) {
+			throw new InvalidArgumentException('Different data value types');
 		}
 
-		switch ( $lhs->getType() ) {
+		switch ($lhs->getType()) {
 			case 'time':
 				/** @var TimeValue $lhs */
 				/** @var TimeValue $rhs */
 				'@phan-var TimeValue $lhs';
 				'@phan-var TimeValue $rhs';
-				return $this->timeValueComparer->getComparison( $lhs, $rhs );
+				return $this->timeValueComparer->getComparison($lhs, $rhs);
 			case 'quantity':
 				/** @var QuantityValue|UnboundedQuantityValue $lhs */
 				/** @var QuantityValue|UnboundedQuantityValue $rhs */
 				'@phan-var QuantityValue|UnboundedQuantityValue $lhs';
 				'@phan-var QuantityValue|UnboundedQuantityValue $rhs';
-				$lhsStandard = $this->standardize( $lhs );
-				$rhsStandard = $this->standardize( $rhs );
-				return $lhsStandard->getAmount()->compare( $rhsStandard->getAmount() );
+				$lhsStandard = $this->standardize($lhs);
+				$rhsStandard = $this->standardize($rhs);
+				return $lhsStandard->getAmount()->compare($rhsStandard->getAmount());
 		}
 
-		throw new InvalidArgumentException( 'Unsupported data value type' );
+		throw new InvalidArgumentException('Unsupported data value type');
 	}
 
 	/**
@@ -127,71 +127,71 @@ 
 	 * @throws InvalidArgumentException if the values do not both have the same, supported data value type
 	 * @return UnboundedQuantityValue
 	 */
-	public function getDifference( DataValue $minuend, DataValue $subtrahend ) {
-		if ( $minuend->getType() === 'time' && $subtrahend->getType() === 'time' ) {
-			$minuendSeconds = $this->timeCalculator->getTimestamp( $minuend );
-			$subtrahendSeconds = $this->timeCalculator->getTimestamp( $subtrahend );
+	public function getDifference(DataValue $minuend, DataValue $subtrahend) {
+		if ($minuend->getType() === 'time' && $subtrahend->getType() === 'time') {
+			$minuendSeconds = $this->timeCalculator->getTimestamp($minuend);
+			$subtrahendSeconds = $this->timeCalculator->getTimestamp($subtrahend);
 			return UnboundedQuantityValue::newFromNumber(
 				$minuendSeconds - $subtrahendSeconds,
-				$this->config->get( 'WBQualityConstraintsSecondUnit' )
+				$this->config->get('WBQualityConstraintsSecondUnit')
 			);
 		}
-		if ( $minuend->getType() === 'quantity' && $subtrahend->getType() === 'quantity' ) {
-			$minuendStandard = $this->standardize( $minuend );
-			$subtrahendStandard = $this->standardize( $subtrahend );
+		if ($minuend->getType() === 'quantity' && $subtrahend->getType() === 'quantity') {
+			$minuendStandard = $this->standardize($minuend);
+			$subtrahendStandard = $this->standardize($subtrahend);
 			$minuendValue = $minuendStandard->getAmount()->getValueFloat();
 			$subtrahendValue = $subtrahendStandard->getAmount()->getValueFloat();
 			$diff = $minuendValue - $subtrahendValue;
 			// we don’t check whether both quantities have the same standard unit –
 			// that’s the job of a different constraint type, Units (T164372)
-			return UnboundedQuantityValue::newFromNumber( $diff, $minuendStandard->getUnit() );
+			return UnboundedQuantityValue::newFromNumber($diff, $minuendStandard->getUnit());
 		}
 
-		throw new InvalidArgumentException( 'Unsupported or different data value types' );
+		throw new InvalidArgumentException('Unsupported or different data value types');
 	}
 
-	public function getDifferenceInYears( TimeValue $minuend, TimeValue $subtrahend ) {
-		if ( !preg_match( '/^([-+]\d{1,16})-(.*)$/', $minuend->getTime(), $minuendMatches ) ||
-			!preg_match( '/^([-+]\d{1,16})-(.*)$/', $subtrahend->getTime(), $subtrahendMatches )
+	public function getDifferenceInYears(TimeValue $minuend, TimeValue $subtrahend) {
+		if (!preg_match('/^([-+]\d{1,16})-(.*)$/', $minuend->getTime(), $minuendMatches) ||
+			!preg_match('/^([-+]\d{1,16})-(.*)$/', $subtrahend->getTime(), $subtrahendMatches)
 		) {
-			throw new InvalidArgumentException( 'TimeValue::getTime() did not match expected format' );
+			throw new InvalidArgumentException('TimeValue::getTime() did not match expected format');
 		}
-		$minuendYear = (float)$minuendMatches[1];
-		$subtrahendYear = (float)$subtrahendMatches[1];
+		$minuendYear = (float) $minuendMatches[1];
+		$subtrahendYear = (float) $subtrahendMatches[1];
 		$minuendRest = $minuendMatches[2];
 		$subtrahendRest = $subtrahendMatches[2];
 
 		// calculate difference of years
 		$diff = $minuendYear - $subtrahendYear;
-		if ( $minuendYear > 0.0 && $subtrahendYear < 0.0 ) {
+		if ($minuendYear > 0.0 && $subtrahendYear < 0.0) {
 			$diff -= 1.0; // there is no year 0, remove it from difference
-		} elseif ( $minuendYear < 0.0 && $subtrahendYear > 0.0 ) {
+		} elseif ($minuendYear < 0.0 && $subtrahendYear > 0.0) {
 			$diff -= -1.0; // there is no year 0, remove it from negative difference
 		}
 
 		// adjust for date within year by parsing the month-day part within the same year
-		$minuendDateValue = $this->timeParser->parse( '+0000000000001970-' . $minuendRest );
-		$subtrahendDateValue = $this->timeParser->parse( '+0000000000001970-' . $subtrahendRest );
-		$minuendDateSeconds = $this->timeCalculator->getTimestamp( $minuendDateValue );
-		$subtrahendDateSeconds = $this->timeCalculator->getTimestamp( $subtrahendDateValue );
-		if ( $minuendDateSeconds < $subtrahendDateSeconds ) {
+		$minuendDateValue = $this->timeParser->parse('+0000000000001970-'.$minuendRest);
+		$subtrahendDateValue = $this->timeParser->parse('+0000000000001970-'.$subtrahendRest);
+		$minuendDateSeconds = $this->timeCalculator->getTimestamp($minuendDateValue);
+		$subtrahendDateSeconds = $this->timeCalculator->getTimestamp($subtrahendDateValue);
+		if ($minuendDateSeconds < $subtrahendDateSeconds) {
 			// difference in the last year is actually less than one full year
 			// e. g. 1975-03-01 - 1974-09-01 is just six months
 			// (we don’t need sub-year precision in the difference, adjusting by 0.5 is enough)
 			$diff -= 0.5;
-		} elseif ( $minuendDateSeconds > $subtrahendDateSeconds ) {
+		} elseif ($minuendDateSeconds > $subtrahendDateSeconds) {
 			// difference in the last year is actually more than one full year
 			// e. g. 1975-09-01 - 1974-03-01 is 18 months
 			// (we don’t need sub-year precision in the difference, adjusting by 0.5 is enough)
 			$diff += 0.5;
 		}
 
-		$unit = $this->config->get( 'WBQualityConstraintsYearUnit' );
-		return UnboundedQuantityValue::newFromNumber( $diff, $unit );
+		$unit = $this->config->get('WBQualityConstraintsYearUnit');
+		return UnboundedQuantityValue::newFromNumber($diff, $unit);
 	}
 
-	public function isFutureTime( TimeValue $timeValue ) {
-		return $this->timeValueComparer->isFutureTime( $timeValue );
+	public function isFutureTime(TimeValue $timeValue) {
+		return $this->timeValueComparer->isFutureTime($timeValue);
 	}
 
 }

src/ConstraintCheck/Helper/TypeCheckerHelper.php

Spacing +45 added lines, -45 removed lines

@@ -80,23 +80,23 @@ 
 	 * @return bool
 	 * @throws OverflowException if $entitiesChecked exceeds the configured limit
 	 */
-	private function isSubclassOf( EntityId $comparativeClass, array $classesToCheck, &$entitiesChecked = 0 ) {
-		$maxEntities = $this->config->get( 'WBQualityConstraintsTypeCheckMaxEntities' );
+	private function isSubclassOf(EntityId $comparativeClass, array $classesToCheck, &$entitiesChecked = 0) {
+		$maxEntities = $this->config->get('WBQualityConstraintsTypeCheckMaxEntities');
 		if ( ++$entitiesChecked > $maxEntities ) {
-			throw new OverflowException( 'Too many entities to check' );
+			throw new OverflowException('Too many entities to check');
 		}
 
-		$item = $this->entityLookup->getEntity( $comparativeClass );
-		if ( !( $item instanceof StatementListProvider ) ) {
+		$item = $this->entityLookup->getEntity($comparativeClass);
+		if (!($item instanceof StatementListProvider)) {
 			return false; // lookup failed, probably because item doesn't exist
 		}
 
-		$subclassId = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+		$subclassId = $this->config->get('WBQualityConstraintsSubclassOfId');
 		/** @var Statement $statement */
-		foreach ( $item->getStatements()->getByPropertyId( new PropertyId( $subclassId ) ) as $statement ) {
+		foreach ($item->getStatements()->getByPropertyId(new PropertyId($subclassId)) as $statement) {
 			$mainSnak = $statement->getMainSnak();
 
-			if ( !( $this->hasCorrectType( $mainSnak ) ) ) {
+			if (!($this->hasCorrectType($mainSnak))) {
 				continue;
 			}
 			/** @var PropertyValueSnak $mainSnak */
@@ -106,11 +106,11 @@ 
 			'@phan-var EntityIdValue $dataValue';
 			$comparativeClass = $dataValue->getEntityId();
 
-			if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) {
+			if (in_array($comparativeClass->getSerialization(), $classesToCheck)) {
 				return true;
 			}
 
-			if ( $this->isSubclassOf( $comparativeClass, $classesToCheck, $entitiesChecked ) ) {
+			if ($this->isSubclassOf($comparativeClass, $classesToCheck, $entitiesChecked)) {
 				return true;
 			}
 		}
@@ -131,48 +131,48 @@ 
 	 * @return CachedBool
 	 * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs
 	 */
-	public function isSubclassOfWithSparqlFallback( EntityId $comparativeClass, array $classesToCheck ) {
+	public function isSubclassOfWithSparqlFallback(EntityId $comparativeClass, array $classesToCheck) {
 		try {
 			$entitiesChecked = 0;
-			$start1 = microtime( true );
-			$isSubclass = $this->isSubclassOf( $comparativeClass, $classesToCheck, $entitiesChecked );
-			$end1 = microtime( true );
+			$start1 = microtime(true);
+			$isSubclass = $this->isSubclassOf($comparativeClass, $classesToCheck, $entitiesChecked);
+			$end1 = microtime(true);
 			$this->dataFactory->timing(
 				'wikibase.quality.constraints.type.php.success.timing',
-				( $end1 - $start1 ) * 1000
+				($end1 - $start1) * 1000
 			);
 			$this->dataFactory->timing( // not really a timing, but works like one (we want percentiles etc.)
 				'wikibase.quality.constraints.type.php.success.entities',
 				$entitiesChecked
 			);
 
-			return new CachedBool( $isSubclass, Metadata::blank() );
-		} catch ( OverflowException $e ) {
-			$end1 = microtime( true );
+			return new CachedBool($isSubclass, Metadata::blank());
+		} catch (OverflowException $e) {
+			$end1 = microtime(true);
 			$this->dataFactory->timing(
 				'wikibase.quality.constraints.type.php.overflow.timing',
-				( $end1 - $start1 ) * 1000
+				($end1 - $start1) * 1000
 			);
 
-			if ( !( $this->sparqlHelper instanceof DummySparqlHelper ) ) {
+			if (!($this->sparqlHelper instanceof DummySparqlHelper)) {
 				$this->dataFactory->increment(
 					'wikibase.quality.constraints.sparql.typeFallback'
 				);
 
-				$start2 = microtime( true );
+				$start2 = microtime(true);
 				$hasType = $this->sparqlHelper->hasType(
 					$comparativeClass->getSerialization(),
 					$classesToCheck
 				);
-				$end2 = microtime( true );
+				$end2 = microtime(true);
 				$this->dataFactory->timing(
 					'wikibase.quality.constraints.type.sparql.success.timing',
-					( $end2 - $start2 ) * 1000
+					($end2 - $start2) * 1000
 				);
 
 				return $hasType;
 			} else {
-				return new CachedBool( false, Metadata::blank() );
+				return new CachedBool(false, Metadata::blank());
 			}
 		}
 	}
@@ -190,13 +190,13 @@ 
 	 * @return CachedBool
 	 * @throws SparqlHelperException if SPARQL is used and the query times out or some other error occurs
 	 */
-	public function hasClassInRelation( StatementList $statements, array $relationIds, array $classesToCheck ) {
+	public function hasClassInRelation(StatementList $statements, array $relationIds, array $classesToCheck) {
 		$metadatas = [];
 
-		foreach ( $this->getStatementsByPropertyIds( $statements, $relationIds ) as $statement ) {
+		foreach ($this->getStatementsByPropertyIds($statements, $relationIds) as $statement) {
 			$mainSnak = $statement->getMainSnak();
 
-			if ( !$this->hasCorrectType( $mainSnak ) ) {
+			if (!$this->hasCorrectType($mainSnak)) {
 				continue;
 			}
 			/** @var PropertyValueSnak $mainSnak */
@@ -206,24 +206,24 @@ 
 			'@phan-var EntityIdValue $dataValue';
 			$comparativeClass = $dataValue->getEntityId();
 
-			if ( in_array( $comparativeClass->getSerialization(), $classesToCheck ) ) {
+			if (in_array($comparativeClass->getSerialization(), $classesToCheck)) {
 				// discard $metadatas, we know this is fresh
-				return new CachedBool( true, Metadata::blank() );
+				return new CachedBool(true, Metadata::blank());
 			}
 
-			$result = $this->isSubclassOfWithSparqlFallback( $comparativeClass, $classesToCheck );
+			$result = $this->isSubclassOfWithSparqlFallback($comparativeClass, $classesToCheck);
 			$metadatas[] = $result->getMetadata();
-			if ( $result->getBool() ) {
+			if ($result->getBool()) {
 				return new CachedBool(
 					true,
-					Metadata::merge( $metadatas )
+					Metadata::merge($metadatas)
 				);
 			}
 		}
 
 		return new CachedBool(
 			false,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
@@ -232,7 +232,7 @@ 
 	 * @return bool
 	 * @phan-assert PropertyValueSnak $mainSnak
 	 */
-	private function hasCorrectType( Snak $mainSnak ) {
+	private function hasCorrectType(Snak $mainSnak) {
 		return $mainSnak instanceof PropertyValueSnak
 			&& $mainSnak->getDataValue()->getType() === 'wikibase-entityid';
 	}
@@ -249,12 +249,12 @@ 
 	) {
 		$statementArrays = [];
 
-		foreach ( $propertyIdSerializations as $propertyIdSerialization ) {
-			$propertyId = new PropertyId( $propertyIdSerialization );
-			$statementArrays[] = $statements->getByPropertyId( $propertyId )->toArray();
+		foreach ($propertyIdSerializations as $propertyIdSerialization) {
+			$propertyId = new PropertyId($propertyIdSerialization);
+			$statementArrays[] = $statements->getByPropertyId($propertyId)->toArray();
 		}
 
-		return call_user_func_array( 'array_merge', $statementArrays );
+		return call_user_func_array('array_merge', $statementArrays);
 	}
 
 	/**
@@ -266,10 +266,10 @@ 
 	 *
 	 * @return ViolationMessage
 	 */
-	public function getViolationMessage( PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation ) {
+	public function getViolationMessage(PropertyId $propertyId, EntityId $entityId, array $classes, $checker, $relation) {
 		$classes = array_map(
-			function( $itemIdSerialization ) {
-				return new ItemId( $itemIdSerialization );
+			function($itemIdSerialization) {
+				return new ItemId($itemIdSerialization);
 			},
 			$classes
 		);
@@ -281,10 +281,10 @@ 
 		// wbqc-violation-message-valueType-instance
 		// wbqc-violation-message-valueType-subclass
 		// wbqc-violation-message-valueType-instanceOrSubclass
-		return ( new ViolationMessage( 'wbqc-violation-message-' . $checker . '-' . $relation ) )
-			->withEntityId( $propertyId, Role::CONSTRAINT_PROPERTY )
-			->withEntityId( $entityId, Role::SUBJECT )
-			->withEntityIdList( $classes, Role::OBJECT );
+		return (new ViolationMessage('wbqc-violation-message-'.$checker.'-'.$relation))
+			->withEntityId($propertyId, Role::CONSTRAINT_PROPERTY)
+			->withEntityId($entityId, Role::SUBJECT)
+			->withEntityIdList($classes, Role::OBJECT);
 	}
 
 }

src/ConstraintCheck/Context/ContextCursorSerializer.php

Spacing +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
 	 * @param ContextCursor $cursor
 	 * @return array
 	 */
-	public function serialize( ContextCursor $cursor ) {
-		if ( $cursor instanceof EntityContextCursor ) {
+	public function serialize(ContextCursor $cursor) {
+		if ($cursor instanceof EntityContextCursor) {
 			return [
 				't' => '\entity',
 				'i' => $cursor->getEntityId(),
@@ -30,9 +30,9 @@ 
 			'h' => $cursor->getSnakHash(),
 		];
 
-		if ( $type === Context::TYPE_QUALIFIER || $type === Context::TYPE_REFERENCE ) {
+		if ($type === Context::TYPE_QUALIFIER || $type === Context::TYPE_REFERENCE) {
 			$serialization['P'] = $cursor->getSnakPropertyId();
-			if ( $type === Context::TYPE_REFERENCE ) {
+			if ($type === Context::TYPE_REFERENCE) {
 				/** @var ReferenceContextCursor $cursor */
 				'@phan-var ReferenceContextCursor $cursor';
 				$serialization['r'] = $cursor->getReferenceHash();

src/Api/CheckConstraintParameters.php

Spacing +52 added lines, -52 removed lines

@@ -74,19 +74,19 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$repo = WikibaseRepo::getDefaultInstance();
-		$helperFactory = $repo->getApiHelperFactory( RequestContext::getMain() );
+		$helperFactory = $repo->getApiHelperFactory(RequestContext::getMain());
 		$language = $repo->getUserLanguage();
 
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
 		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory
-			->getEntityIdFormatter( $language );
+			->getEntityIdFormatter($language);
 		$formatterOptions = new FormatterOptions();
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
 		$valueFormatterFactory = $repo->getValueFormatterFactory();
 		$dataValueFormatter = $valueFormatterFactory
-			->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions );
+			->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions);
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 		$violationMessageRenderer = new MultilingualTextViolationMessageRenderer(
 			$entityIdHtmlLinkFormatter,
@@ -126,9 +126,9 @@ 
 		StatementGuidParser $statementGuidParser,
 		IBufferingStatsdDataFactory $dataFactory
 	) {
-		parent::__construct( $main, $name, $prefix );
+		parent::__construct($main, $name, $prefix);
 
-		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter( $this );
+		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter($this);
 		$this->delegatingConstraintChecker = $delegatingConstraintChecker;
 		$this->violationMessageRenderer = $violationMessageRenderer;
 		$this->statementGuidParser = $statementGuidParser;
@@ -143,39 +143,39 @@ 
 		$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]
 					);
 				}
 			},
@@ -187,35 +187,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]
 					);
 				}
 			},
@@ -227,12 +227,12 @@ 
 	 * @param PropertyId[] $propertyIds
 	 * @param ApiResult $result
 	 */
-	private function checkPropertyIds( array $propertyIds, ApiResult $result ) {
-		foreach ( $propertyIds as $propertyId ) {
-			$result->addArrayType( $this->getResultPathForPropertyId( $propertyId ), 'assoc' );
+	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 ) {
+				->checkConstraintParametersOnPropertyId($propertyId);
+			foreach ($allConstraintExceptions as $constraintId => $constraintParameterExceptions) {
 				$this->addConstraintParameterExceptionsToResult(
 					$constraintId,
 					$constraintParameterExceptions,
@@ -246,15 +246,15 @@ 
 	 * @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 );
+				->checkConstraintParametersOnConstraintId($constraintId);
+			$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
 		}
 	}
 
@@ -262,18 +262,18 @@ 
 	 * @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();
+	private function getResultPathForConstraintId($constraintId) {
+		$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
 		'@phan-var PropertyId $propertyId';
-		return array_merge( $this->getResultPathForPropertyId( $propertyId ), [ $constraintId ] );
+		return array_merge($this->getResultPathForPropertyId($propertyId), [$constraintId]);
 	}
 
 	/**
@@ -288,8 +288,8 @@ 
 		$constraintParameterExceptions,
 		ApiResult $result
 	) {
-		$path = $this->getResultPathForConstraintId( $constraintId );
-		if ( $constraintParameterExceptions === null ) {
+		$path = $this->getResultPathForConstraintId($constraintId);
+		if ($constraintParameterExceptions === null) {
 			$result->addValue(
 				$path,
 				self::KEY_STATUS,
@@ -299,12 +299,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)
 			);
 		}
 	}
@@ -315,7 +315,7 @@ 
 	 * @param ConstraintParameterException $e
 	 * @return string[]
 	 */
-	private function formatConstraintParameterException( ConstraintParameterException $e ) {
+	private function formatConstraintParameterException(ConstraintParameterException $e) {
 		return [
 			self::KEY_MESSAGE_HTML => $this->violationMessageRenderer->render(
 				$e->getViolationMessage()
@@ -348,8 +348,8 @@ 
 		return [
 			'action=wbcheckconstraintparameters&propertyid=P247'
 				=> 'apihelp-wbcheckconstraintparameters-example-propertyid-1',
-			'action=wbcheckconstraintparameters&' .
-			'constraintid=P247$0fe1711e-4c0f-82ce-3af0-830b721d0fba|' .
+			'action=wbcheckconstraintparameters&'.
+			'constraintid=P247$0fe1711e-4c0f-82ce-3af0-830b721d0fba|'.
 			'P225$cdc71e4a-47a0-12c5-dfb3-3f6fc0b6613f'
 				=> 'apihelp-wbcheckconstraintparameters-example-constraintid-2',
 		];

src/ConstraintCheck/Checker/RangeChecker.php

Spacing +38 added lines, -38 removed lines

@@ -84,9 +84,9 @@ 
 	 * @throws ConstraintParameterException
 	 * @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 = [];
@@ -94,28 +94,28 @@ 
 
 		$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();
 
-		list( $min, $max ) = $this->parseRangeParameter(
+		list($min, $max) = $this->parseRangeParameter(
 			$constraintParameters,
 			$constraint->getConstraintTypeItemId(),
 			$dataValue->getType()
 		);
 		$parameterKey = $dataValue->getType() === 'quantity' ? 'quantity' : 'date';
-		if ( $min !== null ) {
-			$parameters['minimum_' . $parameterKey] = [ $min ];
+		if ($min !== null) {
+			$parameters['minimum_'.$parameterKey] = [$min];
 		}
-		if ( $max !== null ) {
-			$parameters['maximum_' . $parameterKey] = [ $max ];
+		if ($max !== null) {
+			$parameters['maximum_'.$parameterKey] = [$max];
 		}
 
-		if ( $this->rangeCheckerHelper->getComparison( $min, $dataValue ) > 0 ||
-			 $this->rangeCheckerHelper->getComparison( $dataValue, $max ) > 0
+		if ($this->rangeCheckerHelper->getComparison($min, $dataValue) > 0 ||
+			 $this->rangeCheckerHelper->getComparison($dataValue, $max) > 0
 		) {
 			$message = $this->getViolationMessage(
 				$context->getSnak()->getPropertyId(),
@@ -131,16 +131,16 @@ 
 
 		if (
 			$dataValue instanceof TimeValue &&
-			( $min instanceof NowValue || $max instanceof NowValue ) &&
-			$this->rangeCheckerHelper->isFutureTime( $dataValue )
+			($min instanceof NowValue || $max instanceof NowValue) &&
+			$this->rangeCheckerHelper->isFutureTime($dataValue)
 		) {
-			$dependencyMetadata = DependencyMetadata::ofFutureTime( $dataValue );
+			$dependencyMetadata = DependencyMetadata::ofFutureTime($dataValue);
 		} else {
 			$dependencyMetadata = DependencyMetadata::blank();
 		}
 
-		return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
-			->withMetadata( Metadata::ofDependencyMetadata( $dependencyMetadata ) );
+		return (new CheckResult($context, $constraint, $parameters, $status, $message))
+			->withMetadata(Metadata::ofDependencyMetadata($dependencyMetadata));
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 * @throws ConstraintParameterException if the parameter is invalid or missing
 	 * @return DataValue[] a pair of two data values, either of which may be null to signify an open range
 	 */
-	private function parseRangeParameter( array $constraintParameters, $constraintTypeItemId, $type ) {
-		switch ( $type ) {
+	private function parseRangeParameter(array $constraintParameters, $constraintTypeItemId, $type) {
+		switch ($type) {
 			case 'quantity':
 				return $this->constraintParameterParser->parseQuantityRangeParameter(
 					$constraintParameters,
@@ -166,10 +166,10 @@ 
 		}
 
 		throw new ConstraintParameterException(
-			( new ViolationMessage( 'wbqc-violation-message-value-needed-of-types-2' ) )
-				->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM )
-				->withDataValueType( 'quantity' )
-				->withDataValueType( 'time' )
+			(new ViolationMessage('wbqc-violation-message-value-needed-of-types-2'))
+				->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM)
+				->withDataValueType('quantity')
+				->withDataValueType('time')
 		);
 	}
 
@@ -181,7 +181,7 @@ 
 	 *
 	 * @return ViolationMessage
 	 */
-	private function getViolationMessage( PropertyId $predicate, DataValue $value, $min, $max ) {
+	private function getViolationMessage(PropertyId $predicate, DataValue $value, $min, $max) {
 		// possible message keys:
 		// wbqc-violation-message-range-quantity-closed
 		// wbqc-violation-message-range-quantity-leftopen
@@ -194,39 +194,39 @@ 
 		// wbqc-violation-message-range-time-rightopen
 		// wbqc-violation-message-range-time-rightopen-leftnow
 		$messageKey = 'wbqc-violation-message-range';
-		$messageKey .= '-' . $value->getType();
+		$messageKey .= '-'.$value->getType();
 		// at least one of $min, $max is set, otherwise there could be no violation
-		$messageKey .= '-' . ( $min !== null ? ( $max !== null ? 'closed' : 'rightopen' ) : 'leftopen' );
-		if ( $min instanceof NowValue ) {
+		$messageKey .= '-'.($min !== null ? ($max !== null ? 'closed' : 'rightopen') : 'leftopen');
+		if ($min instanceof NowValue) {
 			$messageKey .= '-leftnow';
-		} elseif ( $max instanceof NowValue ) {
+		} elseif ($max instanceof NowValue) {
 			$messageKey .= '-rightnow';
 		}
-		$message = ( new ViolationMessage( $messageKey ) )
-			->withEntityId( $predicate, Role::PREDICATE )
-			->withDataValue( $value, Role::OBJECT );
-		if ( $min !== null && !( $min instanceof NowValue ) ) {
-			$message = $message->withDataValue( $min, Role::OBJECT );
+		$message = (new ViolationMessage($messageKey))
+			->withEntityId($predicate, Role::PREDICATE)
+			->withDataValue($value, Role::OBJECT);
+		if ($min !== null && !($min instanceof NowValue)) {
+			$message = $message->withDataValue($min, Role::OBJECT);
 		}
-		if ( $max !== null && !( $max instanceof NowValue ) ) {
-			$message = $message->withDataValue( $max, Role::OBJECT );
+		if ($max !== null && !($max instanceof NowValue)) {
+			$message = $message->withDataValue($max, Role::OBJECT);
 		}
 		return $message;
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$exceptions = [];
 		try {
 			// we don’t have a data value here, so get the type from the property instead
 			// (the distinction between data type and data value type is irrelevant for 'quantity' and 'time')
-			$type = $this->propertyDataTypeLookup->getDataTypeIdForProperty( $constraint->getPropertyId() );
+			$type = $this->propertyDataTypeLookup->getDataTypeIdForProperty($constraint->getPropertyId());
 			$this->parseRangeParameter(
 				$constraintParameters,
 				$constraint->getConstraintTypeItemId(),
 				$type
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/CachingConstraintLookup.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @param ConstraintLookup $lookup The lookup to which all queries are delegated.
 	 */
-	public function __construct( ConstraintLookup $lookup ) {
+	public function __construct(ConstraintLookup $lookup) {
 		$this->lookup = $lookup;
 	}
 
@@ -35,10 +35,10 @@ 
 	 *
 	 * @return Constraint[]
 	 */
-	public function queryConstraintsForProperty( PropertyId $propertyId ) {
+	public function queryConstraintsForProperty(PropertyId $propertyId) {
 		$id = $propertyId->getSerialization();
-		if ( !array_key_exists( $id, $this->cache ) ) {
-			$this->cache[$id] = $this->lookup->queryConstraintsForProperty( $propertyId );
+		if (!array_key_exists($id, $this->cache)) {
+			$this->cache[$id] = $this->lookup->queryConstraintsForProperty($propertyId);
 		}
 		return $this->cache[$id];
 	}

src/ConstraintCheck/Context/ContextCursor.php

Doc Comments +1 added lines

@@ -64,6 +64,7 @@
 	 *
 	 * @param ?array $result
 	 * @param array[] &$container
+	 * @return void
 	 */
 	public function storeCheckResultInArray( ?array $result, array &$container );
 

Spacing +1 added lines, -1 removed lines

@@ -65,6 +65,6 @@
 	 * @param ?array $result
 	 * @param array[] &$container
 	 */
-	public function storeCheckResultInArray( ?array $result, array &$container );
+	public function storeCheckResultInArray(?array $result, array &$container);
 
 }

src/ConstraintCheck/Context/EntityContextCursor.php

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
 	 * @codeCoverageIgnore This method is not supported.
 	 */
 	public function getType() {
-		throw new LogicException( 'EntityContextCursor has no full associated context' );
+		throw new LogicException('EntityContextCursor has no full associated context');
 	}
 
 	public function getEntityId() {
@@ -46,35 +46,35 @@ 
 	 * @codeCoverageIgnore This method is not supported.
 	 */
 	public function getStatementPropertyId() {
-		throw new LogicException( 'EntityContextCursor has no full associated context' );
+		throw new LogicException('EntityContextCursor has no full associated context');
 	}
 
 	/**
 	 * @codeCoverageIgnore This method is not supported.
 	 */
 	public function getStatementGuid() {
-		throw new LogicException( 'EntityContextCursor has no full associated context' );
+		throw new LogicException('EntityContextCursor has no full associated context');
 	}
 
 	/**
 	 * @codeCoverageIgnore This method is not supported.
 	 */
 	public function getSnakPropertyId() {
-		throw new LogicException( 'EntityContextCursor has no full associated context' );
+		throw new LogicException('EntityContextCursor has no full associated context');
 	}
 
 	/**
 	 * @codeCoverageIgnore This method is not supported.
 	 */
 	public function getSnakHash() {
-		throw new LogicException( 'EntityContextCursor has no full associated context' );
+		throw new LogicException('EntityContextCursor has no full associated context');
 	}
 
 	/**
 	 * @codeCoverageIgnore This method is not supported.
 	 */
-	public function &getMainArray( array &$container ) {
-		throw new LogicException( 'EntityContextCursor cannot store check results' );
+	public function &getMainArray(array &$container) {
+		throw new LogicException('EntityContextCursor cannot store check results');
 	}
 
 	/**
@@ -83,14 +83,14 @@ 
 	 * @param ?array $result must be null
 	 * @param array[] &$container
 	 */
-	public function storeCheckResultInArray( ?array $result, array &$container ) {
-		if ( $result !== null ) {
-			throw new LogicException( 'EntityContextCursor cannot store check results' );
+	public function storeCheckResultInArray(?array $result, array &$container) {
+		if ($result !== null) {
+			throw new LogicException('EntityContextCursor cannot store check results');
 		}
 
 		// this ensures that the claims array is present in the $container,
 		// populating it if necessary, even though we ignore the return value
-		$this->getClaimsArray( $container );
+		$this->getClaimsArray($container);
 	}
 
 }