wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/ConstraintCheck/Message/ViolationMessageSerializer.php

Spacing +28 added lines, -28 removed lines

@@ -19,26 +19,26 @@ 
  */
 class ViolationMessageSerializer implements Serializer {
 
-	private function abbreviateViolationMessageKey( $fullMessageKey ) {
-		return substr( $fullMessageKey, strlen( ViolationMessage::MESSAGE_KEY_PREFIX ) );
+	private function abbreviateViolationMessageKey($fullMessageKey) {
+		return substr($fullMessageKey, strlen(ViolationMessage::MESSAGE_KEY_PREFIX));
 	}
 
 	/**
 	 * @param ViolationMessage $object
 	 * @return array
 	 */
-	public function serialize( $object ) {
+	public function serialize($object) {
 		/** @var ViolationMessage $object */
-		Assert::parameterType( ViolationMessage::class, $object, '$object' );
+		Assert::parameterType(ViolationMessage::class, $object, '$object');
 
 		$arguments = $object->getArguments();
 		$serializedArguments = [];
-		foreach ( $arguments as $argument ) {
-			$serializedArguments[] = $this->serializeArgument( $argument );
+		foreach ($arguments as $argument) {
+			$serializedArguments[] = $this->serializeArgument($argument);
 		}
 
 		return [
-			'k' => $this->abbreviateViolationMessageKey( $object->getMessageKey() ),
+			'k' => $this->abbreviateViolationMessageKey($object->getMessageKey()),
 			'a' => $serializedArguments,
 		];
 	}
@@ -47,7 +47,7 @@ 
 	 * @param array $argument element of ViolationMessage::getArguments()
 	 * @return array [ 't' => ViolationMessage::TYPE_*, 'v' => serialized value, 'r' => $role ]
 	 */
-	private function serializeArgument( array $argument ) {
+	private function serializeArgument(array $argument) {
 		$methods = [
 			ViolationMessage::TYPE_ENTITY_ID => 'serializeEntityId',
 			ViolationMessage::TYPE_ENTITY_ID_LIST => 'serializeEntityIdList',
@@ -66,12 +66,12 @@ 
 		$value = $argument['value'];
 		$role = $argument['role'];
 
-		if ( array_key_exists( $type, $methods ) ) {
+		if (array_key_exists($type, $methods)) {
 			$method = $methods[$type];
-			$serializedValue = $this->$method( $value );
+			$serializedValue = $this->$method($value);
 		} else {
 			throw new InvalidArgumentException(
-				'Unknown ViolationMessage argument type ' . $type . '!'
+				'Unknown ViolationMessage argument type '.$type.'!'
 			);
 		}
 
@@ -88,8 +88,8 @@ 
 	 * @param string $string any value that shall simply be serialized to itself
 	 * @return string that same value, unchanged
 	 */
-	private function serializeStringByIdentity( $string ) {
-		Assert::parameterType( 'string', $string, '$string' );
+	private function serializeStringByIdentity($string) {
+		Assert::parameterType('string', $string, '$string');
 		return $string;
 	}
 
@@ -97,7 +97,7 @@ 
 	 * @param EntityId $entityId
 	 * @return string entity ID serialization
 	 */
-	private function serializeEntityId( EntityId $entityId ) {
+	private function serializeEntityId(EntityId $entityId) {
 		return $entityId->getSerialization();
 	}
 
@@ -105,8 +105,8 @@ 
 	 * @param EntityId[] $entityIdList
 	 * @return string[] entity ID serializations
 	 */
-	private function serializeEntityIdList( array $entityIdList ) {
-		return array_map( [ $this, 'serializeEntityId' ], $entityIdList );
+	private function serializeEntityIdList(array $entityIdList) {
+		return array_map([$this, 'serializeEntityId'], $entityIdList);
 	}
 
 	/**
@@ -114,10 +114,10 @@ 
 	 * @return string entity ID serialization, '::somevalue', or '::novalue'
 	 * (according to EntityId::PATTERN, entity ID serializations can never begin with two colons)
 	 */
-	private function serializeItemIdSnakValue( ItemIdSnakValue $value ) {
-		switch ( true ) {
+	private function serializeItemIdSnakValue(ItemIdSnakValue $value) {
+		switch (true) {
 			case $value->isValue():
-				return $this->serializeEntityId( $value->getItemId() );
+				return $this->serializeEntityId($value->getItemId());
 			case $value->isSomeValue():
 				return '::somevalue';
 			case $value->isNoValue():
@@ -135,15 +135,15 @@ 
 	 * @param ItemIdSnakValue[] $valueList
 	 * @return string[] array of entity ID serializations, '::somevalue's or '::novalue's
 	 */
-	private function serializeItemIdSnakValueList( array $valueList ) {
-		return array_map( [ $this, 'serializeItemIdSnakValue' ], $valueList );
+	private function serializeItemIdSnakValueList(array $valueList) {
+		return array_map([$this, 'serializeItemIdSnakValue'], $valueList);
 	}
 
 	/**
 	 * @param DataValue $dataValue
 	 * @return array the data value in array form
 	 */
-	private function serializeDataValue( DataValue $dataValue ) {
+	private function serializeDataValue(DataValue $dataValue) {
 		return $dataValue->toArray();
 	}
 
@@ -151,8 +151,8 @@ 
 	 * @param string $scope one of the Context::TYPE_* constants
 	 * @return string the abbreviated scope
 	 */
-	private function serializeConstraintScope( $scope ) {
-		switch ( $scope ) {
+	private function serializeConstraintScope($scope) {
+		switch ($scope) {
 			case Context::TYPE_STATEMENT:
 				return 's';
 			case Context::TYPE_QUALIFIER:
@@ -162,7 +162,7 @@ 
 			default:
 				// @codeCoverageIgnoreStart
 				throw new LogicException(
-					'Unknown constraint scope ' . $scope
+					'Unknown constraint scope '.$scope
 				);
 				// @codeCoverageIgnoreEnd
 		}
@@ -172,15 +172,15 @@ 
 	 * @param string[] $scopeList Context::TYPE_* constants
 	 * @return string[] abbreviated scopes
 	 */
-	private function serializeConstraintScopeList( array $scopeList ) {
-		return array_map( [ $this, 'serializeConstraintScope' ], $scopeList );
+	private function serializeConstraintScopeList(array $scopeList) {
+		return array_map([$this, 'serializeConstraintScope'], $scopeList);
 	}
 
 	/**
 	 * @param MultilingualTextValue $text
 	 * @return mixed {@see MultilingualTextValue::getArrayValue}
 	 */
-	private function serializeMultilingualText( MultilingualTextValue $text ) {
+	private function serializeMultilingualText(MultilingualTextValue $text) {
 		return $text->getArrayValue();
 	}
 

src/ConstraintCheck/Helper/TimeValueComparer.php

Spacing +9 added lines, -9 removed lines

@@ -16,27 +16,27 @@
 	 */
 	private $timeValueCalculator;
 
-	public function __construct( TimeValueCalculator $timeValueCalculator = null ) {
+	public function __construct(TimeValueCalculator $timeValueCalculator = null) {
 		$this->timeValueCalculator = $timeValueCalculator ?: new TimeValueCalculator();
 	}
 
-	public function getComparison( TimeValue $lhs, TimeValue $rhs ) {
-		$lhsTimestamp = $this->timeValueCalculator->getTimestamp( $lhs );
-		$rhsTimestamp = $this->timeValueCalculator->getTimestamp( $rhs );
+	public function getComparison(TimeValue $lhs, TimeValue $rhs) {
+		$lhsTimestamp = $this->timeValueCalculator->getTimestamp($lhs);
+		$rhsTimestamp = $this->timeValueCalculator->getTimestamp($rhs);
 
-		if ( $lhsTimestamp === $rhsTimestamp ) {
+		if ($lhsTimestamp === $rhsTimestamp) {
 			return 0;
 		}
 
 		return $lhsTimestamp < $rhsTimestamp ? -1 : 1;
 	}
 
-	public function getMinimum( TimeValue $timeValue1, TimeValue $timeValue2 ) {
-		return $this->getComparison( $timeValue1, $timeValue2 ) <= 0 ? $timeValue1 : $timeValue2;
+	public function getMinimum(TimeValue $timeValue1, TimeValue $timeValue2) {
+		return $this->getComparison($timeValue1, $timeValue2) <= 0 ? $timeValue1 : $timeValue2;
 	}
 
-	public function isFutureTime( TimeValue $timeValue ) {
-		return $this->getComparison( $timeValue, new NowValue() ) >= 0;
+	public function isFutureTime(TimeValue $timeValue) {
+		return $this->getComparison($timeValue, new NowValue()) >= 0;
 	}
 
 }

src/ConstraintCheck/Helper/NowValue.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return string
 	 */
 	public function getTime() {
-		return gmdate( '+Y-m-d\TH:i:s\Z' );
+		return gmdate('+Y-m-d\TH:i:s\Z');
 	}
 
 	public function getTimezone() {
@@ -40,11 +40,11 @@ 
 	}
 
 	public function getArrayValue() {
-		throw new LogicException( 'NowValue should never be serialized' );
+		throw new LogicException('NowValue should never be serialized');
 	}
 
-	public function equals( $value ) {
-		return get_class( $value ) === self::class;
+	public function equals($value) {
+		return get_class($value) === self::class;
 	}
 
 }

src/ConstraintCheck/Helper/RangeCheckerHelper.php

Spacing +43 added lines, -43 removed lines

@@ -51,7 +51,7 @@ 
 		UnitConverter $unitConverter = null
 	) {
 		$this->config = $config;
-		$this->timeParser = ( new TimeParserFactory() )->getTimeParser();
+		$this->timeParser = (new TimeParserFactory())->getTimeParser();
 		$this->timeCalculator = new TimeValueCalculator();
 		$this->timeValueComparer = new TimeValueComparer();
 		$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,29 +86,29 @@ 
 	 *                 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 */
-				return $this->timeValueComparer->getComparison( $lhs, $rhs );
+				return $this->timeValueComparer->getComparison($lhs, $rhs);
 			case 'quantity':
 				/** @var QuantityValue|UnboundedQuantityValue $lhs */
 				/** @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');
 	}
 
 	/**
@@ -123,71 +123,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/ConstraintSerializer.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	/**
 	 * @param bool $serializeConstraintParameters Whether to serialize constraint parameters or not.
 	 */
-	public function __construct( $serializeConstraintParameters = true ) {
+	public function __construct($serializeConstraintParameters = true) {
 		$this->serializeConstraintParameters = $serializeConstraintParameters;
 	}
 
@@ -24,13 +24,13 @@ 
 	 * @param Constraint $constraint
 	 * @return array
 	 */
-	public function serialize( Constraint $constraint ) {
+	public function serialize(Constraint $constraint) {
 		$serialization = [
 			'id' => $constraint->getConstraintId(),
 			'pid' => $constraint->getPropertyId()->getSerialization(),
 			'qid' => $constraint->getConstraintTypeItemId(),
 		];
-		if ( $this->serializeConstraintParameters ) {
+		if ($this->serializeConstraintParameters) {
 			$serialization['params'] = $constraint->getConstraintParameters();
 		}
 		return $serialization;

src/ConstraintDeserializer.php

Spacing +4 added lines, -5 removed lines

@@ -10,14 +10,13 @@
  */
 class ConstraintDeserializer {
 
-	public function deserialize( array $serialization ) {
+	public function deserialize(array $serialization) {
 		return new Constraint(
 			$serialization['id'],
-			new PropertyId( $serialization['pid'] ),
+			new PropertyId($serialization['pid']),
 			$serialization['qid'],
-			array_key_exists( 'params', $serialization ) ?
-				$serialization['params'] :
-				[]
+			array_key_exists('params', $serialization) ?
+				$serialization['params'] : []
 		);
 	}
 

src/Api/CheckConstraintParameters.php

Spacing +53 added lines, -53 removed lines

@@ -74,20 +74,20 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$constraintReportFactory = ConstraintReportFactory::getDefaultInstance();
 		$repo = WikibaseRepo::getDefaultInstance();
-		$helperFactory = $repo->getApiHelperFactory( RequestContext::getMain() );
+		$helperFactory = $repo->getApiHelperFactory(RequestContext::getMain());
 		$language = $repo->getUserLanguage();
 
 		$languageFallbackLabelDescriptionLookupFactory = $repo->getLanguageFallbackLabelDescriptionLookupFactory();
-		$labelDescriptionLookup = $languageFallbackLabelDescriptionLookupFactory->newLabelDescriptionLookup( $language );
+		$labelDescriptionLookup = $languageFallbackLabelDescriptionLookupFactory->newLabelDescriptionLookup($language);
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
-		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
+		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($labelDescriptionLookup);
 		$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 );
+		$dataValueFormatter = $valueFormatterFactory->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' );
-			$allConstraintExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnPropertyId( $propertyId );
-			foreach ( $allConstraintExceptions as $constraintId => $constraintParameterExceptions ) {
-				$this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result );
+	private function checkPropertyIds(array $propertyIds, ApiResult $result) {
+		foreach ($propertyIds as $propertyId) {
+			$result->addArrayType($this->getResultPathForPropertyId($propertyId), 'assoc');
+			$allConstraintExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnPropertyId($propertyId);
+			foreach ($allConstraintExceptions as $constraintId => $constraintParameterExceptions) {
+				$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
 			}
 		}
 	}
@@ -241,14 +241,14 @@ 
 	 * @param string[] $constraintIds
 	 * @param ApiResult $result
 	 */
-	private function checkConstraintIds( array $constraintIds, ApiResult $result ) {
-		foreach ( $constraintIds as $constraintId ) {
-			if ( $result->getResultData( $this->getResultPathForConstraintId( $constraintId ) ) ) {
+	private function checkConstraintIds(array $constraintIds, ApiResult $result) {
+		foreach ($constraintIds as $constraintId) {
+			if ($result->getResultData($this->getResultPathForConstraintId($constraintId))) {
 				// already checked as part of checkPropertyIds()
 				continue;
 			}
-			$constraintParameterExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnConstraintId( $constraintId );
-			$this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result );
+			$constraintParameterExceptions = $this->delegatingConstraintChecker->checkConstraintParametersOnConstraintId($constraintId);
+			$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
 		}
 	}
 
@@ -256,17 +256,17 @@ 
 	 * @param PropertyId $propertyId
 	 * @return string[]
 	 */
-	private function getResultPathForPropertyId( PropertyId $propertyId ) {
-		return [ $this->getModuleName(), $propertyId->getSerialization() ];
+	private function getResultPathForPropertyId(PropertyId $propertyId) {
+		return [$this->getModuleName(), $propertyId->getSerialization()];
 	}
 
 	/**
 	 * @param string $constraintId
 	 * @return string[]
 	 */
-	private function getResultPathForConstraintId( $constraintId ) {
-		$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
-		return array_merge( $this->getResultPathForPropertyId( $propertyId ), [ $constraintId ] );
+	private function getResultPathForConstraintId($constraintId) {
+		$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
+		return array_merge($this->getResultPathForPropertyId($propertyId), [$constraintId]);
 	}
 
 	/**
@@ -276,9 +276,9 @@ 
 	 * @param ConstraintParameterException[]|null $constraintParameterExceptions
 	 * @param ApiResult $result
 	 */
-	private function addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, ApiResult $result ) {
-		$path = $this->getResultPathForConstraintId( $constraintId );
-		if ( $constraintParameterExceptions === null ) {
+	private function addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, ApiResult $result) {
+		$path = $this->getResultPathForConstraintId($constraintId);
+		if ($constraintParameterExceptions === null) {
 			$result->addValue(
 				$path,
 				self::KEY_STATUS,
@@ -288,12 +288,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)
 			);
 		}
 	}
@@ -304,7 +304,7 @@ 
 	 * @param ConstraintParameterException $e
 	 * @return array
 	 */
-	private function formatConstraintParameterException( ConstraintParameterException $e ) {
+	private function formatConstraintParameterException(ConstraintParameterException $e) {
 		return [
 			self::KEY_MESSAGE_HTML => $this->violationMessageRenderer->render(
 				$e->getViolationMessage()

src/ConstraintCheck/Helper/ConstraintParameterException.php

Spacing +4 added lines, -4 removed lines

@@ -21,13 +21,13 @@
 	/**
 	 * @param ViolationMessage|string $violationMessage
 	 */
-	public function __construct( $violationMessage ) {
-		if ( $violationMessage instanceof ViolationMessage ) {
-			$message = '⧼' . $violationMessage->getMessageKey() . '⧽';
+	public function __construct($violationMessage) {
+		if ($violationMessage instanceof ViolationMessage) {
+			$message = '⧼'.$violationMessage->getMessageKey().'⧽';
 		} else {
 			$message = $violationMessage;
 		}
-		parent::__construct( $message );
+		parent::__construct($message);
 
 		// TODO remove support for string $violationMessage (see ViolationMessageRenderer::render())
 		$this->violationMessage = $violationMessage;

src/ConstraintCheck/Message/ViolationMessageRenderer.php

Spacing +72 added lines, -72 removed lines

@@ -69,21 +69,21 @@ 
 	 * (temporarily, pre-rendered strings are allowed and returned without changes)
 	 * @return string
 	 */
-	public function render( $violationMessage ) {
-		if ( is_string( $violationMessage ) ) {
+	public function render($violationMessage) {
+		if (is_string($violationMessage)) {
 			// TODO remove this once all checkers produce ViolationMessage objects
 			return $violationMessage;
 		}
 
 		$messageKey = $violationMessage->getMessageKey();
-		$paramsLists = [ [] ];
-		foreach ( $violationMessage->getArguments() as $argument ) {
-			$params = $this->renderArgument( $argument );
+		$paramsLists = [[]];
+		foreach ($violationMessage->getArguments() as $argument) {
+			$params = $this->renderArgument($argument);
 			$paramsLists[] = $params;
 		}
-		$allParams = call_user_func_array( 'array_merge', $paramsLists );
-		return ( new Message( $messageKey ) )
-			->params( $allParams )
+		$allParams = call_user_func_array('array_merge', $paramsLists);
+		return (new Message($messageKey))
+			->params($allParams)
 			->escaped();
 	}
 
@@ -92,13 +92,13 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return string HTML
 	 */
-	protected function addRole( $value, $role ) {
-		if ( $role === null ) {
+	protected function addRole($value, $role) {
+		if ($role === null) {
 			return $value;
 		}
 
-		return '<span class="wbqc-role wbqc-role-' . htmlspecialchars( $role ) . '">' .
-			$value .
+		return '<span class="wbqc-role wbqc-role-'.htmlspecialchars($role).'">'.
+			$value.
 			'</span>';
 	}
 
@@ -106,7 +106,7 @@ 
 	 * @param array $argument
 	 * @return array[] params (for Message::params)
 	 */
-	protected function renderArgument( array $argument ) {
+	protected function renderArgument(array $argument) {
 		$methods = [
 			ViolationMessage::TYPE_ENTITY_ID => 'renderEntityId',
 			ViolationMessage::TYPE_ENTITY_ID_LIST => 'renderEntityIdList',
@@ -124,12 +124,12 @@ 
 		$value = $argument['value'];
 		$role = $argument['role'];
 
-		if ( array_key_exists( $type, $methods ) ) {
+		if (array_key_exists($type, $methods)) {
 			$method = $methods[$type];
-			$params = $this->$method( $value, $role );
+			$params = $this->$method($value, $role);
 		} else {
 			throw new InvalidArgumentException(
-				'Unknown ViolationMessage argument type ' . $type . '!'
+				'Unknown ViolationMessage argument type '.$type.'!'
 			);
 		}
 
@@ -143,46 +143,46 @@ 
 	 * and return a single-element array with a raw message param (i. e. [ Message::rawParam( … ) ])
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderList( array $list, $role, callable $render ) {
-		if ( $list === [] ) {
+	private function renderList(array $list, $role, callable $render) {
+		if ($list === []) {
 			return [
-				Message::numParam( 0 ),
-				Message::rawParam( '<ul></ul>' ),
+				Message::numParam(0),
+				Message::rawParam('<ul></ul>'),
 			];
 		}
 
-		if ( count( $list ) > $this->maxListLength ) {
-			$list = array_slice( $list, 0, $this->maxListLength );
+		if (count($list) > $this->maxListLength) {
+			$list = array_slice($list, 0, $this->maxListLength);
 			$truncated = true;
 		}
 
 		$renderedParamsLists = array_map(
 			$render,
 			$list,
-			array_fill( 0, count( $list ), $role )
+			array_fill(0, count($list), $role)
 		);
 		$renderedParams = array_map(
-			function ( $params ) {
+			function($params) {
 				return $params[0];
 			},
 			$renderedParamsLists
 		);
 		$renderedElements = array_map(
-			function ( $param ) {
+			function($param) {
 				return $param['raw'];
 			},
 			$renderedParams
 		);
-		if ( isset( $truncated ) ) {
-			$renderedElements[] = wfMessage( 'ellipsis' )->escaped();
+		if (isset($truncated)) {
+			$renderedElements[] = wfMessage('ellipsis')->escaped();
 		}
 
 		return array_merge(
 			[
-				Message::numParam( count( $list ) ),
+				Message::numParam(count($list)),
 				Message::rawParam(
-					'<ul><li>' .
-					implode( '</li><li>', $renderedElements ) .
+					'<ul><li>'.
+					implode('</li><li>', $renderedElements).
 					'</li></ul>'
 				),
 			],
@@ -195,11 +195,11 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of a single raw message param (i. e. [ Message::rawParam( … ) ])
 	 */
-	private function renderEntityId( EntityId $entityId, $role ) {
-		return [ Message::rawParam( $this->addRole(
-			$this->entityIdFormatter->formatEntityId( $entityId ),
+	private function renderEntityId(EntityId $entityId, $role) {
+		return [Message::rawParam($this->addRole(
+			$this->entityIdFormatter->formatEntityId($entityId),
 			$role
-		) ) ];
+		))];
 	}
 
 	/**
@@ -207,8 +207,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderEntityIdList( array $entityIdList, $role ) {
-		return $this->renderList( $entityIdList, $role, [ $this, 'renderEntityId' ] );
+	private function renderEntityIdList(array $entityIdList, $role) {
+		return $this->renderList($entityIdList, $role, [$this, 'renderEntityId']);
 	}
 
 	/**
@@ -216,24 +216,24 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of a single raw message param (i. e. [ Message::rawParam( … ) ])
 	 */
-	private function renderItemIdSnakValue( ItemIdSnakValue $value, $role ) {
-		switch ( true ) {
+	private function renderItemIdSnakValue(ItemIdSnakValue $value, $role) {
+		switch (true) {
 			case $value->isValue():
-				return $this->renderEntityId( $value->getItemId(), $role );
+				return $this->renderEntityId($value->getItemId(), $role);
 			case $value->isSomeValue():
-				return [ Message::rawParam( $this->addRole(
-					'<span class="wikibase-snakview-variation-somevaluesnak">' .
-						wfMessage( 'wikibase-snakview-snaktypeselector-somevalue' )->escaped() .
+				return [Message::rawParam($this->addRole(
+					'<span class="wikibase-snakview-variation-somevaluesnak">'.
+						wfMessage('wikibase-snakview-snaktypeselector-somevalue')->escaped().
 						'</span>',
 					$role
-				) ) ];
+				))];
 			case $value->isNoValue():
-				return [ Message::rawParam( $this->addRole(
-					'<span class="wikibase-snakview-variation-novaluesnak">' .
-						wfMessage( 'wikibase-snakview-snaktypeselector-novalue' )->escaped() .
+				return [Message::rawParam($this->addRole(
+					'<span class="wikibase-snakview-variation-novaluesnak">'.
+						wfMessage('wikibase-snakview-snaktypeselector-novalue')->escaped().
 						'</span>',
 					$role
-				) ) ];
+				))];
 			default:
 				// @codeCoverageIgnoreStart
 				throw new LogicException(
@@ -248,8 +248,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderItemIdSnakValueList( array $valueList, $role ) {
-		return $this->renderList( $valueList, $role, [ $this, 'renderItemIdSnakValue' ] );
+	private function renderItemIdSnakValueList(array $valueList, $role) {
+		return $this->renderList($valueList, $role, [$this, 'renderItemIdSnakValue']);
 	}
 
 	/**
@@ -257,11 +257,11 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderDataValue( DataValue $dataValue, $role ) {
-		return [ Message::rawParam( $this->addRole(
-			$this->dataValueFormatter->format( $dataValue ),
+	private function renderDataValue(DataValue $dataValue, $role) {
+		return [Message::rawParam($this->addRole(
+			$this->dataValueFormatter->format($dataValue),
 			$role
-		) ) ];
+		))];
 	}
 
 	/**
@@ -269,22 +269,22 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderDataValueType( $dataValueType, $role ) {
+	private function renderDataValueType($dataValueType, $role) {
 		$messageKeys = [
 			'string' => 'datatypes-type-string',
 			'monolingualtext' => 'datatypes-type-monolingualtext',
 			'wikibase-entityid' => 'wbqc-dataValueType-wikibase-entityid',
 		];
 
-		if ( array_key_exists( $dataValueType, $messageKeys ) ) {
-			return [ Message::rawParam( $this->addRole(
-				wfMessage( $messageKeys[$dataValueType] )->escaped(),
+		if (array_key_exists($dataValueType, $messageKeys)) {
+			return [Message::rawParam($this->addRole(
+				wfMessage($messageKeys[$dataValueType])->escaped(),
 				$role
-			) ) ];
+			))];
 		} else {
 			// @codeCoverageIgnoreStart
 			throw new LogicException(
-				'Unknown data value type ' . $dataValueType
+				'Unknown data value type '.$dataValueType
 			);
 			// @codeCoverageIgnoreEnd
 		}
@@ -295,11 +295,11 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderInlineCode( $code, $role ) {
-		return [ Message::rawParam( $this->addRole(
-			'<code>' . htmlspecialchars( $code ) . '</code>',
+	private function renderInlineCode($code, $role) {
+		return [Message::rawParam($this->addRole(
+			'<code>'.htmlspecialchars($code).'</code>',
 			$role
-		) ) ];
+		))];
 	}
 
 	/**
@@ -307,8 +307,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of a single raw message param (i. e. [ Message::rawParam( … ) ])
 	 */
-	private function renderConstraintScope( $scope, $role ) {
-		switch ( $scope ) {
+	private function renderConstraintScope($scope, $role) {
+		switch ($scope) {
 			case Context::TYPE_STATEMENT:
 				$itemId = $this->config->get(
 					'WBQualityConstraintsConstraintCheckedOnMainValueId'
@@ -328,10 +328,10 @@ 
 				// callers should never let this happen, but if it does happen,
 				// showing “unknown value” seems reasonable
 				// @codeCoverageIgnoreStart
-				return $this->renderItemIdSnakValue( ItemIdSnakValue::someValue(), $role );
+				return $this->renderItemIdSnakValue(ItemIdSnakValue::someValue(), $role);
 				// @codeCoverageIgnoreEnd
 		}
-		return $this->renderEntityId( new ItemId( $itemId ), $role );
+		return $this->renderEntityId(new ItemId($itemId), $role);
 	}
 
 	/**
@@ -339,8 +339,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderConstraintScopeList( array $scopeList, $role ) {
-		return $this->renderList( $scopeList, $role, [ $this, 'renderConstraintScope' ] );
+	private function renderConstraintScopeList(array $scopeList, $role) {
+		return $this->renderList($scopeList, $role, [$this, 'renderConstraintScope']);
 	}
 
 	/**
@@ -348,10 +348,10 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */
-	private function renderLanguage( $languageCode, $role ) {
+	private function renderLanguage($languageCode, $role) {
 		return [
-			Message::plaintextParam( Language::fetchLanguageName( $languageCode ) ),
-			Message::plaintextParam( $languageCode ),
+			Message::plaintextParam(Language::fetchLanguageName($languageCode)),
+			Message::plaintextParam($languageCode),
 		];
 	}