Inspection of "Localisation updates from https://translatewiki.ne..." - wikimedia/mediawiki-extensions-WikibaseQualityConstraints - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 54330d...d828b8 )

unknown

created 2018-02-01 21:32 UTC

Status

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -85,9 +85,9 @@  discard block
 block discarded – undo
 	 * @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 = [];
@@ -95,32 +95,32 @@  discard block
 block discarded – undo
 
 		$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->constraintParameterParser->parseRangeParameter(
+		list($min, $max) = $this->constraintParameterParser->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
 		) {
 			// at least one of $min, $max is set at this point, otherwise there could be no violation
 			$type = $dataValue->getType();
-			$openness = $min !== null ? ( $max !== null ? 'closed' : 'rightopen' ) : 'leftopen';
+			$openness = $min !== null ? ($max !== null ? 'closed' : 'rightopen') : 'leftopen';
 			// possible message keys:
 			// wbqc-violation-message-range-quantity-closed
 			// wbqc-violation-message-range-quantity-leftopen
@@ -128,14 +128,14 @@  discard block
 block discarded – undo
 			// wbqc-violation-message-range-time-closed
 			// wbqc-violation-message-range-time-leftopen
 			// wbqc-violation-message-range-time-rightopen
-			$message = ( new ViolationMessage( "wbqc-violation-message-range-$type-$openness" ) )
-				->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
-				->withDataValue( $dataValue, Role::OBJECT );
-			if ( $min !== null ) {
-				$message = $message->withDataValue( $min, Role::OBJECT );
+			$message = (new ViolationMessage("wbqc-violation-message-range-$type-$openness"))
+				->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
+				->withDataValue($dataValue, Role::OBJECT);
+			if ($min !== null) {
+				$message = $message->withDataValue($min, Role::OBJECT);
 			}
-			if ( $max !== null ) {
-				$message = $message->withDataValue( $max, Role::OBJECT );
+			if ($max !== null) {
+				$message = $message->withDataValue($max, Role::OBJECT);
 			}
 			$status = CheckResult::STATUS_VIOLATION;
 		} else {
@@ -143,22 +143,22 @@  discard block
 block discarded – undo
 			$status = CheckResult::STATUS_COMPLIANCE;
 		}
 
-		return new CheckResult( $context, $constraint, $parameters, $status, $message );
+		return new CheckResult($context, $constraint, $parameters, $status, $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->constraintParameterParser->parseRangeParameter(
 				$constraintParameters,
 				$constraint->getConstraintTypeItemId(),
 				$type
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

Please login to merge, or discard this patch.

src/ConstraintCheck/Checker/InverseChecker.php 1 patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -91,22 +91,22 @@  discard block
 block discarded – undo
 	 * @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 = [];
 		$constraintParameters = $constraint->getConstraintParameters();
 
-		$propertyId = $this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		$parameters['property'] = [ $propertyId ];
+		$propertyId = $this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		$parameters['property'] = [$propertyId];
 
 		$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();
@@ -115,19 +115,19 @@  discard block
 block discarded – undo
 		 * error handling:
 		 *   type of $dataValue for properties with 'Inverse' 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 */
 
 		$targetEntityId = $dataValue->getEntityId();
-		$targetEntity = $this->entityLookup->getEntity( $targetEntityId );
-		if ( $targetEntity === null ) {
-			$message = new ViolationMessage( 'wbqc-violation-message-target-entity-must-exist' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		$targetEntity = $this->entityLookup->getEntity($targetEntityId);
+		if ($targetEntity === null) {
+			$message = new ViolationMessage('wbqc-violation-message-target-entity-must-exist');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		$inverseStatement = $this->connectionCheckerHelper->findStatementWithPropertyAndEntityIdValue(
@@ -135,28 +135,28 @@  discard block
 block discarded – undo
 			$propertyId,
 			$context->getEntity()->getId()
 		);
-		if ( $inverseStatement !== null ) {
+		if ($inverseStatement !== null) {
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
-			$message = ( new ViolationMessage( 'wbqc-violation-message-inverse' ) )
-				->withEntityId( $targetEntityId, Role::SUBJECT )
-				->withEntityId( $propertyId, Role::PREDICATE )
-				->withEntityId( $context->getEntity()->getId(), Role::OBJECT );
+			$message = (new ViolationMessage('wbqc-violation-message-inverse'))
+				->withEntityId($targetEntityId, Role::SUBJECT)
+				->withEntityId($propertyId, Role::PREDICATE)
+				->withEntityId($context->getEntity()->getId(), Role::OBJECT);
 			$status = CheckResult::STATUS_VIOLATION;
 		}
 
-		return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
-			->withMetadata( Metadata::ofDependencyMetadata(
-				DependencyMetadata::ofEntityId( $targetEntityId ) ) );
+		return (new CheckResult($context, $constraint, $parameters, $status, $message))
+			->withMetadata(Metadata::ofDependencyMetadata(
+				DependencyMetadata::ofEntityId($targetEntityId) ));
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$exceptions = [];
 		try {
-			$this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

Please login to merge, or discard this patch.

src/ConstraintCheck/Checker/ValueTypeChecker.php 1 patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -98,37 +98,37 @@  discard block
 block discarded – undo
 	 * @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();
@@ -137,19 +137,19 @@  discard block
 block discarded – undo
 		 * 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 */
 
-		$item = $this->entityLookup->getEntity( $dataValue->getEntityId() );
+		$item = $this->entityLookup->getEntity($dataValue->getEntityId());
 
-		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();
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
 			$classes
 		);
 
-		if ( $result->getBool() ) {
+		if ($result->getBool()) {
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
@@ -174,21 +174,21 @@  discard block
 block discarded – undo
 			$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;

Please login to merge, or discard this patch.

src/ConstraintCheck/Checker/DiffWithinRangeChecker.php 1 patch

Spacing +43 added lines, -44 removed lines patch added patch discarded remove patch

@@ -84,8 +84,8 @@  discard block
 block discarded – undo
 	 * @throws ConstraintParameterException
 	 * @return array [ DataValue|null $min, DataValue|null $max, PropertyId $property, array $parameters ]
 	 */
-	private function parseConstraintParameters( Constraint $constraint ) {
-		list( $min, $max ) = $this->constraintParameterParser->parseRangeParameter(
+	private function parseConstraintParameters(Constraint $constraint) {
+		list($min, $max) = $this->constraintParameterParser->parseRangeParameter(
 			$constraint->getConstraintParameters(),
 			$constraint->getConstraintTypeItemId(),
 			'quantity'
@@ -95,15 +95,15 @@  discard block
 block discarded – undo
 			$constraint->getConstraintTypeItemId()
 		);
 
-		if ( $min !== null ) {
-			$parameters['minimum_quantity'] = [ $min ];
+		if ($min !== null) {
+			$parameters['minimum_quantity'] = [$min];
 		}
-		if ( $max !== null ) {
-			$parameters['maximum_quantity'] = [ $max ];
+		if ($max !== null) {
+			$parameters['maximum_quantity'] = [$max];
 		}
-		$parameters['property'] = [ $property ];
+		$parameters['property'] = [$property];
 
-		return [ $min, $max, $property, $parameters ];
+		return [$min, $max, $property, $parameters];
 	}
 
 	/**
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool
 	 */
-	private function rangeInYears( $min, $max ) {
-		$yearUnit = $this->config->get( 'WBQualityConstraintsYearUnit' );
+	private function rangeInYears($min, $max) {
+		$yearUnit = $this->config->get('WBQualityConstraintsYearUnit');
 
-		if ( $min !== null && $min->getUnit() === $yearUnit ) {
+		if ($min !== null && $min->getUnit() === $yearUnit) {
 			return true;
 		}
-		if ( $max !== null && $max->getUnit() === $yearUnit ) {
+		if ($max !== null && $max->getUnit() === $yearUnit) {
 			return true;
 		}
 
@@ -135,59 +135,58 @@  discard block
 block discarded – undo
 	 * @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 = [];
 
 		$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);
 		}
 
 		$minuend = $snak->getDataValue();
 
 		/** @var PropertyId $property */
-		list( $min, $max, $property, $parameters ) = $this->parseConstraintParameters( $constraint );
+		list($min, $max, $property, $parameters) = $this->parseConstraintParameters($constraint);
 
 		// checks only the first occurrence of the referenced property (this constraint implies a single value constraint on that property)
-		foreach ( $context->getSnakGroup() as $otherSnak ) {
+		foreach ($context->getSnakGroup() as $otherSnak) {
 			if (
-				!$property->equals( $otherSnak->getPropertyId() ) ||
+				!$property->equals($otherSnak->getPropertyId()) ||
 				!$otherSnak instanceof PropertyValueSnak
 			) {
 				continue;
 			}
 
 			$subtrahend = $otherSnak->getDataValue();
-			if ( $subtrahend->getType() === $minuend->getType() ) {
-				$diff = $this->rangeInYears( $min, $max ) && $minuend->getType() === 'time' ?
-					$this->rangeCheckerHelper->getDifferenceInYears( $minuend, $subtrahend ) :
-					$this->rangeCheckerHelper->getDifference( $minuend, $subtrahend );
+			if ($subtrahend->getType() === $minuend->getType()) {
+				$diff = $this->rangeInYears($min, $max) && $minuend->getType() === 'time' ?
+					$this->rangeCheckerHelper->getDifferenceInYears($minuend, $subtrahend) : $this->rangeCheckerHelper->getDifference($minuend, $subtrahend);
 
-				if ( $this->rangeCheckerHelper->getComparison( $min, $diff ) > 0 ||
-					$this->rangeCheckerHelper->getComparison( $diff, $max ) > 0
+				if ($this->rangeCheckerHelper->getComparison($min, $diff) > 0 ||
+					$this->rangeCheckerHelper->getComparison($diff, $max) > 0
 				) {
 					// at least one of $min, $max is set at this point, otherwise there could be no violation
-					$openness = $min !== null ? ( $max !== null ? '' : '-rightopen' ) : '-leftopen';
+					$openness = $min !== null ? ($max !== null ? '' : '-rightopen') : '-leftopen';
 					// possible message keys:
 					// wbqc-violation-message-diff-within-range
 					// wbqc-violation-message-diff-within-range-leftopen
 					// wbqc-violation-message-diff-within-range-rightopen
-					$message = ( new ViolationMessage( "wbqc-violation-message-diff-within-range$openness" ) )
-						->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
-						->withDataValue( $minuend, Role::OBJECT )
-						->withEntityId( $otherSnak->getPropertyId(), Role::PREDICATE )
-						->withDataValue( $subtrahend, Role::OBJECT );
-					if ( $min !== null ) {
-						$message = $message->withDataValue( $min, Role::OBJECT );
+					$message = (new ViolationMessage("wbqc-violation-message-diff-within-range$openness"))
+						->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
+						->withDataValue($minuend, Role::OBJECT)
+						->withEntityId($otherSnak->getPropertyId(), Role::PREDICATE)
+						->withDataValue($subtrahend, Role::OBJECT);
+					if ($min !== null) {
+						$message = $message->withDataValue($min, Role::OBJECT);
 					}
-					if ( $max !== null ) {
-						$message = $message->withDataValue( $max, Role::OBJECT );
+					if ($max !== null) {
+						$message = $message->withDataValue($max, Role::OBJECT);
 					}
 					$status = CheckResult::STATUS_VIOLATION;
 				} else {
@@ -195,19 +194,19 @@  discard block
 block discarded – undo
 					$status = CheckResult::STATUS_COMPLIANCE;
 				}
 			} else {
-				$message = new ViolationMessage( 'wbqc-violation-message-diff-within-range-must-have-equal-types' );
+				$message = new ViolationMessage('wbqc-violation-message-diff-within-range-must-have-equal-types');
 				$status = CheckResult::STATUS_VIOLATION;
 			}
 
-			return new CheckResult( $context, $constraint, $parameters, $status, $message );
+			return new CheckResult($context, $constraint, $parameters, $status, $message);
 		}
 
-		$message = new ViolationMessage( 'wbqc-violation-message-diff-within-range-property-must-exist' );
+		$message = new ViolationMessage('wbqc-violation-message-diff-within-range-property-must-exist');
 		$status = CheckResult::STATUS_VIOLATION;
-		return new CheckResult( $context, $constraint, $parameters, $status, $message );
+		return new CheckResult($context, $constraint, $parameters, $status, $message);
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$exceptions = [];
 		try {
@@ -216,12 +215,12 @@  discard block
 block discarded – undo
 				$constraint->getConstraintTypeItemId(),
 				'quantity'
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
-			$this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
-		} catch ( ConstraintParameterException $e ) {
+			$this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

Please login to merge, or discard this patch.

		@@ -85,9 +85,9 @@ discard block
		block discarded – undo
85	85	* @throws ConstraintParameterException
86	86	* @return CheckResult
87	87	*/
88		- public function checkConstraint( Context $context, Constraint $constraint ) {
89		- if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
90		- return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
	88	+ public function checkConstraint(Context $context, Constraint $constraint) {
	89	+ if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
	90	+ return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
91	91	}
92	92
93	93	$parameters = [];
		@@ -95,32 +95,32 @@ discard block
		block discarded – undo
95	95
96	96	$snak = $context->getSnak();
97	97
98		- if ( !$snak instanceof PropertyValueSnak ) {
	98	+ if (!$snak instanceof PropertyValueSnak) {
99	99	// nothing to check
100		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
	100	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
101	101	}
102	102
103	103	$dataValue = $snak->getDataValue();
104	104
105		- list( $min, $max ) = $this->constraintParameterParser->parseRangeParameter(
	105	+ list($min, $max) = $this->constraintParameterParser->parseRangeParameter(
106	106	$constraintParameters,
107	107	$constraint->getConstraintTypeItemId(),
108	108	$dataValue->getType()
109	109	);
110	110	$parameterKey = $dataValue->getType() === 'quantity' ? 'quantity' : 'date';
111		- if ( $min !== null ) {
112		- $parameters['minimum_' . $parameterKey] = [ $min ];
	111	+ if ($min !== null) {
	112	+ $parameters['minimum_'.$parameterKey] = [$min];
113	113	}
114		- if ( $max !== null ) {
115		- $parameters['maximum_' . $parameterKey] = [ $max ];
	114	+ if ($max !== null) {
	115	+ $parameters['maximum_'.$parameterKey] = [$max];
116	116	}
117	117
118		- if ( $this->rangeCheckerHelper->getComparison( $min, $dataValue ) > 0 \|\|
119		- $this->rangeCheckerHelper->getComparison( $dataValue, $max ) > 0
	118	+ if ($this->rangeCheckerHelper->getComparison($min, $dataValue) > 0 \|\|
	119	+ $this->rangeCheckerHelper->getComparison($dataValue, $max) > 0
120	120	) {
121	121	// at least one of $min, $max is set at this point, otherwise there could be no violation
122	122	$type = $dataValue->getType();
123		- $openness = $min !== null ? ( $max !== null ? 'closed' : 'rightopen' ) : 'leftopen';
	123	+ $openness = $min !== null ? ($max !== null ? 'closed' : 'rightopen') : 'leftopen';
124	124	// possible message keys:
125	125	// wbqc-violation-message-range-quantity-closed
126	126	// wbqc-violation-message-range-quantity-leftopen
		@@ -128,14 +128,14 @@ discard block
		block discarded – undo
128	128	// wbqc-violation-message-range-time-closed
129	129	// wbqc-violation-message-range-time-leftopen
130	130	// wbqc-violation-message-range-time-rightopen
131		- $message = ( new ViolationMessage( "wbqc-violation-message-range-$type-$openness" ) )
132		- ->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
133		- ->withDataValue( $dataValue, Role::OBJECT );
134		- if ( $min !== null ) {
135		- $message = $message->withDataValue( $min, Role::OBJECT );
	131	+ $message = (new ViolationMessage("wbqc-violation-message-range-$type-$openness"))
	132	+ ->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
	133	+ ->withDataValue($dataValue, Role::OBJECT);
	134	+ if ($min !== null) {
	135	+ $message = $message->withDataValue($min, Role::OBJECT);
136	136	}
137		- if ( $max !== null ) {
138		- $message = $message->withDataValue( $max, Role::OBJECT );
	137	+ if ($max !== null) {
	138	+ $message = $message->withDataValue($max, Role::OBJECT);
139	139	}
140	140	$status = CheckResult::STATUS_VIOLATION;
141	141	} else {
		@@ -143,22 +143,22 @@ discard block
		block discarded – undo
143	143	$status = CheckResult::STATUS_COMPLIANCE;
144	144	}
145	145
146		- return new CheckResult( $context, $constraint, $parameters, $status, $message );
	146	+ return new CheckResult($context, $constraint, $parameters, $status, $message);
147	147	}
148	148
149		- public function checkConstraintParameters( Constraint $constraint ) {
	149	+ public function checkConstraintParameters(Constraint $constraint) {
150	150	$constraintParameters = $constraint->getConstraintParameters();
151	151	$exceptions = [];
152	152	try {
153	153	// we don’t have a data value here, so get the type from the property instead
154	154	// (the distinction between data type and data value type is irrelevant for 'quantity' and 'time')
155		- $type = $this->propertyDataTypeLookup->getDataTypeIdForProperty( $constraint->getPropertyId() );
	155	+ $type = $this->propertyDataTypeLookup->getDataTypeIdForProperty($constraint->getPropertyId());
156	156	$this->constraintParameterParser->parseRangeParameter(
157	157	$constraintParameters,
158	158	$constraint->getConstraintTypeItemId(),
159	159	$type
160	160	);
161		- } catch ( ConstraintParameterException $e ) {
	161	+ } catch (ConstraintParameterException $e) {
162	162	$exceptions[] = $e;
163	163	}
164	164	return $exceptions;

		@@ -91,22 +91,22 @@ discard block
		block discarded – undo
91	91	* @throws ConstraintParameterException
92	92	* @return CheckResult
93	93	*/
94		- public function checkConstraint( Context $context, Constraint $constraint ) {
95		- if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
96		- return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
	94	+ public function checkConstraint(Context $context, Constraint $constraint) {
	95	+ if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
	96	+ return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
97	97	}
98	98
99	99	$parameters = [];
100	100	$constraintParameters = $constraint->getConstraintParameters();
101	101
102		- $propertyId = $this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
103		- $parameters['property'] = [ $propertyId ];
	102	+ $propertyId = $this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
	103	+ $parameters['property'] = [$propertyId];
104	104
105	105	$snak = $context->getSnak();
106	106
107		- if ( !$snak instanceof PropertyValueSnak ) {
	107	+ if (!$snak instanceof PropertyValueSnak) {
108	108	// nothing to check
109		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
	109	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
110	110	}
111	111
112	112	$dataValue = $snak->getDataValue();
		@@ -115,19 +115,19 @@ discard block
		block discarded – undo
115	115	* error handling:
116	116	* type of $dataValue for properties with 'Inverse' constraint has to be 'wikibase-entityid'
117	117	*/
118		- if ( $dataValue->getType() !== 'wikibase-entityid' ) {
119		- $message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
120		- ->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM )
121		- ->withDataValueType( 'wikibase-entityid' );
122		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
	118	+ if ($dataValue->getType() !== 'wikibase-entityid') {
	119	+ $message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
	120	+ ->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM)
	121	+ ->withDataValueType('wikibase-entityid');
	122	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
123	123	}
124	124	/** @var EntityIdValue $dataValue */
125	125
126	126	$targetEntityId = $dataValue->getEntityId();
127		- $targetEntity = $this->entityLookup->getEntity( $targetEntityId );
128		- if ( $targetEntity === null ) {
129		- $message = new ViolationMessage( 'wbqc-violation-message-target-entity-must-exist' );
130		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
	127	+ $targetEntity = $this->entityLookup->getEntity($targetEntityId);
	128	+ if ($targetEntity === null) {
	129	+ $message = new ViolationMessage('wbqc-violation-message-target-entity-must-exist');
	130	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
131	131	}
132	132
133	133	$inverseStatement = $this->connectionCheckerHelper->findStatementWithPropertyAndEntityIdValue(
		@@ -135,28 +135,28 @@ discard block
		block discarded – undo
135	135	$propertyId,
136	136	$context->getEntity()->getId()
137	137	);
138		- if ( $inverseStatement !== null ) {
	138	+ if ($inverseStatement !== null) {
139	139	$message = null;
140	140	$status = CheckResult::STATUS_COMPLIANCE;
141	141	} else {
142		- $message = ( new ViolationMessage( 'wbqc-violation-message-inverse' ) )
143		- ->withEntityId( $targetEntityId, Role::SUBJECT )
144		- ->withEntityId( $propertyId, Role::PREDICATE )
145		- ->withEntityId( $context->getEntity()->getId(), Role::OBJECT );
	142	+ $message = (new ViolationMessage('wbqc-violation-message-inverse'))
	143	+ ->withEntityId($targetEntityId, Role::SUBJECT)
	144	+ ->withEntityId($propertyId, Role::PREDICATE)
	145	+ ->withEntityId($context->getEntity()->getId(), Role::OBJECT);
146	146	$status = CheckResult::STATUS_VIOLATION;
147	147	}
148	148
149		- return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
150		- ->withMetadata( Metadata::ofDependencyMetadata(
151		- DependencyMetadata::ofEntityId( $targetEntityId ) ) );
	149	+ return (new CheckResult($context, $constraint, $parameters, $status, $message))
	150	+ ->withMetadata(Metadata::ofDependencyMetadata(
	151	+ DependencyMetadata::ofEntityId($targetEntityId) ));
152	152	}
153	153
154		- public function checkConstraintParameters( Constraint $constraint ) {
	154	+ public function checkConstraintParameters(Constraint $constraint) {
155	155	$constraintParameters = $constraint->getConstraintParameters();
156	156	$exceptions = [];
157	157	try {
158		- $this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
159		- } catch ( ConstraintParameterException $e ) {
	158	+ $this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
	159	+ } catch (ConstraintParameterException $e) {
160	160	$exceptions[] = $e;
161	161	}
162	162	return $exceptions;

		@@ -98,37 +98,37 @@ discard block
		block discarded – undo
98	98	* @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs
99	99	* @return CheckResult
100	100	*/
101		- public function checkConstraint( Context $context, Constraint $constraint ) {
102		- if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
103		- return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
	101	+ public function checkConstraint(Context $context, Constraint $constraint) {
	102	+ if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
	103	+ return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
104	104	}
105	105
106	106	$parameters = [];
107	107	$constraintParameters = $constraint->getConstraintParameters();
108	108
109		- $classes = $this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
	109	+ $classes = $this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId());
110	110	$parameters['class'] = array_map(
111		- function( $id ) {
112		- return new ItemId( $id );
	111	+ function($id) {
	112	+ return new ItemId($id);
113	113	},
114	114	$classes
115	115	);
116	116
117		- $relation = $this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
	117	+ $relation = $this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId());
118	118	$relationIds = [];
119		- if ( $relation === 'instance' \|\| $relation === 'instanceOrSubclass' ) {
120		- $relationIds[] = $this->config->get( 'WBQualityConstraintsInstanceOfId' );
	119	+ if ($relation === 'instance' \|\| $relation === 'instanceOrSubclass') {
	120	+ $relationIds[] = $this->config->get('WBQualityConstraintsInstanceOfId');
121	121	}
122		- if ( $relation === 'subclass' \|\| $relation === 'instanceOrSubclass' ) {
123		- $relationIds[] = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
	122	+ if ($relation === 'subclass' \|\| $relation === 'instanceOrSubclass') {
	123	+ $relationIds[] = $this->config->get('WBQualityConstraintsSubclassOfId');
124	124	}
125		- $parameters['relation'] = [ $relation ];
	125	+ $parameters['relation'] = [$relation];
126	126
127	127	$snak = $context->getSnak();
128	128
129		- if ( !$snak instanceof PropertyValueSnak ) {
	129	+ if (!$snak instanceof PropertyValueSnak) {
130	130	// nothing to check
131		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
	131	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
132	132	}
133	133
134	134	$dataValue = $snak->getDataValue();
		@@ -137,19 +137,19 @@ discard block
		block discarded – undo
137	137	* error handling:
138	138	* type of $dataValue for properties with 'Value type' constraint has to be 'wikibase-entityid'
139	139	*/
140		- if ( $dataValue->getType() !== 'wikibase-entityid' ) {
141		- $message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
142		- ->withEntityId( new ItemId( $constraint->getConstraintTypeItemId() ), Role::CONSTRAINT_TYPE_ITEM )
143		- ->withDataValueType( 'wikibase-entityid' );
144		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
	140	+ if ($dataValue->getType() !== 'wikibase-entityid') {
	141	+ $message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
	142	+ ->withEntityId(new ItemId($constraint->getConstraintTypeItemId()), Role::CONSTRAINT_TYPE_ITEM)
	143	+ ->withDataValueType('wikibase-entityid');
	144	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
145	145	}
146	146	/** @var EntityIdValue $dataValue */
147	147
148		- $item = $this->entityLookup->getEntity( $dataValue->getEntityId() );
	148	+ $item = $this->entityLookup->getEntity($dataValue->getEntityId());
149	149
150		- if ( !( $item instanceof StatementListProvider ) ) {
151		- $message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' );
152		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
	150	+ if (!($item instanceof StatementListProvider)) {
	151	+ $message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist');
	152	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
153	153	}
154	154
155	155	$statements = $item->getStatements();
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	$classes
161	161	);
162	162
163		- if ( $result->getBool() ) {
	163	+ if ($result->getBool()) {
164	164	$message = null;
165	165	$status = CheckResult::STATUS_COMPLIANCE;
166	166	} else {
		@@ -174,21 +174,21 @@ discard block
		block discarded – undo
174	174	$status = CheckResult::STATUS_VIOLATION;
175	175	}
176	176
177		- return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
178		- ->withMetadata( $result->getMetadata() );
	177	+ return (new CheckResult($context, $constraint, $parameters, $status, $message))
	178	+ ->withMetadata($result->getMetadata());
179	179	}
180	180
181		- public function checkConstraintParameters( Constraint $constraint ) {
	181	+ public function checkConstraintParameters(Constraint $constraint) {
182	182	$constraintParameters = $constraint->getConstraintParameters();
183	183	$exceptions = [];
184	184	try {
185		- $this->constraintParameterParser->parseClassParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
186		- } catch ( ConstraintParameterException $e ) {
	185	+ $this->constraintParameterParser->parseClassParameter($constraintParameters, $constraint->getConstraintTypeItemId());
	186	+ } catch (ConstraintParameterException $e) {
187	187	$exceptions[] = $e;
188	188	}
189	189	try {
190		- $this->constraintParameterParser->parseRelationParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
191		- } catch ( ConstraintParameterException $e ) {
	190	+ $this->constraintParameterParser->parseRelationParameter($constraintParameters, $constraint->getConstraintTypeItemId());
	191	+ } catch (ConstraintParameterException $e) {
192	192	$exceptions[] = $e;
193	193	}
194	194	return $exceptions;

		@@ -84,8 +84,8 @@ discard block
		block discarded – undo
84	84	* @throws ConstraintParameterException
85	85	* @return array [ DataValue\|null $min, DataValue\|null $max, PropertyId $property, array $parameters ]
86	86	*/
87		- private function parseConstraintParameters( Constraint $constraint ) {
88		- list( $min, $max ) = $this->constraintParameterParser->parseRangeParameter(
	87	+ private function parseConstraintParameters(Constraint $constraint) {
	88	+ list($min, $max) = $this->constraintParameterParser->parseRangeParameter(
89	89	$constraint->getConstraintParameters(),
90	90	$constraint->getConstraintTypeItemId(),
91	91	'quantity'
		@@ -95,15 +95,15 @@ discard block
		block discarded – undo
95	95	$constraint->getConstraintTypeItemId()
96	96	);
97	97
98		- if ( $min !== null ) {
99		- $parameters['minimum_quantity'] = [ $min ];
	98	+ if ($min !== null) {
	99	+ $parameters['minimum_quantity'] = [$min];
100	100	}
101		- if ( $max !== null ) {
102		- $parameters['maximum_quantity'] = [ $max ];
	101	+ if ($max !== null) {
	102	+ $parameters['maximum_quantity'] = [$max];
103	103	}
104		- $parameters['property'] = [ $property ];
	104	+ $parameters['property'] = [$property];
105	105
106		- return [ $min, $max, $property, $parameters ];
	106	+ return [$min, $max, $property, $parameters];
107	107	}
108	108
109	109	/**
		@@ -113,13 +113,13 @@ discard block
		block discarded – undo
113	113	*
114	114	* @return bool
115	115	*/
116		- private function rangeInYears( $min, $max ) {
117		- $yearUnit = $this->config->get( 'WBQualityConstraintsYearUnit' );
	116	+ private function rangeInYears($min, $max) {
	117	+ $yearUnit = $this->config->get('WBQualityConstraintsYearUnit');
118	118
119		- if ( $min !== null && $min->getUnit() === $yearUnit ) {
	119	+ if ($min !== null && $min->getUnit() === $yearUnit) {
120	120	return true;
121	121	}
122		- if ( $max !== null && $max->getUnit() === $yearUnit ) {
	122	+ if ($max !== null && $max->getUnit() === $yearUnit) {
123	123	return true;
124	124	}
125	125
		@@ -135,59 +135,58 @@ discard block
		block discarded – undo
135	135	* @throws ConstraintParameterException
136	136	* @return CheckResult
137	137	*/
138		- public function checkConstraint( Context $context, Constraint $constraint ) {
139		- if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
140		- return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
	138	+ public function checkConstraint(Context $context, Constraint $constraint) {
	139	+ if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
	140	+ return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
141	141	}
142	142
143	143	$parameters = [];
144	144
145	145	$snak = $context->getSnak();
146	146
147		- if ( !$snak instanceof PropertyValueSnak ) {
	147	+ if (!$snak instanceof PropertyValueSnak) {
148	148	// nothing to check
149		- return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
	149	+ return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
150	150	}
151	151
152	152	$minuend = $snak->getDataValue();
153	153
154	154	/** @var PropertyId $property */
155		- list( $min, $max, $property, $parameters ) = $this->parseConstraintParameters( $constraint );
	155	+ list($min, $max, $property, $parameters) = $this->parseConstraintParameters($constraint);
156	156
157	157	// checks only the first occurrence of the referenced property (this constraint implies a single value constraint on that property)
158		- foreach ( $context->getSnakGroup() as $otherSnak ) {
	158	+ foreach ($context->getSnakGroup() as $otherSnak) {
159	159	if (
160		- !$property->equals( $otherSnak->getPropertyId() ) \|\|
	160	+ !$property->equals($otherSnak->getPropertyId()) \|\|
161	161	!$otherSnak instanceof PropertyValueSnak
162	162	) {
163	163	continue;
164	164	}
165	165
166	166	$subtrahend = $otherSnak->getDataValue();
167		- if ( $subtrahend->getType() === $minuend->getType() ) {
168		- $diff = $this->rangeInYears( $min, $max ) && $minuend->getType() === 'time' ?
169		- $this->rangeCheckerHelper->getDifferenceInYears( $minuend, $subtrahend ) :
170		- $this->rangeCheckerHelper->getDifference( $minuend, $subtrahend );
	167	+ if ($subtrahend->getType() === $minuend->getType()) {
	168	+ $diff = $this->rangeInYears($min, $max) && $minuend->getType() === 'time' ?
	169	+ $this->rangeCheckerHelper->getDifferenceInYears($minuend, $subtrahend) : $this->rangeCheckerHelper->getDifference($minuend, $subtrahend);
171	170
172		- if ( $this->rangeCheckerHelper->getComparison( $min, $diff ) > 0 \|\|
173		- $this->rangeCheckerHelper->getComparison( $diff, $max ) > 0
	171	+ if ($this->rangeCheckerHelper->getComparison($min, $diff) > 0 \|\|
	172	+ $this->rangeCheckerHelper->getComparison($diff, $max) > 0
174	173	) {
175	174	// at least one of $min, $max is set at this point, otherwise there could be no violation
176		- $openness = $min !== null ? ( $max !== null ? '' : '-rightopen' ) : '-leftopen';
	175	+ $openness = $min !== null ? ($max !== null ? '' : '-rightopen') : '-leftopen';
177	176	// possible message keys:
178	177	// wbqc-violation-message-diff-within-range
179	178	// wbqc-violation-message-diff-within-range-leftopen
180	179	// wbqc-violation-message-diff-within-range-rightopen
181		- $message = ( new ViolationMessage( "wbqc-violation-message-diff-within-range$openness" ) )
182		- ->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
183		- ->withDataValue( $minuend, Role::OBJECT )
184		- ->withEntityId( $otherSnak->getPropertyId(), Role::PREDICATE )
185		- ->withDataValue( $subtrahend, Role::OBJECT );
186		- if ( $min !== null ) {
187		- $message = $message->withDataValue( $min, Role::OBJECT );
	180	+ $message = (new ViolationMessage("wbqc-violation-message-diff-within-range$openness"))
	181	+ ->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
	182	+ ->withDataValue($minuend, Role::OBJECT)
	183	+ ->withEntityId($otherSnak->getPropertyId(), Role::PREDICATE)
	184	+ ->withDataValue($subtrahend, Role::OBJECT);
	185	+ if ($min !== null) {
	186	+ $message = $message->withDataValue($min, Role::OBJECT);
188	187	}
189		- if ( $max !== null ) {
190		- $message = $message->withDataValue( $max, Role::OBJECT );
	188	+ if ($max !== null) {
	189	+ $message = $message->withDataValue($max, Role::OBJECT);
191	190	}
192	191	$status = CheckResult::STATUS_VIOLATION;
193	192	} else {
		@@ -195,19 +194,19 @@ discard block
		block discarded – undo
195	194	$status = CheckResult::STATUS_COMPLIANCE;
196	195	}
197	196	} else {
198		- $message = new ViolationMessage( 'wbqc-violation-message-diff-within-range-must-have-equal-types' );
	197	+ $message = new ViolationMessage('wbqc-violation-message-diff-within-range-must-have-equal-types');
199	198	$status = CheckResult::STATUS_VIOLATION;
200	199	}
201	200
202		- return new CheckResult( $context, $constraint, $parameters, $status, $message );
	201	+ return new CheckResult($context, $constraint, $parameters, $status, $message);
203	202	}
204	203
205		- $message = new ViolationMessage( 'wbqc-violation-message-diff-within-range-property-must-exist' );
	204	+ $message = new ViolationMessage('wbqc-violation-message-diff-within-range-property-must-exist');
206	205	$status = CheckResult::STATUS_VIOLATION;
207		- return new CheckResult( $context, $constraint, $parameters, $status, $message );
	206	+ return new CheckResult($context, $constraint, $parameters, $status, $message);
208	207	}
209	208
210		- public function checkConstraintParameters( Constraint $constraint ) {
	209	+ public function checkConstraintParameters(Constraint $constraint) {
211	210	$constraintParameters = $constraint->getConstraintParameters();
212	211	$exceptions = [];
213	212	try {
		@@ -216,12 +215,12 @@ discard block
		block discarded – undo
216	215	$constraint->getConstraintTypeItemId(),
217	216	'quantity'
218	217	);
219		- } catch ( ConstraintParameterException $e ) {
	218	+ } catch (ConstraintParameterException $e) {
220	219	$exceptions[] = $e;
221	220	}
222	221	try {
223		- $this->constraintParameterParser->parsePropertyParameter( $constraintParameters, $constraint->getConstraintTypeItemId() );
224		- } catch ( ConstraintParameterException $e ) {
	222	+ $this->constraintParameterParser->parsePropertyParameter($constraintParameters, $constraint->getConstraintTypeItemId());
	223	+ } catch (ConstraintParameterException $e) {
225	224	$exceptions[] = $e;
226	225	}
227	226	return $exceptions;

wikimedia / mediawiki-extensions-WikibaseQualityConstraints

Push — master ( 54330d...d828b8 )

Status

Category

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

Spacing +43 added lines, -44 removed lines patch added patch discarded remove patch