wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/Html/HtmlTableBuilder.php

Spacing +33 added lines, -33 removed lines

@@ -32,9 +32,9 @@ 
 	/**
 	 * @param array $headers
 	 */
-	public function __construct( array $headers ) {
-		foreach ( $headers as $header ) {
-			$this->addHeader( $header );
+	public function __construct(array $headers) {
+		foreach ($headers as $header) {
+			$this->addHeader($header);
 		}
 	}
 
@@ -43,16 +43,16 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	private function addHeader( $header ) {
-		Assert::parameterType( 'string|' . HtmlTableHeaderBuilder::class, $header, '$header' );
+	private function addHeader($header) {
+		Assert::parameterType('string|'.HtmlTableHeaderBuilder::class, $header, '$header');
 
-		if ( is_string( $header ) ) {
-			$header = new HtmlTableHeaderBuilder( $header );
+		if (is_string($header)) {
+			$header = new HtmlTableHeaderBuilder($header);
 		}
 
 		$this->headers[] = $header;
 
-		if ( $header->getIsSortable() ) {
+		if ($header->getIsSortable()) {
 			$this->isSortable = true;
 		}
 	}
@@ -85,12 +85,12 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function appendRow( array $cells ) {
-		foreach ( $cells as $key => $cell ) {
-			if ( is_string( $cell ) ) {
-				$cells[$key] = new HtmlTableCellBuilder( $cell );
-			} elseif ( !( $cell instanceof HtmlTableCellBuilder ) ) {
-				throw new InvalidArgumentException( '$cells must be array of HtmlTableCell objects.' );
+	public function appendRow(array $cells) {
+		foreach ($cells as $key => $cell) {
+			if (is_string($cell)) {
+				$cells[$key] = new HtmlTableCellBuilder($cell);
+			} elseif (!($cell instanceof HtmlTableCellBuilder)) {
+				throw new InvalidArgumentException('$cells must be array of HtmlTableCell objects.');
 			}
 		}
 
@@ -104,13 +104,13 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function appendRows( array $rows ) {
-		foreach ( $rows as $cells ) {
-			if ( !is_array( $cells ) ) {
-				throw new InvalidArgumentException( '$rows must be array of arrays of HtmlTableCell objects.' );
+	public function appendRows(array $rows) {
+		foreach ($rows as $cells) {
+			if (!is_array($cells)) {
+				throw new InvalidArgumentException('$rows must be array of arrays of HtmlTableCell objects.');
 			}
 
-			$this->appendRow( $cells );
+			$this->appendRow($cells);
 		}
 	}
 
@@ -122,38 +122,38 @@ 
 	public function toHtml() {
 		// Open table
 		$tableClasses = 'wikitable';
-		if ( $this->isSortable ) {
+		if ($this->isSortable) {
 			$tableClasses .= ' sortable';
 		}
-		$html = Html::openElement( 'table', [ 'class' => $tableClasses ] );
+		$html = Html::openElement('table', ['class' => $tableClasses]);
 
 		// Write headers
-		$html .= Html::openElement( 'thead' );
-		$html .= Html::openElement( 'tr' );
-		foreach ( $this->headers as $header ) {
+		$html .= Html::openElement('thead');
+		$html .= Html::openElement('tr');
+		foreach ($this->headers as $header) {
 			$html .= $header->toHtml();
 		}
-		$html .= Html::closeElement( 'tr' );
-		$html .= Html::closeElement( 'thead' );
-		$html .= Html::openElement( 'tbody' );
+		$html .= Html::closeElement('tr');
+		$html .= Html::closeElement('thead');
+		$html .= Html::openElement('tbody');
 
 		// Write rows
-		foreach ( $this->rows as $row ) {
-			$html .= Html::openElement( 'tr' );
+		foreach ($this->rows as $row) {
+			$html .= Html::openElement('tr');
 
 			/**
 			 * @var HtmlTableCellBuilder $cell
 			 */
-			foreach ( $row as $cell ) {
+			foreach ($row as $cell) {
 				$html .= $cell->toHtml();
 			}
 
-			$html .= Html::closeElement( 'tr' );
+			$html .= Html::closeElement('tr');
 		}
 
 		// Close table
-		$html .= Html::closeElement( 'tbody' );
-		$html .= Html::closeElement( 'table' );
+		$html .= Html::closeElement('tbody');
+		$html .= Html::closeElement('table');
 
 		return $html;
 	}

src/ConstraintCheck/Helper/SparqlHelper.php

Spacing +166 added lines, -169 removed lines

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

src/ServiceWiring-ConstraintCheckers.php

Spacing +70 added lines, -70 removed lines

@@ -36,196 +36,196 @@
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ValueTypeChecker;
 
 return [
-	ConstraintCheckerServices::CONFLICTS_WITH_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::CONFLICTS_WITH_CHECKER => function(MediaWikiServices $services) {
 		return new ConflictsWithChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getConnectionCheckerHelper( $services )
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getConnectionCheckerHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::ITEM_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::ITEM_CHECKER => function(MediaWikiServices $services) {
 		return new ItemChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getConnectionCheckerHelper( $services )
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getConnectionCheckerHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::TARGET_REQUIRED_CLAIM_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::TARGET_REQUIRED_CLAIM_CHECKER => function(MediaWikiServices $services) {
 		return new TargetRequiredClaimChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getConnectionCheckerHelper( $services )
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getConnectionCheckerHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::SYMMETRIC_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::SYMMETRIC_CHECKER => function(MediaWikiServices $services) {
 		return new SymmetricChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConnectionCheckerHelper( $services )
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConnectionCheckerHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::INVERSE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::INVERSE_CHECKER => function(MediaWikiServices $services) {
 		return new InverseChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getConnectionCheckerHelper( $services )
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getConnectionCheckerHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::QUALIFIER_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::QUALIFIER_CHECKER => function(MediaWikiServices $services) {
 		return new QualifierChecker();
 	},
 
-	ConstraintCheckerServices::QUALIFIERS_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::QUALIFIERS_CHECKER => function(MediaWikiServices $services) {
 		return new QualifiersChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::MANDATORY_QUALIFIERS_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::MANDATORY_QUALIFIERS_CHECKER => function(MediaWikiServices $services) {
 		return new MandatoryQualifiersChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::RANGE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::RANGE_CHECKER => function(MediaWikiServices $services) {
 		return new RangeChecker(
-			WikibaseServices::getPropertyDataTypeLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getRangeCheckerHelper( $services )
+			WikibaseServices::getPropertyDataTypeLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getRangeCheckerHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::DIFF_WITHIN_RANGE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::DIFF_WITHIN_RANGE_CHECKER => function(MediaWikiServices $services) {
 		return new DiffWithinRangeChecker(
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getRangeCheckerHelper( $services ),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getRangeCheckerHelper($services),
 			$services->getMainConfig()
 		);
 	},
 
-	ConstraintCheckerServices::TYPE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::TYPE_CHECKER => function(MediaWikiServices $services) {
 		return new TypeChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getTypeCheckerHelper( $services ),
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getTypeCheckerHelper($services),
 			$services->getMainConfig()
 		);
 	},
 
-	ConstraintCheckerServices::VALUE_TYPE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::VALUE_TYPE_CHECKER => function(MediaWikiServices $services) {
 		return new ValueTypeChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
-			ConstraintsServices::getTypeCheckerHelper( $services ),
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
+			ConstraintsServices::getTypeCheckerHelper($services),
 			$services->getMainConfig()
 		);
 	},
 
-	ConstraintCheckerServices::SINGLE_VALUE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::SINGLE_VALUE_CHECKER => function(MediaWikiServices $services) {
 		return new SingleValueChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::MULTI_VALUE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::MULTI_VALUE_CHECKER => function(MediaWikiServices $services) {
 		return new MultiValueChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::UNIQUE_VALUE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::UNIQUE_VALUE_CHECKER => function(MediaWikiServices $services) {
 		// TODO return a different, dummy implementation if SPARQL is not available
 		return new UniqueValueChecker(
-			ConstraintsServices::getSparqlHelper( $services )
+			ConstraintsServices::getSparqlHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::FORMAT_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::FORMAT_CHECKER => function(MediaWikiServices $services) {
 		// TODO return a different, dummy implementation if SPARQL is not available
 		return new FormatChecker(
-			ConstraintsServices::getConstraintParameterParser( $services ),
+			ConstraintsServices::getConstraintParameterParser($services),
 			$services->getMainConfig(),
-			ConstraintsServices::getSparqlHelper( $services )
+			ConstraintsServices::getSparqlHelper($services)
 		);
 	},
 
-	ConstraintCheckerServices::COMMONS_LINK_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::COMMONS_LINK_CHECKER => function(MediaWikiServices $services) {
 		$pageNameNormalizer = new MediaWikiPageNameNormalizer();
 		return new CommonsLinkChecker(
-			ConstraintsServices::getConstraintParameterParser( $services ),
+			ConstraintsServices::getConstraintParameterParser($services),
 			$pageNameNormalizer
 		);
 	},
 
-	ConstraintCheckerServices::ONE_OF_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::ONE_OF_CHECKER => function(MediaWikiServices $services) {
 		return new OneOfChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::VALUE_ONLY_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::VALUE_ONLY_CHECKER => function(MediaWikiServices $services) {
 		return new ValueOnlyChecker();
 	},
 
-	ConstraintCheckerServices::REFERENCE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::REFERENCE_CHECKER => function(MediaWikiServices $services) {
 		return new ReferenceChecker();
 	},
 
-	ConstraintCheckerServices::NO_BOUNDS_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::NO_BOUNDS_CHECKER => function(MediaWikiServices $services) {
 		return new NoBoundsChecker();
 	},
 
-	ConstraintCheckerServices::ALLOWED_UNITS_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::ALLOWED_UNITS_CHECKER => function(MediaWikiServices $services) {
 		// TODO in the future, get UnitConverter from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$unitConverter = $repo->getUnitConverter();
 
 		return new AllowedUnitsChecker(
-			ConstraintsServices::getConstraintParameterParser( $services ),
+			ConstraintsServices::getConstraintParameterParser($services),
 			$unitConverter
 		);
 	},
 
-	ConstraintCheckerServices::SINGLE_BEST_VALUE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::SINGLE_BEST_VALUE_CHECKER => function(MediaWikiServices $services) {
 		return new SingleBestValueChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::ENTITY_TYPE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::ENTITY_TYPE_CHECKER => function(MediaWikiServices $services) {
 		return new EntityTypeChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::NONE_OF_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::NONE_OF_CHECKER => function(MediaWikiServices $services) {
 		return new NoneOfChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::INTEGER_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::INTEGER_CHECKER => function(MediaWikiServices $services) {
 		return new IntegerChecker();
 	},
 
-	ConstraintCheckerServices::CITATION_NEEDED_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::CITATION_NEEDED_CHECKER => function(MediaWikiServices $services) {
 		return new CitationNeededChecker();
 	},
 
-	ConstraintCheckerServices::PROPERTY_SCOPE_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::PROPERTY_SCOPE_CHECKER => function(MediaWikiServices $services) {
 		return new PropertyScopeChecker(
-			ConstraintsServices::getConstraintParameterParser( $services )
+			ConstraintsServices::getConstraintParameterParser($services)
 		);
 	},
 
-	ConstraintCheckerServices::CONTEMPORARY_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintCheckerServices::CONTEMPORARY_CHECKER => function(MediaWikiServices $services) {
 		return new ContemporaryChecker(
-			WikibaseServices::getEntityLookup( $services ),
-			ConstraintsServices::getRangeCheckerHelper( $services ),
+			WikibaseServices::getEntityLookup($services),
+			ConstraintsServices::getRangeCheckerHelper($services),
 			$services->getMainConfig()
 		);
 	},

src/Api/CheckConstraints.php

Spacing +35 added lines, -35 removed lines

@@ -79,19 +79,19 @@ 
 	 *
 	 * @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);
 
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
-		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( $language );
+		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory->getEntityIdFormatter($language);
 		$entityIdLabelFormatterFactory = new EntityIdLabelFormatterFactory();
-		$entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter( $language );
+		$entityIdLabelFormatter = $entityIdLabelFormatterFactory->getEntityIdFormatter($language);
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 		$dataFactory = MediaWikiServices::getInstance()->getStatsdDataFactory();
 
@@ -113,7 +113,7 @@ 
 			$prefix,
 			$repo->getEntityIdParser(),
 			$repo->getStatementGuidValidator(),
-			$repo->getApiHelperFactory( RequestContext::getMain() ),
+			$repo->getApiHelperFactory(RequestContext::getMain()),
 			$resultsSource,
 			$checkResultsRenderer,
 			$dataFactory
@@ -142,11 +142,11 @@ 
 		CheckResultsRenderer $checkResultsRenderer,
 		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->resultsSource = $resultsSource;
 		$this->checkResultsRenderer = $checkResultsRenderer;
 		$this->dataFactory = $dataFactory;
@@ -162,9 +162,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];
 
@@ -180,7 +180,7 @@ 
 				)
 			)->getArray()
 		);
-		$this->resultBuilder->markSuccess( 1 );
+		$this->resultBuilder->markSuccess(1);
 	}
 
 	/**
@@ -188,24 +188,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);
 	}
 
 	/**
@@ -213,35 +213,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(
@@ -282,12 +282,12 @@ 
 				],
 				ApiBase::PARAM_ISMULTI => true,
 				ApiBase::PARAM_ALL => true,
-				ApiBase::PARAM_DFLT => implode( '|', [
+				ApiBase::PARAM_DFLT => implode('|', [
 					CheckResult::STATUS_VIOLATION,
 					CheckResult::STATUS_WARNING,
 					CheckResult::STATUS_SUGGESTION,
 					CheckResult::STATUS_BAD_PARAMETERS,
-				] ),
+				]),
 				ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
 			],
 		];

src/Specials/SpecialConstraintReport.php

Spacing +104 added lines, -104 removed lines

@@ -136,7 +136,7 @@ 
 		Config $config,
 		IBufferingStatsdDataFactory $dataFactory
 	) {
-		parent::__construct( 'ConstraintReport' );
+		parent::__construct('ConstraintReport');
 
 		$this->entityLookup = $entityLookup;
 		$this->entityTitleLookup = $entityTitleLookup;
@@ -145,7 +145,7 @@ 
 		$language = $this->getLanguage();
 
 		$formatterOptions = new FormatterOptions();
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
 		$this->dataValueFormatter = $valueFormatterFactory->getValueFormatter(
 			SnakFormatter::FORMAT_HTML,
 			$formatterOptions
@@ -205,7 +205,7 @@ 
 	 * @return string
 	 */
 	public function getDescription() {
-		return $this->msg( 'wbqc-constraintreport' )->escaped();
+		return $this->msg('wbqc-constraintreport')->escaped();
 	}
 
 	/**
@@ -217,43 +217,43 @@ 
 	 * @throws EntityIdParsingException
 	 * @throws UnexpectedValueException
 	 */
-	public function execute( $subPage ) {
+	public function execute($subPage) {
 		$out = $this->getOutput();
 
-		$postRequest = $this->getContext()->getRequest()->getVal( 'entityid' );
-		if ( $postRequest ) {
-			$out->redirect( $this->getPageTitle( strtoupper( $postRequest ) )->getLocalURL() );
+		$postRequest = $this->getContext()->getRequest()->getVal('entityid');
+		if ($postRequest) {
+			$out->redirect($this->getPageTitle(strtoupper($postRequest))->getLocalURL());
 			return;
 		}
 
 		$out->enableOOUI();
-		$out->addModules( $this->getModules() );
+		$out->addModules($this->getModules());
 
 		$this->setHeaders();
 
-		$out->addHTML( $this->getExplanationText() );
+		$out->addHTML($this->getExplanationText());
 		$this->buildEntityIdForm();
 
-		if ( !$subPage ) {
+		if (!$subPage) {
 			return;
 		}
 
-		if ( !is_string( $subPage ) ) {
-			throw new InvalidArgumentException( '$subPage must be string.' );
+		if (!is_string($subPage)) {
+			throw new InvalidArgumentException('$subPage must be string.');
 		}
 
 		try {
-			$entityId = $this->entityIdParser->parse( $subPage );
-		} catch ( EntityIdParsingException $e ) {
+			$entityId = $this->entityIdParser->parse($subPage);
+		} catch (EntityIdParsingException $e) {
 			$out->addHTML(
-				$this->buildNotice( 'wbqc-constraintreport-invalid-entity-id', true )
+				$this->buildNotice('wbqc-constraintreport-invalid-entity-id', true)
 			);
 			return;
 		}
 
-		if ( !$this->entityLookup->hasEntity( $entityId ) ) {
+		if (!$this->entityLookup->hasEntity($entityId)) {
 			$out->addHTML(
-				$this->buildNotice( 'wbqc-constraintreport-not-existent-entity', true )
+				$this->buildNotice('wbqc-constraintreport-not-existent-entity', true)
 			);
 			return;
 		}
@@ -261,18 +261,18 @@ 
 		$this->dataFactory->increment(
 			'wikibase.quality.constraints.specials.specialConstraintReport.executeCheck'
 		);
-		$results = $this->constraintChecker->checkAgainstConstraintsOnEntityId( $entityId );
+		$results = $this->constraintChecker->checkAgainstConstraintsOnEntityId($entityId);
 
-		if ( $results !== [] ) {
+		if ($results !== []) {
 			$out->addHTML(
-				$this->buildResultHeader( $entityId )
-				. $this->buildSummary( $results )
-				. $this->buildResultTable( $entityId, $results )
+				$this->buildResultHeader($entityId)
+				. $this->buildSummary($results)
+				. $this->buildResultTable($entityId, $results)
 			);
 		} else {
 			$out->addHTML(
-				$this->buildResultHeader( $entityId )
-				. $this->buildNotice( 'wbqc-constraintreport-empty-result' )
+				$this->buildResultHeader($entityId)
+				. $this->buildNotice('wbqc-constraintreport-empty-result')
 			);
 		}
 	}
@@ -288,15 +288,15 @@ 
 				'name' => 'entityid',
 				'label-message' => 'wbqc-constraintreport-form-entityid-label',
 				'cssclass' => 'wbqc-constraintreport-form-entity-id',
-				'placeholder' => $this->msg( 'wbqc-constraintreport-form-entityid-placeholder' )->escaped()
+				'placeholder' => $this->msg('wbqc-constraintreport-form-entityid-placeholder')->escaped()
 			]
 		];
-		$htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext(), 'wbqc-constraintreport-form' );
-		$htmlForm->setSubmitText( $this->msg( 'wbqc-constraintreport-form-submit-label' )->escaped() );
-		$htmlForm->setSubmitCallback( function() {
+		$htmlForm = HTMLForm::factory('ooui', $formDescriptor, $this->getContext(), 'wbqc-constraintreport-form');
+		$htmlForm->setSubmitText($this->msg('wbqc-constraintreport-form-submit-label')->escaped());
+		$htmlForm->setSubmitCallback(function() {
 			return false;
 		} );
-		$htmlForm->setMethod( 'post' );
+		$htmlForm->setMethod('post');
 		$htmlForm->show();
 	}
 
@@ -310,16 +310,16 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildNotice( $messageKey, $error = false ) {
-		if ( !is_string( $messageKey ) ) {
-			throw new InvalidArgumentException( '$message must be string.' );
+	private function buildNotice($messageKey, $error = false) {
+		if (!is_string($messageKey)) {
+			throw new InvalidArgumentException('$message must be string.');
 		}
-		if ( !is_bool( $error ) ) {
-			throw new InvalidArgumentException( '$error must be bool.' );
+		if (!is_bool($error)) {
+			throw new InvalidArgumentException('$error must be bool.');
 		}
 
 		$cssClasses = 'wbqc-constraintreport-notice';
-		if ( $error ) {
+		if ($error) {
 			$cssClasses .= ' wbqc-constraintreport-notice-error';
 		}
 
@@ -328,7 +328,7 @@ 
 				[
 					'class' => $cssClasses
 				],
-				$this->msg( $messageKey )->escaped()
+				$this->msg($messageKey)->escaped()
 			);
 	}
 
@@ -338,16 +338,16 @@ 
 	private function getExplanationText() {
 		return Html::rawElement(
 			'div',
-			[ 'class' => 'wbqc-explanation' ],
+			['class' => 'wbqc-explanation'],
 			Html::rawElement(
 				'p',
 				[],
-				$this->msg( 'wbqc-constraintreport-explanation-part-one' )->escaped()
+				$this->msg('wbqc-constraintreport-explanation-part-one')->escaped()
 			)
 			. Html::rawElement(
 				'p',
 				[],
-				$this->msg( 'wbqc-constraintreport-explanation-part-two' )->escaped()
+				$this->msg('wbqc-constraintreport-explanation-part-two')->escaped()
 			)
 		);
 	}
@@ -358,72 +358,72 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function buildResultTable( EntityId $entityId, array $results ) {
+	private function buildResultTable(EntityId $entityId, array $results) {
 		// Set table headers
 		$table = new HtmlTableBuilder(
 			[
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-status' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-status')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-property' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-property')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-message' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-message')->escaped(),
 					true
 				),
 				new HtmlTableHeaderBuilder(
-					$this->msg( 'wbqc-constraintreport-result-table-header-constraint' )->escaped(),
+					$this->msg('wbqc-constraintreport-result-table-header-constraint')->escaped(),
 					true
 				)
 			]
 		);
 
-		foreach ( $results as $result ) {
-			$table = $this->appendToResultTable( $table, $entityId, $result );
+		foreach ($results as $result) {
+			$table = $this->appendToResultTable($table, $entityId, $result);
 		}
 
 		return $table->toHtml();
 	}
 
-	private function appendToResultTable( HtmlTableBuilder $table, EntityId $entityId, CheckResult $result ) {
+	private function appendToResultTable(HtmlTableBuilder $table, EntityId $entityId, CheckResult $result) {
 		$message = $result->getMessage();
-		if ( $message === null ) {
+		if ($message === null) {
 			// no row for this result
 			return $table;
 		}
 
 		// Status column
-		$statusColumn = $this->formatStatus( $result->getStatus() );
+		$statusColumn = $this->formatStatus($result->getStatus());
 
 		// Property column
-		$propertyId = new PropertyId( $result->getContextCursor()->getSnakPropertyId() );
+		$propertyId = new PropertyId($result->getContextCursor()->getSnakPropertyId());
 		$propertyColumn = $this->getClaimLink(
 			$entityId,
 			$propertyId,
-			$this->entityIdLabelFormatter->formatEntityId( $propertyId )
+			$this->entityIdLabelFormatter->formatEntityId($propertyId)
 		);
 
 		// Message column
-		$messageColumn = $this->violationMessageRenderer->render( $message );
+		$messageColumn = $this->violationMessageRenderer->render($message);
 
 		// Constraint column
 		$constraintTypeItemId = $result->getConstraint()->getConstraintTypeItemId();
 		try {
-			$constraintTypeLabel = $this->entityIdLabelFormatter->formatEntityId( new ItemId( $constraintTypeItemId ) );
-		} catch ( InvalidArgumentException $e ) {
-			$constraintTypeLabel = htmlspecialchars( $constraintTypeItemId );
+			$constraintTypeLabel = $this->entityIdLabelFormatter->formatEntityId(new ItemId($constraintTypeItemId));
+		} catch (InvalidArgumentException $e) {
+			$constraintTypeLabel = htmlspecialchars($constraintTypeItemId);
 		}
 		$constraintLink = $this->getClaimLink(
 			$propertyId,
-			new PropertyId( $this->config->get( 'WBQualityConstraintsPropertyConstraintId' ) ),
+			new PropertyId($this->config->get('WBQualityConstraintsPropertyConstraintId')),
 			$constraintTypeLabel
 		);
 		$constraintColumn = $this->buildExpandableElement(
 			$constraintLink,
-			$this->constraintParameterRenderer->formatParameters( $result->getParameters() ),
+			$this->constraintParameterRenderer->formatParameters($result->getParameters()),
 			'[...]'
 		);
 
@@ -463,15 +463,15 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildResultHeader( EntityId $entityId ) {
-		$entityLink = sprintf( '%s (%s)',
-							   $this->entityIdLinkFormatter->formatEntityId( $entityId ),
-							   htmlspecialchars( $entityId->getSerialization() ) );
+	protected function buildResultHeader(EntityId $entityId) {
+		$entityLink = sprintf('%s (%s)',
+							   $this->entityIdLinkFormatter->formatEntityId($entityId),
+							   htmlspecialchars($entityId->getSerialization()));
 
 		return Html::rawElement(
 			'h3',
 			[],
-			sprintf( '%s %s', $this->msg( 'wbqc-constraintreport-result-headline' )->escaped(), $entityLink )
+			sprintf('%s %s', $this->msg('wbqc-constraintreport-result-headline')->escaped(), $entityLink)
 		);
 	}
 
@@ -482,24 +482,24 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildSummary( array $results ) {
+	protected function buildSummary(array $results) {
 		$statuses = [];
-		foreach ( $results as $result ) {
-			$status = strtolower( $result->getStatus() );
-			$statuses[$status] = isset( $statuses[$status] ) ? $statuses[$status] + 1 : 1;
+		foreach ($results as $result) {
+			$status = strtolower($result->getStatus());
+			$statuses[$status] = isset($statuses[$status]) ? $statuses[$status] + 1 : 1;
 		}
 
 		$statusElements = [];
-		foreach ( $statuses as $status => $count ) {
-			if ( $count > 0 ) {
+		foreach ($statuses as $status => $count) {
+			if ($count > 0) {
 				$statusElements[] =
-					$this->formatStatus( $status )
+					$this->formatStatus($status)
 					. ': '
 					. $count;
 			}
 		}
 
-		return Html::rawElement( 'p', [], implode( ', ', $statusElements ) );
+		return Html::rawElement('p', [], implode(', ', $statusElements));
 	}
 
 	/**
@@ -514,15 +514,15 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function buildExpandableElement( $content, $expandableContent, $indicator ) {
-		if ( !is_string( $content ) ) {
-			throw new InvalidArgumentException( '$content has to be string.' );
+	protected function buildExpandableElement($content, $expandableContent, $indicator) {
+		if (!is_string($content)) {
+			throw new InvalidArgumentException('$content has to be string.');
 		}
-		if ( $expandableContent && ( !is_string( $expandableContent ) ) ) {
-			throw new InvalidArgumentException( '$tooltipContent, if provided, has to be string.' );
+		if ($expandableContent && (!is_string($expandableContent))) {
+			throw new InvalidArgumentException('$tooltipContent, if provided, has to be string.');
 		}
 
-		if ( empty( $expandableContent ) ) {
+		if (empty($expandableContent)) {
 			return $content;
 		}
 
@@ -542,7 +542,7 @@ 
 			$expandableContent
 		);
 
-		return sprintf( '%s %s %s', $content, $tooltipIndicator, $expandableContent );
+		return sprintf('%s %s %s', $content, $tooltipIndicator, $expandableContent);
 	}
 
 	/**
@@ -554,8 +554,8 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function formatStatus( $status ) {
-		$messageName = "wbqc-constraintreport-status-" . strtolower( $status );
+	private function formatStatus($status) {
+		$messageName = "wbqc-constraintreport-status-".strtolower($status);
 		$statusIcons = [
 			CheckResult::STATUS_SUGGESTION => [
 				'icon' => 'suggestion-constraint-violation',
@@ -572,25 +572,25 @@ 
 			],
 		];
 
-		if ( array_key_exists( $status, $statusIcons ) ) {
-			$iconWidget = new IconWidget( $statusIcons[$status] );
-			$iconHtml = $iconWidget->toString() . ' ';
+		if (array_key_exists($status, $statusIcons)) {
+			$iconWidget = new IconWidget($statusIcons[$status]);
+			$iconHtml = $iconWidget->toString().' ';
 		} else {
 			$iconHtml = '';
 		}
 
-		$labelWidget = new LabelWidget( [
-			'label' => $this->msg( $messageName )->text(),
-		] );
+		$labelWidget = new LabelWidget([
+			'label' => $this->msg($messageName)->text(),
+		]);
 		$labelHtml = $labelWidget->toString();
 
 		$formattedStatus =
 			Html::rawElement(
 				'span',
 				[
-					'class' => 'wbqc-status wbqc-status-' . $status
+					'class' => 'wbqc-status wbqc-status-'.$status
 				],
-				$iconHtml . $labelHtml
+				$iconHtml.$labelHtml
 			);
 
 		return $formattedStatus;
@@ -606,26 +606,26 @@ 
 	 *
 	 * @return string HTML
 	 */
-	protected function formatDataValues( $dataValues, $separator = ', ' ) {
-		if ( $dataValues instanceof DataValue ) {
-			$dataValues = [ $dataValues ];
-		} elseif ( !is_array( $dataValues ) ) {
-			throw new InvalidArgumentException( '$dataValues has to be instance of DataValue or an array of DataValues.' );
+	protected function formatDataValues($dataValues, $separator = ', ') {
+		if ($dataValues instanceof DataValue) {
+			$dataValues = [$dataValues];
+		} elseif (!is_array($dataValues)) {
+			throw new InvalidArgumentException('$dataValues has to be instance of DataValue or an array of DataValues.');
 		}
 
 		$formattedDataValues = [];
-		foreach ( $dataValues as $dataValue ) {
-			if ( !( $dataValue instanceof DataValue ) ) {
-				throw new InvalidArgumentException( '$dataValues has to be instance of DataValue or an array of DataValues.' );
+		foreach ($dataValues as $dataValue) {
+			if (!($dataValue instanceof DataValue)) {
+				throw new InvalidArgumentException('$dataValues has to be instance of DataValue or an array of DataValues.');
 			}
-			if ( $dataValue instanceof EntityIdValue ) {
-				$formattedDataValues[ ] = $this->entityIdLabelFormatter->formatEntityId( $dataValue->getEntityId() );
+			if ($dataValue instanceof EntityIdValue) {
+				$formattedDataValues[] = $this->entityIdLabelFormatter->formatEntityId($dataValue->getEntityId());
 			} else {
-				$formattedDataValues[ ] = $this->dataValueFormatter->format( $dataValue );
+				$formattedDataValues[] = $this->dataValueFormatter->format($dataValue);
 			}
 		}
 
-		return implode( $separator, $formattedDataValues );
+		return implode($separator, $formattedDataValues);
 	}
 
 	/**
@@ -637,11 +637,11 @@ 
 	 *
 	 * @return string HTML
 	 */
-	private function getClaimLink( EntityId $entityId, PropertyId $propertyId, $text ) {
+	private function getClaimLink(EntityId $entityId, PropertyId $propertyId, $text) {
 		return Html::rawElement(
 			'a',
 			[
-				'href' => $this->getClaimUrl( $entityId, $propertyId ),
+				'href' => $this->getClaimUrl($entityId, $propertyId),
 				'target' => '_blank'
 			],
 			$text
@@ -656,9 +656,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function getClaimUrl( EntityId $entityId, PropertyId $propertyId ) {
-		$title = $this->entityTitleLookup->getTitleForId( $entityId );
-		$entityUrl = sprintf( '%s#%s', $title->getLocalURL(), $propertyId->getSerialization() );
+	private function getClaimUrl(EntityId $entityId, PropertyId $propertyId) {
+		$title = $this->entityTitleLookup->getTitleForId($entityId);
+		$entityUrl = sprintf('%s#%s', $title->getLocalURL(), $propertyId->getSerialization());
 
 		return $entityUrl;
 	}

src/Api/CheckConstraintParameters.php

Spacing +52 added lines, -52 removed lines

@@ -74,19 +74,19 @@ 
 	 *
 	 * @return self
 	 */
-	public static function newFromGlobalState( ApiMain $main, $name, $prefix = '' ) {
+	public static function newFromGlobalState(ApiMain $main, $name, $prefix = '') {
 		$repo = WikibaseRepo::getDefaultInstance();
-		$helperFactory = $repo->getApiHelperFactory( RequestContext::getMain() );
+		$helperFactory = $repo->getApiHelperFactory(RequestContext::getMain());
 		$language = $repo->getUserLanguage();
 
 		$entityIdHtmlLinkFormatterFactory = $repo->getEntityIdHtmlLinkFormatterFactory();
 		$entityIdHtmlLinkFormatter = $entityIdHtmlLinkFormatterFactory
-			->getEntityIdFormatter( $language );
+			->getEntityIdFormatter($language);
 		$formatterOptions = new FormatterOptions();
-		$formatterOptions->setOption( SnakFormatter::OPT_LANG, $language->getCode() );
+		$formatterOptions->setOption(SnakFormatter::OPT_LANG, $language->getCode());
 		$valueFormatterFactory = $repo->getValueFormatterFactory();
 		$dataValueFormatter = $valueFormatterFactory
-			->getValueFormatter( SnakFormatter::FORMAT_HTML, $formatterOptions );
+			->getValueFormatter(SnakFormatter::FORMAT_HTML, $formatterOptions);
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 		$violationMessageRenderer = new MultilingualTextViolationMessageRenderer(
 			$entityIdHtmlLinkFormatter,
@@ -126,9 +126,9 @@ 
 		StatementGuidParser $statementGuidParser,
 		IBufferingStatsdDataFactory $dataFactory
 	) {
-		parent::__construct( $main, $name, $prefix );
+		parent::__construct($main, $name, $prefix);
 
-		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter( $this );
+		$this->apiErrorReporter = $apiHelperFactory->getErrorReporter($this);
 		$this->delegatingConstraintChecker = $delegatingConstraintChecker;
 		$this->violationMessageRenderer = $violationMessageRenderer;
 		$this->statementGuidParser = $statementGuidParser;
@@ -143,39 +143,39 @@ 
 		$params = $this->extractRequestParams();
 		$result = $this->getResult();
 
-		$propertyIds = $this->parsePropertyIds( $params[self::PARAM_PROPERTY_ID] );
-		$constraintIds = $this->parseConstraintIds( $params[self::PARAM_CONSTRAINT_ID] );
+		$propertyIds = $this->parsePropertyIds($params[self::PARAM_PROPERTY_ID]);
+		$constraintIds = $this->parseConstraintIds($params[self::PARAM_CONSTRAINT_ID]);
 
-		$this->checkPropertyIds( $propertyIds, $result );
-		$this->checkConstraintIds( $constraintIds, $result );
+		$this->checkPropertyIds($propertyIds, $result);
+		$this->checkConstraintIds($constraintIds, $result);
 
-		$result->addValue( null, 'success', 1 );
+		$result->addValue(null, 'success', 1);
 	}
 
 	/**
 	 * @param array|null $propertyIdSerializations
 	 * @return PropertyId[]
 	 */
-	private function parsePropertyIds( $propertyIdSerializations ) {
-		if ( $propertyIdSerializations === null ) {
+	private function parsePropertyIds($propertyIdSerializations) {
+		if ($propertyIdSerializations === null) {
 			return [];
-		} elseif ( empty( $propertyIdSerializations ) ) {
+		} elseif (empty($propertyIdSerializations)) {
 			$this->apiErrorReporter->dieError(
-				'If ' . self::PARAM_PROPERTY_ID . ' is specified, it must be nonempty.',
+				'If '.self::PARAM_PROPERTY_ID.' is specified, it must be nonempty.',
 				'no-data'
 			);
 		}
 
 		return array_map(
-			function( $propertyIdSerialization ) {
+			function($propertyIdSerialization) {
 				try {
-					return new PropertyId( $propertyIdSerialization );
-				} catch ( InvalidArgumentException $e ) {
+					return new PropertyId($propertyIdSerialization);
+				} catch (InvalidArgumentException $e) {
 					$this->apiErrorReporter->dieError(
 						"Invalid id: $propertyIdSerialization",
 						'invalid-property-id',
 						0, // default argument
-						[ self::PARAM_PROPERTY_ID => $propertyIdSerialization ]
+						[self::PARAM_PROPERTY_ID => $propertyIdSerialization]
 					);
 				}
 			},
@@ -187,35 +187,35 @@ 
 	 * @param array|null $constraintIds
 	 * @return string[]
 	 */
-	private function parseConstraintIds( $constraintIds ) {
-		if ( $constraintIds === null ) {
+	private function parseConstraintIds($constraintIds) {
+		if ($constraintIds === null) {
 			return [];
-		} elseif ( empty( $constraintIds ) ) {
+		} elseif (empty($constraintIds)) {
 			$this->apiErrorReporter->dieError(
-				'If ' . self::PARAM_CONSTRAINT_ID . ' is specified, it must be nonempty.',
+				'If '.self::PARAM_CONSTRAINT_ID.' is specified, it must be nonempty.',
 				'no-data'
 			);
 		}
 
 		return array_map(
-			function( $constraintId ) {
+			function($constraintId) {
 				try {
-					$propertyId = $this->statementGuidParser->parse( $constraintId )->getEntityId();
-					if ( !$propertyId instanceof PropertyId ) {
+					$propertyId = $this->statementGuidParser->parse($constraintId)->getEntityId();
+					if (!$propertyId instanceof PropertyId) {
 						$this->apiErrorReporter->dieError(
 							"Invalid property ID: {$propertyId->getSerialization()}",
 							'invalid-property-id',
 							0, // default argument
-							[ self::PARAM_CONSTRAINT_ID => $constraintId ]
+							[self::PARAM_CONSTRAINT_ID => $constraintId]
 						);
 					}
 					return $constraintId;
-				} catch ( StatementGuidParsingException $e ) {
+				} catch (StatementGuidParsingException $e) {
 					$this->apiErrorReporter->dieError(
 						"Invalid statement GUID: $constraintId",
 						'invalid-guid',
 						0, // default argument
-						[ self::PARAM_CONSTRAINT_ID => $constraintId ]
+						[self::PARAM_CONSTRAINT_ID => $constraintId]
 					);
 				}
 			},
@@ -227,12 +227,12 @@ 
 	 * @param PropertyId[] $propertyIds
 	 * @param ApiResult $result
 	 */
-	private function checkPropertyIds( array $propertyIds, ApiResult $result ) {
-		foreach ( $propertyIds as $propertyId ) {
-			$result->addArrayType( $this->getResultPathForPropertyId( $propertyId ), 'assoc' );
+	private function checkPropertyIds(array $propertyIds, ApiResult $result) {
+		foreach ($propertyIds as $propertyId) {
+			$result->addArrayType($this->getResultPathForPropertyId($propertyId), 'assoc');
 			$allConstraintExceptions = $this->delegatingConstraintChecker
-				->checkConstraintParametersOnPropertyId( $propertyId );
-			foreach ( $allConstraintExceptions as $constraintId => $constraintParameterExceptions ) {
+				->checkConstraintParametersOnPropertyId($propertyId);
+			foreach ($allConstraintExceptions as $constraintId => $constraintParameterExceptions) {
 				$this->addConstraintParameterExceptionsToResult(
 					$constraintId,
 					$constraintParameterExceptions,
@@ -246,15 +246,15 @@ 
 	 * @param string[] $constraintIds
 	 * @param ApiResult $result
 	 */
-	private function checkConstraintIds( array $constraintIds, ApiResult $result ) {
-		foreach ( $constraintIds as $constraintId ) {
-			if ( $result->getResultData( $this->getResultPathForConstraintId( $constraintId ) ) ) {
+	private function checkConstraintIds(array $constraintIds, ApiResult $result) {
+		foreach ($constraintIds as $constraintId) {
+			if ($result->getResultData($this->getResultPathForConstraintId($constraintId))) {
 				// already checked as part of checkPropertyIds()
 				continue;
 			}
 			$constraintParameterExceptions = $this->delegatingConstraintChecker
-				->checkConstraintParametersOnConstraintId( $constraintId );
-			$this->addConstraintParameterExceptionsToResult( $constraintId, $constraintParameterExceptions, $result );
+				->checkConstraintParametersOnConstraintId($constraintId);
+			$this->addConstraintParameterExceptionsToResult($constraintId, $constraintParameterExceptions, $result);
 		}
 	}
 
@@ -262,17 +262,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]);
 	}
 
 	/**
@@ -287,8 +287,8 @@ 
 		$constraintParameterExceptions,
 		ApiResult $result
 	) {
-		$path = $this->getResultPathForConstraintId( $constraintId );
-		if ( $constraintParameterExceptions === null ) {
+		$path = $this->getResultPathForConstraintId($constraintId);
+		if ($constraintParameterExceptions === null) {
 			$result->addValue(
 				$path,
 				self::KEY_STATUS,
@@ -298,12 +298,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)
 			);
 		}
 	}
@@ -314,7 +314,7 @@ 
 	 * @param ConstraintParameterException $e
 	 * @return string[]
 	 */
-	private function formatConstraintParameterException( ConstraintParameterException $e ) {
+	private function formatConstraintParameterException(ConstraintParameterException $e) {
 		return [
 			self::KEY_MESSAGE_HTML => $this->violationMessageRenderer->render(
 				$e->getViolationMessage()
@@ -347,8 +347,8 @@ 
 		return [
 			'action=wbcheckconstraintparameters&propertyid=P247'
 				=> 'apihelp-wbcheckconstraintparameters-example-propertyid-1',
-			'action=wbcheckconstraintparameters&' .
-			'constraintid=P247$0fe1711e-4c0f-82ce-3af0-830b721d0fba|' .
+			'action=wbcheckconstraintparameters&'.
+			'constraintid=P247$0fe1711e-4c0f-82ce-3af0-830b721d0fba|'.
 			'P225$cdc71e4a-47a0-12c5-dfb3-3f6fc0b6613f'
 				=> 'apihelp-wbcheckconstraintparameters-example-constraintid-2',
 		];

src/ConstraintCheck/Checker/TypeChecker.php

Spacing +18 added lines, -18 removed lines

@@ -83,12 +83,12 @@ 
 	 * @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);
 		}
-		if ( $context->getType() === Context::TYPE_REFERENCE ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_NOT_IN_SCOPE );
+		if ($context->getType() === Context::TYPE_REFERENCE) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_NOT_IN_SCOPE);
 		}
 
 		$parameters = [];
@@ -100,8 +100,8 @@ 
 			$constraintTypeItemId
 		);
 		$parameters['class'] = array_map(
-			function( $id ) {
-				return new ItemId( $id );
+			function($id) {
+				return new ItemId($id);
 			},
 			$classes
 		);
@@ -111,13 +111,13 @@ 
 			$constraintTypeItemId
 		);
 		$relationIds = [];
-		if ( $relation === 'instance' || $relation === 'instanceOrSubclass' ) {
-			$relationIds[] = $this->config->get( 'WBQualityConstraintsInstanceOfId' );
+		if ($relation === 'instance' || $relation === 'instanceOrSubclass') {
+			$relationIds[] = $this->config->get('WBQualityConstraintsInstanceOfId');
 		}
-		if ( $relation === 'subclass' || $relation === 'instanceOrSubclass' ) {
-			$relationIds[] = $this->config->get( 'WBQualityConstraintsSubclassOfId' );
+		if ($relation === 'subclass' || $relation === 'instanceOrSubclass') {
+			$relationIds[] = $this->config->get('WBQualityConstraintsSubclassOfId');
 		}
-		$parameters['relation'] = [ $relation ];
+		$parameters['relation'] = [$relation];
 
 		$result = $this->typeCheckerHelper->hasClassInRelation(
 			$context->getEntity()->getStatements(),
@@ -125,7 +125,7 @@ 
 			$classes
 		);
 
-		if ( $result->getBool() ) {
+		if ($result->getBool()) {
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
@@ -139,11 +139,11 @@ 
 			$status = CheckResult::STATUS_VIOLATION;
 		}
 
-		return ( new CheckResult( $context, $constraint, $parameters, $status, $message ) )
-			->withMetadata( $result->getMetadata() );
+		return (new CheckResult($context, $constraint, $parameters, $status, $message))
+			->withMetadata($result->getMetadata());
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
 		$exceptions = [];
@@ -152,7 +152,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
@@ -160,7 +160,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/Checker/NoneOfChecker.php

Spacing +11 added lines, -11 removed lines

@@ -60,9 +60,9 @@ 
 	 * @throws ConstraintParameterException
 	 * @return CheckResult
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
 
 		$parameters = [];
@@ -81,20 +81,20 @@ 
 		$message = null;
 		$status = CheckResult::STATUS_COMPLIANCE;
 
-		foreach ( $items as $item ) {
-			if ( $item->matchesSnak( $snak ) ) {
-				$message = ( new ViolationMessage( 'wbqc-violation-message-none-of' ) )
-					->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
-					->withItemIdSnakValueList( $items, Role::OBJECT );
+		foreach ($items as $item) {
+			if ($item->matchesSnak($snak)) {
+				$message = (new ViolationMessage('wbqc-violation-message-none-of'))
+					->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
+					->withItemIdSnakValueList($items, Role::OBJECT);
 				$status = CheckResult::STATUS_VIOLATION;
 				break;
 			}
 		}
 
-		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();
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
 		$exceptions = [];
@@ -104,7 +104,7 @@ 
 				$constraintTypeItemId,
 				true
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/Checker/FormatChecker.php

Spacing +24 added lines, -24 removed lines

@@ -85,7 +85,7 @@ 
 	 * @throws ConstraintParameterException
 	 * @return CheckResult
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
+	public function checkConstraint(Context $context, Constraint $constraint) {
 		$parameters = [];
 		$constraintParameters = $constraint->getConstraintParameters();
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
@@ -94,7 +94,7 @@ 
 			$constraintParameters,
 			$constraintTypeItemId
 		);
-		$parameters['pattern'] = [ $format ];
+		$parameters['pattern'] = [$format];
 
 		$syntaxClarifications = $this->constraintParameterParser->parseSyntaxClarificationParameter(
 			$constraintParameters
@@ -102,9 +102,9 @@ 
 
 		$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();
@@ -113,7 +113,7 @@ 
 		 * error handling:
 		 *   type of $dataValue for properties with 'Format' constraint has to be 'string' or 'monolingualtext'
 		 */
-		switch ( $dataValue->getType() ) {
+		switch ($dataValue->getType()) {
 			case 'string':
 				$text = $dataValue->getValue();
 				break;
@@ -122,37 +122,37 @@ 
 				$text = $dataValue->getText();
 				break;
 			default:
-				$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-types-2' ) )
-					->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM )
-					->withDataValueType( 'string' )
-					->withDataValueType( 'monolingualtext' );
-				return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+				$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-types-2'))
+					->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM)
+					->withDataValueType('string')
+					->withDataValueType('monolingualtext');
+				return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		if (
-			!( $this->sparqlHelper instanceof DummySparqlHelper ) &&
-			$this->config->get( 'WBQualityConstraintsCheckFormatConstraint' )
+			!($this->sparqlHelper instanceof DummySparqlHelper) &&
+			$this->config->get('WBQualityConstraintsCheckFormatConstraint')
 		) {
-			if ( $this->sparqlHelper->matchesRegularExpression( $text, $format ) ) {
+			if ($this->sparqlHelper->matchesRegularExpression($text, $format)) {
 				$message = null;
 				$status = CheckResult::STATUS_COMPLIANCE;
 			} else {
-				$message = ( new ViolationMessage( 'wbqc-violation-message-format-clarification' ) )
-					->withEntityId( $context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY )
-					->withDataValue( new StringValue( $text ), Role::OBJECT )
-					->withInlineCode( $format, Role::CONSTRAINT_PARAMETER_VALUE )
-					->withMultilingualText( $syntaxClarifications, Role::CONSTRAINT_PARAMETER_VALUE );
+				$message = (new ViolationMessage('wbqc-violation-message-format-clarification'))
+					->withEntityId($context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY)
+					->withDataValue(new StringValue($text), Role::OBJECT)
+					->withInlineCode($format, Role::CONSTRAINT_PARAMETER_VALUE)
+					->withMultilingualText($syntaxClarifications, Role::CONSTRAINT_PARAMETER_VALUE);
 				$status = CheckResult::STATUS_VIOLATION;
 			}
 		} else {
-			$message = ( new ViolationMessage( 'wbqc-violation-message-security-reason' ) )
-				->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM );
+			$message = (new ViolationMessage('wbqc-violation-message-security-reason'))
+				->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM);
 			$status = CheckResult::STATUS_TODO;
 		}
-		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();
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
 		$exceptions = [];
@@ -161,14 +161,14 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
 			$this->constraintParameterParser->parseSyntaxClarificationParameter(
 				$constraintParameters
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;