wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/ConstraintCheck/Helper/TypeCheckerHelper.php

Spacing +36 added lines, -36 removed lines

@@ -89,23 +89,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 */
@@ -114,11 +114,11 @@ 
 			$dataValue = $mainSnak->getDataValue();
 			$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;
 			}
 		}
@@ -139,14 +139,14 @@ 
 	 * @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 {
 			return new CachedBool(
-				$this->isSubclassOf( $comparativeClass, $classesToCheck ),
+				$this->isSubclassOf($comparativeClass, $classesToCheck),
 				Metadata::blank()
 			);
-		} catch ( OverflowException $e ) {
-			if ( $this->sparqlHelper !== null ) {
+		} catch (OverflowException $e) {
+			if ($this->sparqlHelper !== null) {
 				$this->dataFactory->increment(
 					'wikibase.quality.constraints.sparql.typeFallback'
 				);
@@ -156,7 +156,7 @@ 
 					/* withInstance = */ false
 				);
 			} else {
-				return new CachedBool( false, Metadata::blank() );
+				return new CachedBool(false, Metadata::blank());
 			}
 		}
 	}
@@ -174,13 +174,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 */
@@ -189,28 +189,28 @@ 
 			$dataValue = $mainSnak->getDataValue();
 			$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)
 		);
 	}
 
-	private function hasCorrectType( Snak $mainSnak ) {
+	private function hasCorrectType(Snak $mainSnak) {
 		return $mainSnak instanceof PropertyValueSnak
 			&& $mainSnak->getDataValue()->getType() === 'wikibase-entityid';
 	}
@@ -227,12 +227,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);
 	}
 
 	/**
@@ -244,10 +244,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
 		);
@@ -259,10 +259,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/Api/CheckConstraints.php

Spacing +43 added lines, -43 removed lines

@@ -77,21 +77,21 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$repo = WikibaseRepo::getDefaultInstance();
 
 		$language = $repo->getUserLanguage();
 		$formatterOptions = new FormatterOptions();
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
 		$valueFormatterFactory = $repo->getValueFormatterFactory();
-		$valueFormatter = $valueFormatterFactory->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions );
+		$valueFormatter = $valueFormatterFactory->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions);
 
 		$languageFallbackLabelDescriptionLookupFactory = $repo->getLanguageFallbackLabelDescriptionLookupFactory();
-		$labelDescriptionLookup = $languageFallbackLabelDescriptionLookupFactory->newLabelDescriptionLookup( $language );
+		$labelDescriptionLookup = $languageFallbackLabelDescriptionLookupFactory->newLabelDescriptionLookup($language);
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
-		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
+		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($labelDescriptionLookup);
 		$entityIdLabelFormatterFactory = new EntityIdLabelFormatterFactory();
-		$entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
+		$entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter($labelDescriptionLookup);
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 		$titleParser = MediaWikiServices::getInstance()->getTitleParser();
 		$unitConverter = $repo->getUnitConverter();
@@ -124,10 +124,10 @@ 
 			$repo->getEntityTitleLookup(),
 			$entityIdLabelFormatter,
 			$constraintParameterRenderer,
-			new ViolationMessageRenderer( $entityIdHtmlLinkFormatter, $valueFormatter, $config ),
+			new ViolationMessageRenderer($entityIdHtmlLinkFormatter, $valueFormatter, $config),
 			$config
 		);
-		if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
+		if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
 			$wikiPageEntityMetaDataAccessor = new WikiPageEntityMetaDataLookup(
 				$repo->getEntityNamespaceLookup()
 			);
@@ -138,12 +138,12 @@ 
 				ResultsCache::getDefaultInstance(),
 				$wikiPageEntityMetaDataAccessor,
 				$entityIdParser,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
+				$config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
 				[
-					$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
-					$config->get( 'WBQualityConstraintsTypeConstraintId' ),
-					$config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
-					$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
+					$config->get('WBQualityConstraintsCommonsLinkConstraintId'),
+					$config->get('WBQualityConstraintsTypeConstraintId'),
+					$config->get('WBQualityConstraintsValueTypeConstraintId'),
+					$config->get('WBQualityConstraintsDistinctValuesConstraintId'),
 				],
 				$dataFactory
 			);
@@ -155,7 +155,7 @@ 
 			$prefix,
 			$repo->getEntityIdParser(),
 			$repo->getStatementGuidValidator(),
-			$repo->getApiHelperFactory( RequestContext::getMain() ),
+			$repo->getApiHelperFactory(RequestContext::getMain()),
 			$resultsBuilder,
 			$dataFactory
 		);
@@ -181,11 +181,11 @@ 
 		ResultsBuilder $resultsBuilder,
 		IBufferingStatsdDataFactory $dataFactory
 	) {
-		parent::__construct( $main, $name, $prefix );
+		parent::__construct($main, $name, $prefix);
 		$this->entityIdParser = $entityIdParser;
 		$this->statementGuidValidator = $statementGuidValidator;
-		$this->resultBuilder = $apiHelperFactory->getResultBuilder( $this );
-		$this->errorReporter = $apiHelperFactory->getErrorReporter( $this );
+		$this->resultBuilder = $apiHelperFactory->getResultBuilder($this);
+		$this->errorReporter = $apiHelperFactory->getErrorReporter($this);
 		$this->resultsBuilder = $resultsBuilder;
 		$this->dataFactory = $dataFactory;
 	}
@@ -200,9 +200,9 @@ 
 
 		$params = $this->extractRequestParams();
 
-		$this->validateParameters( $params );
-		$entityIds = $this->parseEntityIds( $params );
-		$claimIds = $this->parseClaimIds( $params );
+		$this->validateParameters($params);
+		$entityIds = $this->parseEntityIds($params);
+		$claimIds = $this->parseClaimIds($params);
 		$constraintIDs = $params[self::PARAM_CONSTRAINT_ID];
 		$statuses = $params[self::PARAM_STATUS];
 
@@ -217,13 +217,13 @@ 
 			)->getArray()
 		);
 		// ensure that result contains the given entity IDs even if they have no statements
-		foreach ( $entityIds as $entityId ) {
+		foreach ($entityIds as $entityId) {
 			$this->getResult()->addArrayType(
-				[ $this->getModuleName(), $entityId->getSerialization() ],
+				[$this->getModuleName(), $entityId->getSerialization()],
 				'assoc'
 			);
 		}
-		$this->resultBuilder->markSuccess( 1 );
+		$this->resultBuilder->markSuccess(1);
 	}
 
 	/**
@@ -231,24 +231,24 @@ 
 	 *
 	 * @return EntityId[]
 	 */
-	private function parseEntityIds( array $params ) {
+	private function parseEntityIds(array $params) {
 		$ids = $params[self::PARAM_ID];
 
-		if ( $ids === null ) {
+		if ($ids === null) {
 			return [];
-		} elseif ( $ids === [] ) {
+		} elseif ($ids === []) {
 			$this->errorReporter->dieError(
-				'If ' . self::PARAM_ID . ' is specified, it must be nonempty.', 'no-data' );
+				'If '.self::PARAM_ID.' is specified, it must be nonempty.', 'no-data' );
 		}
 
-		return array_map( function ( $id ) {
+		return array_map(function($id) {
 			try {
-				return $this->entityIdParser->parse( $id );
-			} catch ( EntityIdParsingException $e ) {
+				return $this->entityIdParser->parse($id);
+			} catch (EntityIdParsingException $e) {
 				$this->errorReporter->dieError(
-					"Invalid id: $id", 'invalid-entity-id', 0, [ self::PARAM_ID => $id ] );
+					"Invalid id: $id", 'invalid-entity-id', 0, [self::PARAM_ID => $id] );
 			}
-		}, $ids );
+		}, $ids);
 	}
 
 	/**
@@ -256,35 +256,35 @@ 
 	 *
 	 * @return string[]
 	 */
-	private function parseClaimIds( array $params ) {
+	private function parseClaimIds(array $params) {
 		$ids = $params[self::PARAM_CLAIM_ID];
 
-		if ( $ids === null ) {
+		if ($ids === null) {
 			return [];
-		} elseif ( $ids === [] ) {
+		} elseif ($ids === []) {
 			$this->errorReporter->dieError(
-				'If ' . self::PARAM_CLAIM_ID . ' is specified, it must be nonempty.', 'no-data' );
+				'If '.self::PARAM_CLAIM_ID.' is specified, it must be nonempty.', 'no-data' );
 		}
 
-		foreach ( $ids as $id ) {
-			if ( !$this->statementGuidValidator->validate( $id ) ) {
+		foreach ($ids as $id) {
+			if (!$this->statementGuidValidator->validate($id)) {
 				$this->errorReporter->dieError(
-					"Invalid claim id: $id", 'invalid-guid', 0, [ self::PARAM_CLAIM_ID => $id ] );
+					"Invalid claim id: $id", 'invalid-guid', 0, [self::PARAM_CLAIM_ID => $id] );
 			}
 		}
 
 		return $ids;
 	}
 
-	private function validateParameters( array $params ) {
-		if ( $params[self::PARAM_CONSTRAINT_ID] !== null
-			 && empty( $params[self::PARAM_CONSTRAINT_ID] )
+	private function validateParameters(array $params) {
+		if ($params[self::PARAM_CONSTRAINT_ID] !== null
+			 && empty($params[self::PARAM_CONSTRAINT_ID])
 		) {
 			$paramConstraintId = self::PARAM_CONSTRAINT_ID;
 			$this->errorReporter->dieError(
 				"If $paramConstraintId is specified, it must be nonempty.", 'no-data' );
 		}
-		if ( $params[self::PARAM_ID] === null && $params[self::PARAM_CLAIM_ID] === null ) {
+		if ($params[self::PARAM_ID] === null && $params[self::PARAM_CLAIM_ID] === null) {
 			$paramId = self::PARAM_ID;
 			$paramClaimId = self::PARAM_CLAIM_ID;
 			$this->errorReporter->dieError(

src/ConstraintCheck/Message/ViolationMessageRenderer.php

Doc Comments -1 removed lines

@@ -332,7 +332,6 @@
 	}
 
 	/**
-	 * @param string[] $text Context::TYPE_* constants
 	 * @param string|null $role one of the Role::* constants
 	 * @return array[] list of parameters as accepted by Message::params()
 	 */

Spacing +72 added lines, -72 removed lines

@@ -66,21 +66,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();
 	}
 
@@ -89,13 +89,13 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return string HTML
 	 */
-	private function addRole( $value, $role ) {
-		if ( $role === null ) {
+	private 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>';
 	}
 
@@ -103,7 +103,7 @@ 
 	 * @param array $argument
 	 * @return array[] params (for Message::params)
 	 */
-	private function renderArgument( array $argument ) {
+	private function renderArgument(array $argument) {
 		$methods = [
 			ViolationMessage::TYPE_ENTITY_ID => 'renderEntityId',
 			ViolationMessage::TYPE_ENTITY_ID_LIST => 'renderEntityIdList',
@@ -121,12 +121,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.'!'
 			);
 		}
 
@@ -140,46 +140,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>'
 				),
 			],
@@ -192,11 +192,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
-		) ) ];
+		))];
 	}
 
 	/**
@@ -204,8 +204,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']);
 	}
 
 	/**
@@ -213,24 +213,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(
@@ -245,8 +245,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']);
 	}
 
 	/**
@@ -254,11 +254,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
-		) ) ];
+		))];
 	}
 
 	/**
@@ -266,22 +266,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-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
 		}
@@ -292,11 +292,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
-		) ) ];
+		))];
 	}
 
 	/**
@@ -304,8 +304,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'
@@ -325,10 +325,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);
 	}
 
 	/**
@@ -336,8 +336,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']);
 	}
 
 	/**
@@ -345,10 +345,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),
 		];
 	}
 

src/ConstraintCheck/Message/ViolationMessageSerializer.php

Spacing +12 added lines, -12 removed lines

@@ -13,26 +13,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,
 		];
 	}
@@ -42,7 +42,7 @@ 
 	 * @return array [ 't' => ViolationMessage::TYPE_*, 'v' => serialized value,
 	 * 'r' => $role, (optional) 'a' => $alternativeMessageKey ]
 	 */
-	private function serializeArgument( array $argument ) {
+	private function serializeArgument(array $argument) {
 		$methods = [
 		];
 
@@ -50,12 +50,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.'!'
 			);
 		}
 
@@ -65,7 +65,7 @@ 
 			'r' => $role,
 		];
 
-		if ( array_key_exists( 'alternativeMessageKey', $argument ) ) {
+		if (array_key_exists('alternativeMessageKey', $argument)) {
 			$serialized['a'] = $this->abbreviateViolationMessageKey(
 				$argument['alternativeMessageKey']
 			);

src/ConstraintCheck/Message/ViolationMessageDeserializer.php

Spacing +13 added lines, -13 removed lines

@@ -13,23 +13,23 @@ 
  */
 class ViolationMessageDeserializer implements Deserializer {
 
-	public function unabbreviateViolationMessageKey( $messageKeySuffix ) {
-		return ViolationMessage::MESSAGE_KEY_PREFIX . $messageKeySuffix;
+	public function unabbreviateViolationMessageKey($messageKeySuffix) {
+		return ViolationMessage::MESSAGE_KEY_PREFIX.$messageKeySuffix;
 	}
 
 	/**
 	 * @param array $serialization
 	 * @return ViolationMessage
 	 */
-	public function deserialize( $serialization ) {
-		Assert::parameterType( 'array', $serialization, '$serialization' );
+	public function deserialize($serialization) {
+		Assert::parameterType('array', $serialization, '$serialization');
 
 		$message = new ViolationMessage(
-			$this->unabbreviateViolationMessageKey( $serialization['k'] )
+			$this->unabbreviateViolationMessageKey($serialization['k'])
 		);
 
-		foreach ( $serialization['a'] as $serializedArgument ) {
-			$message = $this->deserializeArgument( $message, $serializedArgument );
+		foreach ($serialization['a'] as $serializedArgument) {
+			$message = $this->deserializeArgument($message, $serializedArgument);
 		}
 
 		return $message;
@@ -41,14 +41,14 @@ 
 	 * 'r' => $role, (optional) 'a' => $alternativeMessageKey ]
 	 * @return ViolationMessage $message with the deserialized argument appended
 	 */
-	private function deserializeArgument( ViolationMessage $message, array $serializedArgument ) {
+	private function deserializeArgument(ViolationMessage $message, array $serializedArgument) {
 		$methods = [
 		];
 
 		$type = $serializedArgument['t'];
 		$serializedValue = $serializedArgument['v'];
 		$role = $serializedArgument['r'];
-		if ( array_key_exists( 'a', $serializedArgument ) ) {
+		if (array_key_exists('a', $serializedArgument)) {
 			$alternativeMessageKey = $this->unabbreviateViolationMessageKey(
 				$serializedArgument['a']
 			);
@@ -56,16 +56,16 @@ 
 			$alternativeMessageKey = null;
 		}
 
-		if ( array_key_exists( $type, $methods ) ) {
+		if (array_key_exists($type, $methods)) {
 			$method = $methods[$type];
-			$value = $this->$method( $serializedValue );
+			$value = $this->$method($serializedValue);
 		} else {
 			throw new InvalidArgumentException(
-				'Unknown ViolationMessage argument type ' . $type . '!'
+				'Unknown ViolationMessage argument type '.$type.'!'
 			);
 		}
 
-		return $message->withArgument( $type, $role, $value, $alternativeMessageKey );
+		return $message->withArgument($type, $role, $value, $alternativeMessageKey);
 	}
 
 }

src/ConstraintCheck/Message/ViolationMessage.php

Spacing +29 added lines, -29 removed lines

@@ -103,17 +103,17 @@ 
 	public function __construct(
 		$messageKey
 	) {
-		if ( strpos( $messageKey, self::MESSAGE_KEY_PREFIX ) !== 0 ) {
+		if (strpos($messageKey, self::MESSAGE_KEY_PREFIX) !== 0) {
 			throw new InvalidArgumentException(
-				'ViolationMessage key ⧼' .
-				$messageKey .
-				'⧽ should start with "' .
-				self::MESSAGE_KEY_PREFIX .
+				'ViolationMessage key ⧼'.
+				$messageKey.
+				'⧽ should start with "'.
+				self::MESSAGE_KEY_PREFIX.
 				'".'
 			);
 		}
 
-		$this->messageKeySuffix = substr( $messageKey, strlen( self::MESSAGE_KEY_PREFIX ) );
+		$this->messageKeySuffix = substr($messageKey, strlen(self::MESSAGE_KEY_PREFIX));
 		$this->arguments = [];
 	}
 
@@ -122,7 +122,7 @@ 
 	 * @return string
 	 */
 	public function getMessageKey() {
-		return self::MESSAGE_KEY_PREFIX . $this->messageKeySuffix;
+		return self::MESSAGE_KEY_PREFIX.$this->messageKeySuffix;
 	}
 
 	/**
@@ -142,9 +142,9 @@ 
 	 * @param mixed $value the value, which should match the $type
 	 * @return ViolationMessage
 	 */
-	public function withArgument( $type, $role, $value ) {
+	public function withArgument($type, $role, $value) {
 		$ret = clone $this;
-		$ret->arguments[] = [ 'type' => $type, 'role' => $role, 'value' => $value ];
+		$ret->arguments[] = ['type' => $type, 'role' => $role, 'value' => $value];
 		return $ret;
 	}
 
@@ -156,8 +156,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withEntityId( EntityId $entityId, $role = null ) {
-		return $this->withArgument( self::TYPE_ENTITY_ID, $role, $entityId );
+	public function withEntityId(EntityId $entityId, $role = null) {
+		return $this->withArgument(self::TYPE_ENTITY_ID, $role, $entityId);
 	}
 
 	/**
@@ -174,8 +174,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withEntityIdList( array $entityIdList, $role = null ) {
-		return $this->withArgument( self::TYPE_ENTITY_ID_LIST, $role, $entityIdList );
+	public function withEntityIdList(array $entityIdList, $role = null) {
+		return $this->withArgument(self::TYPE_ENTITY_ID_LIST, $role, $entityIdList);
 	}
 
 	/**
@@ -186,8 +186,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withItemIdSnakValue( ItemIdSnakValue $value, $role = null ) {
-		return $this->withArgument( self::TYPE_ITEM_ID_SNAK_VALUE, $role, $value );
+	public function withItemIdSnakValue(ItemIdSnakValue $value, $role = null) {
+		return $this->withArgument(self::TYPE_ITEM_ID_SNAK_VALUE, $role, $value);
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withItemIdSnakValueList( array $valueList, $role = null ) {
-		return $this->withArgument( self::TYPE_ITEM_ID_SNAK_VALUE_LIST, $role, $valueList );
+	public function withItemIdSnakValueList(array $valueList, $role = null) {
+		return $this->withArgument(self::TYPE_ITEM_ID_SNAK_VALUE_LIST, $role, $valueList);
 	}
 
 	/**
@@ -216,8 +216,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withDataValue( DataValue $dataValue, $role = null ) {
-		return $this->withArgument( self::TYPE_DATA_VALUE, $role, $dataValue );
+	public function withDataValue(DataValue $dataValue, $role = null) {
+		return $this->withArgument(self::TYPE_DATA_VALUE, $role, $dataValue);
 	}
 
 	/**
@@ -232,8 +232,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withDataValueType( $dataValueType, $role = null ) {
-		return $this->withArgument( self::TYPE_DATA_VALUE_TYPE, $role, $dataValueType );
+	public function withDataValueType($dataValueType, $role = null) {
+		return $this->withArgument(self::TYPE_DATA_VALUE_TYPE, $role, $dataValueType);
 	}
 
 	/**
@@ -244,8 +244,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withInlineCode( $code, $role = null ) {
-		return $this->withArgument( self::TYPE_INLINE_CODE, $role, $code );
+	public function withInlineCode($code, $role = null) {
+		return $this->withArgument(self::TYPE_INLINE_CODE, $role, $code);
 	}
 
 	/**
@@ -256,8 +256,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withConstraintScope( $scope, $role = null ) {
-		return $this->withArgument( self::TYPE_CONSTRAINT_SCOPE, $role, $scope );
+	public function withConstraintScope($scope, $role = null) {
+		return $this->withArgument(self::TYPE_CONSTRAINT_SCOPE, $role, $scope);
 	}
 
 	/**
@@ -268,8 +268,8 @@ 
 	 * @param string|null $role one of the Role::* constants
 	 * @return ViolationMessage
 	 */
-	public function withConstraintScopeList( array $scopeList, $role = null ) {
-		return $this->withArgument( self::TYPE_CONSTRAINT_SCOPE_LIST, $role, $scopeList );
+	public function withConstraintScopeList(array $scopeList, $role = null) {
+		return $this->withArgument(self::TYPE_CONSTRAINT_SCOPE_LIST, $role, $scopeList);
 	}
 
 	/**
@@ -284,8 +284,8 @@ 
 	 * @param string $languageCode
 	 * @return ViolationMessage
 	 */
-	public function withLanguage( $languageCode ) {
-		return $this->withArgument( self::TYPE_LANGUAGE, null, $languageCode );
+	public function withLanguage($languageCode) {
+		return $this->withArgument(self::TYPE_LANGUAGE, null, $languageCode);
 	}
 
 }