wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/WikibaseServices.php

Spacing +9 added lines, -9 removed lines

@@ -20,35 +20,35 @@
 	const PROPERTY_DATA_TYPE_LOOKUP = 'WBQC_PropertyDataTypeLookup';
 	const ENTITY_LOOKUP_WITHOUT_CACHE = 'WBQC_EntityLookupWithoutCache';
 
-	private static function getService( MediaWikiServices $services = null, $name ) {
-		if ( $services === null ) {
+	private static function getService(MediaWikiServices $services = null, $name) {
+		if ($services === null) {
 			$services = MediaWikiServices::getInstance();
 		}
-		return $services->getService( $name );
+		return $services->getService($name);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return EntityLookup
 	 */
-	public static function getEntityLookup( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::ENTITY_LOOKUP );
+	public static function getEntityLookup(MediaWikiServices $services = null) {
+		return self::getService($services, self::ENTITY_LOOKUP);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return PropertyDataTypeLookup
 	 */
-	public static function getPropertyDataTypeLookup( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::PROPERTY_DATA_TYPE_LOOKUP );
+	public static function getPropertyDataTypeLookup(MediaWikiServices $services = null) {
+		return self::getService($services, self::PROPERTY_DATA_TYPE_LOOKUP);
 	}
 
 	/**
 	 * @param MediaWikiServices|null $services
 	 * @return EntityLookup
 	 */
-	public static function getEntityLookupWithoutCache( MediaWikiServices $services = null ) {
-		return self::getService( $services, self::ENTITY_LOOKUP_WITHOUT_CACHE );
+	public static function getEntityLookupWithoutCache(MediaWikiServices $services = null) {
+		return self::getService($services, self::ENTITY_LOOKUP_WITHOUT_CACHE);
 	}
 
 }

maintenance/ImportConstraintEntities.php

Spacing +56 added lines, -56 removed lines

@@ -15,10 +15,10 @@ 
 use Wikibase\Repo\WikibaseRepo;
 
 // @codeCoverageIgnoreStart
-$basePath = getenv( "MW_INSTALL_PATH" ) !== false
-	? getenv( "MW_INSTALL_PATH" ) : __DIR__ . "/../../..";
+$basePath = getenv("MW_INSTALL_PATH") !== false
+	? getenv("MW_INSTALL_PATH") : __DIR__."/../../..";
 
-require_once $basePath . "/maintenance/Maintenance.php";
+require_once $basePath."/maintenance/Maintenance.php";
 // @codeCoverageIgnoreEnd
 
 /**
@@ -52,20 +52,20 @@ 
 		parent::__construct();
 
 		$this->addDescription(
-			'Import entities needed for constraint checks ' .
+			'Import entities needed for constraint checks '.
 			'from Wikidata into the local repository.'
 		);
 		$this->addOption(
 			'config-format',
-			'The format in which the resulting configuration will be omitted: ' .
-			'"globals" for directly settings global variables, suitable for inclusion in LocalSettings.php (default), ' .
+			'The format in which the resulting configuration will be omitted: '.
+			'"globals" for directly settings global variables, suitable for inclusion in LocalSettings.php (default), '.
 			'or "wgConf" for printing parts of arrays suitable for inclusion in $wgConf->settings.'
 		);
 		$this->addOption(
 			'dry-run',
 			'Don’t actually import entities, just print which ones would be imported.'
 		);
-		$this->requireExtension( 'WikibaseQualityConstraints' );
+		$this->requireExtension('WikibaseQualityConstraints');
 	}
 
 	/**
@@ -76,8 +76,8 @@ 
 		$this->entitySerializer = $repo->getAllTypesEntitySerializer();
 		$this->entityDeserializer = $repo->getInternalFormatEntityDeserializer();
 		$this->entityStore = $repo->getEntityStore();
-		if ( !$this->getOption( 'dry-run', false ) ) {
-			$this->user = User::newSystemUser( 'WikibaseQualityConstraints importer' );
+		if (!$this->getOption('dry-run', false)) {
+			$this->user = User::newSystemUser('WikibaseQualityConstraints importer');
 		}
 	}
 
@@ -86,20 +86,20 @@ 
 
 		$configUpdates = [];
 
-		$extensionJsonFile = __DIR__ . '/../extension.json';
-		$extensionJsonText = file_get_contents( $extensionJsonFile );
-		$extensionJson = json_decode( $extensionJsonText, /* assoc = */ true );
-		$wikidataEntityIds = $this->getEntitiesToImport( $extensionJson['config'], $this->getConfig() );
+		$extensionJsonFile = __DIR__.'/../extension.json';
+		$extensionJsonText = file_get_contents($extensionJsonFile);
+		$extensionJson = json_decode($extensionJsonText, /* assoc = */ true);
+		$wikidataEntityIds = $this->getEntitiesToImport($extensionJson['config'], $this->getConfig());
 
-		foreach ( $wikidataEntityIds as $key => $wikidataEntityId ) {
-			$localEntityId = $this->importEntityFromWikidata( $wikidataEntityId );
+		foreach ($wikidataEntityIds as $key => $wikidataEntityId) {
+			$localEntityId = $this->importEntityFromWikidata($wikidataEntityId);
 			$configUpdates[$key] = [
 				'wikidata' => $wikidataEntityId,
 				'local' => $localEntityId,
 			];
 		}
 
-		$this->outputConfigUpdates( $configUpdates );
+		$this->outputConfigUpdates($configUpdates);
 	}
 
 	/**
@@ -107,18 +107,18 @@ 
 	 * @param Config $wikiConfig
 	 * @return string[]
 	 */
-	private function getEntitiesToImport( array $extensionJsonConfig, Config $wikiConfig ) {
+	private function getEntitiesToImport(array $extensionJsonConfig, Config $wikiConfig) {
 		$wikidataEntityIds = [];
 
-		foreach ( $extensionJsonConfig as $key => $value ) {
-			if ( !preg_match( '/Id$/', $key ) ) {
+		foreach ($extensionJsonConfig as $key => $value) {
+			if (!preg_match('/Id$/', $key)) {
 				continue;
 			}
 
 			$wikidataEntityId = $value['value'];
-			$localEntityId = $wikiConfig->get( $key );
+			$localEntityId = $wikiConfig->get($key);
 
-			if ( $localEntityId === $wikidataEntityId ) {
+			if ($localEntityId === $wikidataEntityId) {
 				$wikidataEntityIds[$key] = $wikidataEntityId;
 			}
 		}
@@ -130,10 +130,10 @@ 
 	 * @param string $wikidataEntityId
 	 * @return string local entity ID
 	 */
-	private function importEntityFromWikidata( $wikidataEntityId ) {
+	private function importEntityFromWikidata($wikidataEntityId) {
 		$wikidataEntityUrl = "https://www.wikidata.org/wiki/Special:EntityData/$wikidataEntityId.json";
-		$wikidataEntitiesJson = file_get_contents( $wikidataEntityUrl );
-		return $this->importEntityFromJson( $wikidataEntityId, $wikidataEntitiesJson );
+		$wikidataEntitiesJson = file_get_contents($wikidataEntityUrl);
+		return $this->importEntityFromJson($wikidataEntityId, $wikidataEntitiesJson);
 	}
 
 	/**
@@ -141,23 +141,23 @@ 
 	 * @param string $wikidataEntitiesJson
 	 * @return string local entity ID
 	 */
-	private function importEntityFromJson( $wikidataEntityId, $wikidataEntitiesJson ) {
-		$wikidataEntityArray = json_decode( $wikidataEntitiesJson, true )['entities'][$wikidataEntityId];
-		$wikidataEntity = $this->entityDeserializer->deserialize( $wikidataEntityArray );
+	private function importEntityFromJson($wikidataEntityId, $wikidataEntitiesJson) {
+		$wikidataEntityArray = json_decode($wikidataEntitiesJson, true)['entities'][$wikidataEntityId];
+		$wikidataEntity = $this->entityDeserializer->deserialize($wikidataEntityArray);
 
-		$wikidataEntity->setId( null );
+		$wikidataEntity->setId(null);
 
-		if ( $wikidataEntity instanceof StatementListProvider ) {
+		if ($wikidataEntity instanceof StatementListProvider) {
 			$wikidataEntity->getStatements()->clear();
 		}
 
-		if ( $wikidataEntity instanceof Item ) {
-			$wikidataEntity->setSiteLinkList( new SiteLinkList() );
+		if ($wikidataEntity instanceof Item) {
+			$wikidataEntity->setSiteLinkList(new SiteLinkList());
 		}
 
-		if ( $this->getOption( 'dry-run', false ) ) {
-			$wikidataEntityJson = json_encode( $this->entitySerializer->serialize( $wikidataEntity ) );
-			$this->output( $wikidataEntityJson . "\n" );
+		if ($this->getOption('dry-run', false)) {
+			$wikidataEntityJson = json_encode($this->entitySerializer->serialize($wikidataEntity));
+			$this->output($wikidataEntityJson."\n");
 			return "-$wikidataEntityId";
 		}
 
@@ -170,12 +170,12 @@ 
 			)->getEntity();
 
 			return $localEntity->getId()->getSerialization();
-		} catch ( StorageException $storageException ) {
-			return $this->storageExceptionToEntityId( $storageException );
+		} catch (StorageException $storageException) {
+			return $this->storageExceptionToEntityId($storageException);
 		}
 	}
 
-	private function storageExceptionToEntityId( StorageException $storageException ) {
+	private function storageExceptionToEntityId(StorageException $storageException) {
 		$message = $storageException->getMessage();
 		// example messages:
 		// * Item [[Item:Q475|Q475]] already has label "as references"
@@ -185,42 +185,42 @@ 
 		// * Property [[Property:P694|P694]] already has label "instance of"
 		//   associated with language code en.
 		$pattern = '/[[|]([^][|]*)]] already has label .* associated with language code/';
-		if ( preg_match( $pattern, $message, $matches ) ) {
+		if (preg_match($pattern, $message, $matches)) {
 			return $matches[1];
 		} else {
 			throw $storageException;
 		}
 	}
 
-	private function outputConfigUpdates( array $configUpdates ) {
-		$configFormat = $this->getOption( 'config-format', 'globals' );
-		switch ( $configFormat ) {
+	private function outputConfigUpdates(array $configUpdates) {
+		$configFormat = $this->getOption('config-format', 'globals');
+		switch ($configFormat) {
 			case 'globals':
-				$this->outputConfigUpdatesGlobals( $configUpdates );
+				$this->outputConfigUpdatesGlobals($configUpdates);
 				break;
 			case 'wgConf':
-				$this->outputConfigUpdatesWgConf( $configUpdates );
+				$this->outputConfigUpdatesWgConf($configUpdates);
 				break;
 			default:
-				$this->error( "Invalid config format \"$configFormat\", using \"globals\"" );
-				$this->outputConfigUpdatesGlobals( $configUpdates );
+				$this->error("Invalid config format \"$configFormat\", using \"globals\"");
+				$this->outputConfigUpdatesGlobals($configUpdates);
 				break;
 		}
 	}
 
-	private function outputConfigUpdatesGlobals( array $configUpdates ) {
-		foreach ( $configUpdates as $key => $value ) {
-			$localValueCode = var_export( $value['local'], true );
-			$this->output( "\$wg$key = $localValueCode;\n" );
+	private function outputConfigUpdatesGlobals(array $configUpdates) {
+		foreach ($configUpdates as $key => $value) {
+			$localValueCode = var_export($value['local'], true);
+			$this->output("\$wg$key = $localValueCode;\n");
 		}
 	}
 
-	private function outputConfigUpdatesWgConf( array $configUpdates ) {
-		foreach ( $configUpdates as $key => $value ) {
-			$keyCode = var_export( "wg$key", true );
-			$wikidataValueCode = var_export( $value['wikidata'], true );
-			$localValueCode = var_export( $value['local'], true );
-			$wikiIdCode = var_export( wfWikiID(), true );
+	private function outputConfigUpdatesWgConf(array $configUpdates) {
+		foreach ($configUpdates as $key => $value) {
+			$keyCode = var_export("wg$key", true);
+			$wikidataValueCode = var_export($value['wikidata'], true);
+			$localValueCode = var_export($value['local'], true);
+			$wikiIdCode = var_export(wfWikiID(), true);
 			$block = <<< EOF
 $keyCode => [
 	'default' => $wikidataValueCode,
@@ -229,7 +229,7 @@ 
 
 
 EOF;
-			$this->output( $block );
+			$this->output($block);
 		}
 	}
 

src/ConstraintCheck/Helper/SparqlHelper.php

Spacing +172 added lines, -175 removed lines

@@ -163,58 +163,58 @@ 
 		$this->defaultUserAgent = $defaultUserAgent;
 		$this->requestFactory = $requestFactory;
 		$this->entityPrefixes = [];
-		foreach ( $rdfVocabulary->entityNamespaceNames as $namespaceName ) {
-			$this->entityPrefixes[] = $rdfVocabulary->getNamespaceURI( $namespaceName );
+		foreach ($rdfVocabulary->entityNamespaceNames as $namespaceName) {
+			$this->entityPrefixes[] = $rdfVocabulary->getNamespaceURI($namespaceName);
 		}
 
-		$this->prefixes = $this->getQueryPrefixes( $rdfVocabulary );
+		$this->prefixes = $this->getQueryPrefixes($rdfVocabulary);
 	}
 
-	private function getQueryPrefixes( RdfVocabulary $rdfVocabulary ) {
+	private function getQueryPrefixes(RdfVocabulary $rdfVocabulary) {
 		// TODO: it would probably be smarter that RdfVocubulary exposed these prefixes somehow
 		$prefixes = '';
-		foreach ( $rdfVocabulary->entityNamespaceNames as $sourceName => $namespaceName ) {
+		foreach ($rdfVocabulary->entityNamespaceNames as $sourceName => $namespaceName) {
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 		}
 		$prefixes .= <<<END
-PREFIX wds: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_STATEMENT )}>
-PREFIX wdv: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_VALUE )}>\n
+PREFIX wds: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_STATEMENT)}>
+PREFIX wdv: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_VALUE)}>\n
 END;
 
-		foreach ( $rdfVocabulary->propertyNamespaceNames as $sourceName => $sourceNamespaces ) {
+		foreach ($rdfVocabulary->propertyNamespaceNames as $sourceName => $sourceNamespaces) {
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_DIRECT_CLAIM];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_CLAIM];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_CLAIM_STATEMENT];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_QUALIFIER];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_QUALIFIER_VALUE];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_REFERENCE];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 			$namespaceName = $sourceNamespaces[RdfVocabulary::NSP_REFERENCE_VALUE];
 			$prefixes .= <<<END
-PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI( $namespaceName )}>\n
+PREFIX {$namespaceName}: <{$rdfVocabulary->getNamespaceURI($namespaceName)}>\n
 END;
 		}
 		$prefixes .= <<<END
-PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI( RdfVocabulary::NS_ONTOLOGY )}>\n
+PREFIX wikibase: <{$rdfVocabulary->getNamespaceURI(RdfVocabulary::NS_ONTOLOGY)}>\n
 END;
 		return $prefixes;
 	}
@@ -226,22 +226,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 {
@@ -251,19 +250,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)
 		);
 	}
 
@@ -279,10 +278,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. }';
 		}
 
@@ -301,9 +300,9 @@ 
 LIMIT 10
 EOF;
 
-		$result = $this->runQuery( $query );
+		$result = $this->runQuery($query);
 
-		return $this->getOtherEntities( $result );
+		return $this->getOtherEntities($result);
 	}
 
 	/**
@@ -328,16 +327,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;
@@ -357,9 +355,9 @@ 
 LIMIT 10
 EOF;
 
-		$result = $this->runQuery( $query );
+		$result = $this->runQuery($query);
 
-		return $this->getOtherEntities( $result );
+		return $this->getOtherEntities($result);
 	}
 
 	/**
@@ -369,8 +367,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function stringLiteral( $text ) {
-		return '"' . strtr( $text, [ '"' => '\\"', '\\' => '\\\\' ] ) . '"';
+	private function stringLiteral($text) {
+		return '"'.strtr($text, ['"' => '\\"', '\\' => '\\\\']).'"';
 	}
 
 	/**
@@ -380,18 +378,18 @@ 
 	 *
 	 * @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'];
-				foreach ( $this->entityPrefixes as $entityPrefix ) {
-					$entityPrefixLength = strlen( $entityPrefix );
-					if ( substr( $entityIRI, 0, $entityPrefixLength ) === $entityPrefix ) {
+				foreach ($this->entityPrefixes as $entityPrefix) {
+					$entityPrefixLength = strlen($entityPrefix);
+					if (substr($entityIRI, 0, $entityPrefixLength) === $entityPrefix) {
 						try {
 							return $this->entityIdParser->parse(
-								substr( $entityIRI, $entityPrefixLength )
+								substr($entityIRI, $entityPrefixLength)
 							);
-						} catch ( EntityIdParsingException $e ) {
+						} catch (EntityIdParsingException $e) {
 							// fall through
 						}
 					}
@@ -402,7 +400,7 @@ 
 				return null;
 			},
 			$results->getArray()['results']['bindings']
-		), $results->getMetadata() );
+		), $results->getMetadata());
 	}
 
 	// @codingStandardsIgnoreStart cyclomatic complexity of this function is too high
@@ -415,47 +413,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
@@ -468,44 +466,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();
 					}
@@ -529,42 +527,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);
 	}
 
 	/**
@@ -578,25 +576,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)
 			);
 		}
 	}
@@ -608,14 +606,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);
 	}
 
 	/**
@@ -627,17 +625,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;
 			}
@@ -658,34 +656,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));
 	}
 
 	/**
@@ -699,97 +697,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/ConstraintCheck/Helper/RangeCheckerHelper.php

Spacing +43 added lines, -43 removed lines

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

src/ConstraintCheck/Checker/EntityTypeChecker.php

Spacing +10 added lines, -10 removed lines

@@ -51,9 +51,9 @@ 
 		];
 	}
 
-	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);
 		}
 
 		$constraintParameters = $constraint->getConstraintParameters();
@@ -65,10 +65,10 @@ 
 			'item' => $entityTypes->getEntityTypes(),
 		];
 
-		if ( !in_array( $context->getEntity()->getType(), $entityTypes->getEntityTypes() ) ) {
-			$message = ( new ViolationMessage( 'wbqc-violation-message-entityType' ) )
-				->withEntityId( $context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY )
-				->withEntityIdList( $entityTypes->getEntityTypeItemIds(), Role::CONSTRAINT_PARAMETER_VALUE );
+		if (!in_array($context->getEntity()->getType(), $entityTypes->getEntityTypes())) {
+			$message = (new ViolationMessage('wbqc-violation-message-entityType'))
+				->withEntityId($context->getSnak()->getPropertyId(), Role::CONSTRAINT_PROPERTY)
+				->withEntityIdList($entityTypes->getEntityTypeItemIds(), Role::CONSTRAINT_PARAMETER_VALUE);
 
 			return new CheckResult(
 				$context,
@@ -79,10 +79,10 @@ 
 			);
 		}
 
-		return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
+		return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$exceptions = [];
 		try {
@@ -90,7 +90,7 @@ 
 				$constraintParameters,
 				$constraint->getConstraintTypeItemId()
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/Checker/DiffWithinRangeChecker.php

Spacing +41 added lines, -42 removed lines

@@ -76,8 +76,8 @@ 
 	 * @throws ConstraintParameterException
 	 * @return array [ DataValue|null $min, DataValue|null $max, PropertyId $property, array $parameters ]
 	 */
-	private function parseConstraintParameters( Constraint $constraint ) {
-		list( $min, $max ) = $this->constraintParameterParser->parseQuantityRangeParameter(
+	private function parseConstraintParameters(Constraint $constraint) {
+		list($min, $max) = $this->constraintParameterParser->parseQuantityRangeParameter(
 			$constraint->getConstraintParameters(),
 			$constraint->getConstraintTypeItemId()
 		);
@@ -87,15 +87,15 @@ 
 		);
 
 		$parameters = [];
-		if ( $min !== null ) {
-			$parameters['minimum_quantity'] = [ $min ];
+		if ($min !== null) {
+			$parameters['minimum_quantity'] = [$min];
 		}
-		if ( $max !== null ) {
-			$parameters['maximum_quantity'] = [ $max ];
+		if ($max !== null) {
+			$parameters['maximum_quantity'] = [$max];
 		}
-		$parameters['property'] = [ $property ];
+		$parameters['property'] = [$property];
 
-		return [ $min, $max, $property, $parameters ];
+		return [$min, $max, $property, $parameters];
 	}
 
 	/**
@@ -105,13 +105,13 @@ 
 	 *
 	 * @return bool
 	 */
-	private function rangeInYears( $min, $max ) {
-		$yearUnit = $this->config->get( 'WBQualityConstraintsYearUnit' );
+	private function rangeInYears($min, $max) {
+		$yearUnit = $this->config->get('WBQualityConstraintsYearUnit');
 
-		if ( $min !== null && $min->getUnit() === $yearUnit ) {
+		if ($min !== null && $min->getUnit() === $yearUnit) {
 			return true;
 		}
-		if ( $max !== null && $max->getUnit() === $yearUnit ) {
+		if ($max !== null && $max->getUnit() === $yearUnit) {
 			return true;
 		}
 
@@ -127,59 +127,58 @@ 
 	 * @throws ConstraintParameterException
 	 * @return CheckResult
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
 
 		$parameters = [];
 
 		$snak = $context->getSnak();
 
-		if ( !$snak instanceof PropertyValueSnak ) {
+		if (!$snak instanceof PropertyValueSnak) {
 			// nothing to check
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
 		}
 
 		$minuend = $snak->getDataValue();
 
 		/** @var PropertyId $property */
-		list( $min, $max, $property, $parameters ) = $this->parseConstraintParameters( $constraint );
+		list($min, $max, $property, $parameters) = $this->parseConstraintParameters($constraint);
 
 		// checks only the first occurrence of the referenced property
-		foreach ( $context->getSnakGroup( Context::GROUP_NON_DEPRECATED ) as $otherSnak ) {
+		foreach ($context->getSnakGroup(Context::GROUP_NON_DEPRECATED) as $otherSnak) {
 			if (
-				!$property->equals( $otherSnak->getPropertyId() ) ||
+				!$property->equals($otherSnak->getPropertyId()) ||
 				!$otherSnak instanceof PropertyValueSnak
 			) {
 				continue;
 			}
 
 			$subtrahend = $otherSnak->getDataValue();
-			if ( $subtrahend->getType() === $minuend->getType() ) {
-				$diff = $this->rangeInYears( $min, $max ) && $minuend->getType() === 'time' ?
-					$this->rangeCheckerHelper->getDifferenceInYears( $minuend, $subtrahend ) :
-					$this->rangeCheckerHelper->getDifference( $minuend, $subtrahend );
+			if ($subtrahend->getType() === $minuend->getType()) {
+				$diff = $this->rangeInYears($min, $max) && $minuend->getType() === 'time' ?
+					$this->rangeCheckerHelper->getDifferenceInYears($minuend, $subtrahend) : $this->rangeCheckerHelper->getDifference($minuend, $subtrahend);
 
-				if ( $this->rangeCheckerHelper->getComparison( $min, $diff ) > 0 ||
-					$this->rangeCheckerHelper->getComparison( $diff, $max ) > 0
+				if ($this->rangeCheckerHelper->getComparison($min, $diff) > 0 ||
+					$this->rangeCheckerHelper->getComparison($diff, $max) > 0
 				) {
 					// at least one of $min, $max is set at this point, otherwise there could be no violation
-					$openness = $min !== null ? ( $max !== null ? '' : '-rightopen' ) : '-leftopen';
+					$openness = $min !== null ? ($max !== null ? '' : '-rightopen') : '-leftopen';
 					// possible message keys:
 					// wbqc-violation-message-diff-within-range
 					// wbqc-violation-message-diff-within-range-leftopen
 					// wbqc-violation-message-diff-within-range-rightopen
-					$message = ( new ViolationMessage( "wbqc-violation-message-diff-within-range$openness" ) )
-						->withEntityId( $context->getSnak()->getPropertyId(), Role::PREDICATE )
-						->withDataValue( $minuend, Role::OBJECT )
-						->withEntityId( $otherSnak->getPropertyId(), Role::PREDICATE )
-						->withDataValue( $subtrahend, Role::OBJECT );
-					if ( $min !== null ) {
-						$message = $message->withDataValue( $min, Role::OBJECT );
+					$message = (new ViolationMessage("wbqc-violation-message-diff-within-range$openness"))
+						->withEntityId($context->getSnak()->getPropertyId(), Role::PREDICATE)
+						->withDataValue($minuend, Role::OBJECT)
+						->withEntityId($otherSnak->getPropertyId(), Role::PREDICATE)
+						->withDataValue($subtrahend, Role::OBJECT);
+					if ($min !== null) {
+						$message = $message->withDataValue($min, Role::OBJECT);
 					}
-					if ( $max !== null ) {
-						$message = $message->withDataValue( $max, Role::OBJECT );
+					if ($max !== null) {
+						$message = $message->withDataValue($max, Role::OBJECT);
 					}
 					$status = CheckResult::STATUS_VIOLATION;
 				} else {
@@ -187,17 +186,17 @@ 
 					$status = CheckResult::STATUS_COMPLIANCE;
 				}
 			} else {
-				$message = new ViolationMessage( 'wbqc-violation-message-diff-within-range-must-have-equal-types' );
+				$message = new ViolationMessage('wbqc-violation-message-diff-within-range-must-have-equal-types');
 				$status = CheckResult::STATUS_VIOLATION;
 			}
 
-			return new CheckResult( $context, $constraint, $parameters, $status, $message );
+			return new CheckResult($context, $constraint, $parameters, $status, $message);
 		}
 
-		return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
+		return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
 	}
 
-	public function checkConstraintParameters( Constraint $constraint ) {
+	public function checkConstraintParameters(Constraint $constraint) {
 		$constraintParameters = $constraint->getConstraintParameters();
 		$constraintTypeItemId = $constraint->getConstraintTypeItemId();
 		$exceptions = [];
@@ -206,7 +205,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
@@ -214,7 +213,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

src/ConstraintCheck/ItemIdSnakValue.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
 	 * @param ItemId $itemId
 	 * @return self
 	 */
-	public static function fromItemId( ItemId $itemId ) {
+	public static function fromItemId(ItemId $itemId) {
 		$ret = new self;
 		$ret->itemId = $itemId;
 		return $ret;
@@ -80,14 +80,14 @@ 
 	 * @throws InvalidArgumentException
 	 * @return self
 	 */
-	public static function fromSnak( Snak $snak ) {
-		switch ( true ) {
+	public static function fromSnak(Snak $snak) {
+		switch (true) {
 			case $snak instanceof PropertyValueSnak:
 				$dataValue = $snak->getDataValue();
-				if ( $dataValue instanceof EntityIdValue ) {
+				if ($dataValue instanceof EntityIdValue) {
 					$itemId = $dataValue->getEntityId();
-					if ( $itemId instanceof ItemId ) {
-						return self::fromItemId( $itemId );
+					if ($itemId instanceof ItemId) {
+						return self::fromItemId($itemId);
 					}
 				}
 				break;
@@ -97,7 +97,7 @@ 
 				return self::noValue();
 		}
 
-		throw new InvalidArgumentException( 'Snak must contain item ID value or be a somevalue / novalue snak' );
+		throw new InvalidArgumentException('Snak must contain item ID value or be a somevalue / novalue snak');
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	 * @return ItemId
 	 */
 	public function getItemId() {
-		if ( ! $this->isValue() ) {
-			throw new DomainException( 'This value does not contain an item ID.' );
+		if (!$this->isValue()) {
+			throw new DomainException('This value does not contain an item ID.');
 		}
 		return $this->itemId;
 	}
@@ -148,13 +148,13 @@ 
 	 * @param Snak $snak
 	 * @return bool
 	 */
-	public function matchesSnak( Snak $snak ) {
-		switch ( true ) {
+	public function matchesSnak(Snak $snak) {
+		switch (true) {
 			case $snak instanceof PropertyValueSnak:
 				return $this->isValue() &&
 					$snak->getDataValue() instanceof EntityIdValue &&
 					$snak->getDataValue()->getEntityId() instanceof ItemId &&
-					$snak->getDataValue()->getEntityId()->equals( $this->getItemId() );
+					$snak->getDataValue()->getEntityId()->equals($this->getItemId());
 			case $snak instanceof PropertySomeValueSnak:
 				return $this->isSomeValue();
 			case $snak instanceof PropertyNoValueSnak:

src/ServiceWiring.php

Spacing +104 added lines, -104 removed lines

@@ -27,28 +27,28 @@ 
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResultSerializer;
 
 return [
-	ConstraintsServices::EXPIRY_LOCK => function( MediaWikiServices $services ) {
-		return new ExpiryLock( ObjectCache::getInstance( CACHE_ANYTHING ) );
+	ConstraintsServices::EXPIRY_LOCK => function(MediaWikiServices $services) {
+		return new ExpiryLock(ObjectCache::getInstance(CACHE_ANYTHING));
 	},
 
-	ConstraintsServices::LOGGING_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::LOGGING_HELPER => function(MediaWikiServices $services) {
 		return new LoggingHelper(
 			$services->getStatsdDataFactory(),
-			LoggerFactory::getInstance( 'WikibaseQualityConstraints' ),
+			LoggerFactory::getInstance('WikibaseQualityConstraints'),
 			$services->getMainConfig()
 		);
 	},
 
-	ConstraintsServices::CONSTRAINT_REPOSITORY => function( MediaWikiServices $services ) {
-		return new ConstraintRepository( $services->getDBLoadBalancer() );
+	ConstraintsServices::CONSTRAINT_REPOSITORY => function(MediaWikiServices $services) {
+		return new ConstraintRepository($services->getDBLoadBalancer());
 	},
 
-	ConstraintsServices::CONSTRAINT_LOOKUP => function( MediaWikiServices $services ) {
-		$constraintRepository = ConstraintsServices::getConstraintRepository( $services );
-		return new CachingConstraintLookup( $constraintRepository );
+	ConstraintsServices::CONSTRAINT_LOOKUP => function(MediaWikiServices $services) {
+		$constraintRepository = ConstraintsServices::getConstraintRepository($services);
+		return new CachingConstraintLookup($constraintRepository);
 	},
 
-	ConstraintsServices::CHECK_RESULT_SERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CHECK_RESULT_SERIALIZER => function(MediaWikiServices $services) {
 		return new CheckResultSerializer(
 			new ConstraintSerializer(
 				false // constraint parameters are not exposed
@@ -59,7 +59,7 @@ 
 		);
 	},
 
-	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CHECK_RESULT_DESERIALIZER => function(MediaWikiServices $services) {
 		// TODO in the future, get EntityIdParser and DataValueFactory from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$entityIdParser = $repo->getEntityIdParser();
@@ -76,11 +76,11 @@ 
 		);
 	},
 
-	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::VIOLATION_MESSAGE_SERIALIZER => function(MediaWikiServices $services) {
 		return new ViolationMessageSerializer();
 	},
 
-	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function( MediaWikiServices $services ) {
+	ConstraintsServices::VIOLATION_MESSAGE_DESERIALIZER => function(MediaWikiServices $services) {
 		// TODO in the future, get EntityIdParser and DataValueFactory from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$entityIdParser = $repo->getEntityIdParser();
@@ -92,7 +92,7 @@ 
 		);
 	},
 
-	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONSTRAINT_PARAMETER_PARSER => function(MediaWikiServices $services) {
 		// TODO in the future, get DeserializerFactory and concept base URIs from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$deserializerFactory = $repo->getBaseDataModelDeserializerFactory();
@@ -105,11 +105,11 @@ 
 		);
 	},
 
-	ConstraintsServices::CONNECTION_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::CONNECTION_CHECKER_HELPER => function(MediaWikiServices $services) {
 		return new ConnectionCheckerHelper();
 	},
 
-	ConstraintsServices::RANGE_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::RANGE_CHECKER_HELPER => function(MediaWikiServices $services) {
 		// TODO in the future, get UnitConverter from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$unitConverter = $repo->getUnitConverter();
@@ -120,9 +120,9 @@ 
 		);
 	},
 
-	ConstraintsServices::SPARQL_HELPER => function( MediaWikiServices $services ) {
-		$endpoint = $services->getMainConfig()->get( 'WBQualityConstraintsSparqlEndpoint' );
-		if ( $endpoint === '' ) {
+	ConstraintsServices::SPARQL_HELPER => function(MediaWikiServices $services) {
+		$endpoint = $services->getMainConfig()->get('WBQualityConstraintsSparqlEndpoint');
+		if ($endpoint === '') {
 			return new DummySparqlHelper();
 		}
 
@@ -138,117 +138,117 @@ 
 			$entityIdParser,
 			$propertyDataTypeLookup,
 			$services->getMainWANObjectCache(),
-			ConstraintsServices::getViolationMessageSerializer( $services ),
-			ConstraintsServices::getViolationMessageDeserializer( $services ),
+			ConstraintsServices::getViolationMessageSerializer($services),
+			ConstraintsServices::getViolationMessageDeserializer($services),
 			$services->getStatsdDataFactory(),
-			ConstraintsServices::getExpiryLock( $services ),
+			ConstraintsServices::getExpiryLock($services),
 			ConstraintsServices::getLoggingHelper(),
-			wfWikiID() . ' WikibaseQualityConstraints ' . Http::userAgent(),
+			wfWikiID().' WikibaseQualityConstraints '.Http::userAgent(),
 			$services->getHttpRequestFactory()
 		);
 	},
 
-	ConstraintsServices::TYPE_CHECKER_HELPER => function( MediaWikiServices $services ) {
+	ConstraintsServices::TYPE_CHECKER_HELPER => function(MediaWikiServices $services) {
 		return new TypeCheckerHelper(
-			WikibaseServices::getEntityLookup( $services ),
+			WikibaseServices::getEntityLookup($services),
 			$services->getMainConfig(),
-			ConstraintsServices::getSparqlHelper( $services ),
+			ConstraintsServices::getSparqlHelper($services),
 			$services->getStatsdDataFactory()
 		);
 	},
 
-	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function( MediaWikiServices $services ) {
+	ConstraintsServices::DELEGATING_CONSTRAINT_CHECKER => function(MediaWikiServices $services) {
 		// TODO in the future, get StatementGuidParser from $services?
 		$repo = WikibaseRepo::getDefaultInstance();
 		$statementGuidParser = $repo->getStatementGuidParser();
 
 		$config = $services->getMainConfig();
 		$checkerMap = [
-			$config->get( 'WBQualityConstraintsConflictsWithConstraintId' )
-				=> ConstraintCheckerServices::getConflictsWithChecker( $services ),
-			$config->get( 'WBQualityConstraintsItemRequiresClaimConstraintId' )
-				=> ConstraintCheckerServices::getItemChecker( $services ),
-			$config->get( 'WBQualityConstraintsValueRequiresClaimConstraintId' )
-				=> ConstraintCheckerServices::getTargetRequiredClaimChecker( $services ),
-			$config->get( 'WBQualityConstraintsSymmetricConstraintId' )
-				=> ConstraintCheckerServices::getSymmetricChecker( $services ),
-			$config->get( 'WBQualityConstraintsInverseConstraintId' )
-				=> ConstraintCheckerServices::getInverseChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedAsQualifierConstraintId' )
-				=> ConstraintCheckerServices::getQualifierChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedQualifiersConstraintId' )
-				=> ConstraintCheckerServices::getQualifiersChecker( $services ),
-			$config->get( 'WBQualityConstraintsMandatoryQualifierConstraintId' )
-				=> ConstraintCheckerServices::getMandatoryQualifiersChecker( $services ),
-			$config->get( 'WBQualityConstraintsRangeConstraintId' )
-				=> ConstraintCheckerServices::getRangeChecker( $services ),
-			$config->get( 'WBQualityConstraintsDifferenceWithinRangeConstraintId' )
-				=> ConstraintCheckerServices::getDiffWithinRangeChecker( $services ),
-			$config->get( 'WBQualityConstraintsTypeConstraintId' )
-				=> ConstraintCheckerServices::getTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsValueTypeConstraintId' )
-				=> ConstraintCheckerServices::getValueTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsSingleValueConstraintId' )
-				=> ConstraintCheckerServices::getSingleValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsMultiValueConstraintId' )
-				=> ConstraintCheckerServices::getMultiValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' )
-				=> ConstraintCheckerServices::getUniqueValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsFormatConstraintId' )
-				=> ConstraintCheckerServices::getFormatChecker( $services ),
-			$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' )
-				=> ConstraintCheckerServices::getCommonsLinkChecker( $services ),
-			$config->get( 'WBQualityConstraintsOneOfConstraintId' )
-				=> ConstraintCheckerServices::getOneOfChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedForValuesOnlyConstraintId' )
-				=> ConstraintCheckerServices::getValueOnlyChecker( $services ),
-			$config->get( 'WBQualityConstraintsUsedAsReferenceConstraintId' )
-				=> ConstraintCheckerServices::getReferenceChecker( $services ),
-			$config->get( 'WBQualityConstraintsNoBoundsConstraintId' )
-				=> ConstraintCheckerServices::getNoBoundsChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedUnitsConstraintId' )
-				=> ConstraintCheckerServices::getAllowedUnitsChecker( $services ),
-			$config->get( 'WBQualityConstraintsSingleBestValueConstraintId' )
-				=> ConstraintCheckerServices::getSingleBestValueChecker( $services ),
-			$config->get( 'WBQualityConstraintsAllowedEntityTypesConstraintId' )
-				=> ConstraintCheckerServices::getEntityTypeChecker( $services ),
-			$config->get( 'WBQualityConstraintsNoneOfConstraintId' )
-				=> ConstraintCheckerServices::getNoneOfChecker( $services ),
-			$config->get( 'WBQualityConstraintsIntegerConstraintId' )
-				=> ConstraintCheckerServices::getIntegerChecker( $services ),
-			$config->get( 'WBQualityConstraintsCitationNeededConstraintId' )
-				=> ConstraintCheckerServices::getCitationNeededChecker( $services ),
-			$config->get( 'WBQualityConstraintsPropertyScopeConstraintId' )
-				=> ConstraintCheckerServices::getPropertyScopeChecker( $services ),
-			$config->get( 'WBQualityConstraintsContemporaryConstraintId' )
-				=> ConstraintCheckerServices::getContemporaryChecker( $services ),
+			$config->get('WBQualityConstraintsConflictsWithConstraintId')
+				=> ConstraintCheckerServices::getConflictsWithChecker($services),
+			$config->get('WBQualityConstraintsItemRequiresClaimConstraintId')
+				=> ConstraintCheckerServices::getItemChecker($services),
+			$config->get('WBQualityConstraintsValueRequiresClaimConstraintId')
+				=> ConstraintCheckerServices::getTargetRequiredClaimChecker($services),
+			$config->get('WBQualityConstraintsSymmetricConstraintId')
+				=> ConstraintCheckerServices::getSymmetricChecker($services),
+			$config->get('WBQualityConstraintsInverseConstraintId')
+				=> ConstraintCheckerServices::getInverseChecker($services),
+			$config->get('WBQualityConstraintsUsedAsQualifierConstraintId')
+				=> ConstraintCheckerServices::getQualifierChecker($services),
+			$config->get('WBQualityConstraintsAllowedQualifiersConstraintId')
+				=> ConstraintCheckerServices::getQualifiersChecker($services),
+			$config->get('WBQualityConstraintsMandatoryQualifierConstraintId')
+				=> ConstraintCheckerServices::getMandatoryQualifiersChecker($services),
+			$config->get('WBQualityConstraintsRangeConstraintId')
+				=> ConstraintCheckerServices::getRangeChecker($services),
+			$config->get('WBQualityConstraintsDifferenceWithinRangeConstraintId')
+				=> ConstraintCheckerServices::getDiffWithinRangeChecker($services),
+			$config->get('WBQualityConstraintsTypeConstraintId')
+				=> ConstraintCheckerServices::getTypeChecker($services),
+			$config->get('WBQualityConstraintsValueTypeConstraintId')
+				=> ConstraintCheckerServices::getValueTypeChecker($services),
+			$config->get('WBQualityConstraintsSingleValueConstraintId')
+				=> ConstraintCheckerServices::getSingleValueChecker($services),
+			$config->get('WBQualityConstraintsMultiValueConstraintId')
+				=> ConstraintCheckerServices::getMultiValueChecker($services),
+			$config->get('WBQualityConstraintsDistinctValuesConstraintId')
+				=> ConstraintCheckerServices::getUniqueValueChecker($services),
+			$config->get('WBQualityConstraintsFormatConstraintId')
+				=> ConstraintCheckerServices::getFormatChecker($services),
+			$config->get('WBQualityConstraintsCommonsLinkConstraintId')
+				=> ConstraintCheckerServices::getCommonsLinkChecker($services),
+			$config->get('WBQualityConstraintsOneOfConstraintId')
+				=> ConstraintCheckerServices::getOneOfChecker($services),
+			$config->get('WBQualityConstraintsUsedForValuesOnlyConstraintId')
+				=> ConstraintCheckerServices::getValueOnlyChecker($services),
+			$config->get('WBQualityConstraintsUsedAsReferenceConstraintId')
+				=> ConstraintCheckerServices::getReferenceChecker($services),
+			$config->get('WBQualityConstraintsNoBoundsConstraintId')
+				=> ConstraintCheckerServices::getNoBoundsChecker($services),
+			$config->get('WBQualityConstraintsAllowedUnitsConstraintId')
+				=> ConstraintCheckerServices::getAllowedUnitsChecker($services),
+			$config->get('WBQualityConstraintsSingleBestValueConstraintId')
+				=> ConstraintCheckerServices::getSingleBestValueChecker($services),
+			$config->get('WBQualityConstraintsAllowedEntityTypesConstraintId')
+				=> ConstraintCheckerServices::getEntityTypeChecker($services),
+			$config->get('WBQualityConstraintsNoneOfConstraintId')
+				=> ConstraintCheckerServices::getNoneOfChecker($services),
+			$config->get('WBQualityConstraintsIntegerConstraintId')
+				=> ConstraintCheckerServices::getIntegerChecker($services),
+			$config->get('WBQualityConstraintsCitationNeededConstraintId')
+				=> ConstraintCheckerServices::getCitationNeededChecker($services),
+			$config->get('WBQualityConstraintsPropertyScopeConstraintId')
+				=> ConstraintCheckerServices::getPropertyScopeChecker($services),
+			$config->get('WBQualityConstraintsContemporaryConstraintId')
+				=> ConstraintCheckerServices::getContemporaryChecker($services),
 		];
 
 		return new DelegatingConstraintChecker(
-			WikibaseServices::getEntityLookup( $services ),
+			WikibaseServices::getEntityLookup($services),
 			$checkerMap,
-			ConstraintsServices::getConstraintLookup( $services ),
-			ConstraintsServices::getConstraintParameterParser( $services ),
+			ConstraintsServices::getConstraintLookup($services),
+			ConstraintsServices::getConstraintParameterParser($services),
 			$statementGuidParser,
-			ConstraintsServices::getLoggingHelper( $services ),
-			$config->get( 'WBQualityConstraintsCheckQualifiers' ),
-			$config->get( 'WBQualityConstraintsCheckReferences' ),
-			$config->get( 'WBQualityConstraintsPropertiesWithViolatingQualifiers' )
+			ConstraintsServices::getLoggingHelper($services),
+			$config->get('WBQualityConstraintsCheckQualifiers'),
+			$config->get('WBQualityConstraintsCheckReferences'),
+			$config->get('WBQualityConstraintsPropertiesWithViolatingQualifiers')
 		);
 	},
 
-	ConstraintsServices::RESULTS_SOURCE => function( MediaWikiServices $services ) {
+	ConstraintsServices::RESULTS_SOURCE => function(MediaWikiServices $services) {
 		$config = $services->getMainConfig();
 		$resultsSource = new CheckingResultsSource(
-			ConstraintsServices::getDelegatingConstraintChecker( $services )
+			ConstraintsServices::getDelegatingConstraintChecker($services)
 		);
 
-		if ( $config->get( 'WBQualityConstraintsCacheCheckConstraintsResults' ) ) {
+		if ($config->get('WBQualityConstraintsCacheCheckConstraintsResults')) {
 			$possiblyStaleConstraintTypes = [
-				$config->get( 'WBQualityConstraintsCommonsLinkConstraintId' ),
-				$config->get( 'WBQualityConstraintsTypeConstraintId' ),
-				$config->get( 'WBQualityConstraintsValueTypeConstraintId' ),
-				$config->get( 'WBQualityConstraintsDistinctValuesConstraintId' ),
+				$config->get('WBQualityConstraintsCommonsLinkConstraintId'),
+				$config->get('WBQualityConstraintsTypeConstraintId'),
+				$config->get('WBQualityConstraintsValueTypeConstraintId'),
+				$config->get('WBQualityConstraintsDistinctValuesConstraintId'),
 			];
 			// TODO in the future, get EntityIdParser and WikiPageEntityMetaDataAccessor from $services?
 			$repo = WikibaseRepo::getDefaultInstance();
@@ -258,14 +258,14 @@ 
 			$resultsSource = new CachingResultsSource(
 				$resultsSource,
 				ResultsCache::getDefaultInstance(),
-				ConstraintsServices::getCheckResultSerializer( $services ),
-				ConstraintsServices::getCheckResultDeserializer( $services ),
+				ConstraintsServices::getCheckResultSerializer($services),
+				ConstraintsServices::getCheckResultDeserializer($services),
 				$wikiPageEntityMetaDataAccessor,
 				$entityIdParser,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsTTLSeconds' ),
+				$config->get('WBQualityConstraintsCacheCheckConstraintsTTLSeconds'),
 				$possiblyStaleConstraintTypes,
-				$config->get( 'WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds' ),
-				ConstraintsServices::getLoggingHelper( $services )
+				$config->get('WBQualityConstraintsCacheCheckConstraintsMaximumRevisionIds'),
+				ConstraintsServices::getLoggingHelper($services)
 			);
 		}
 

src/UpdateConstraintsTableJob.php

Spacing +20 added lines, -20 removed lines

@@ -28,8 +28,8 @@ 
 
 	const BATCH_SIZE = 10;
 
-	public static function newFromGlobalState( Title $title, array $params ) {
-		Assert::parameterType( 'string', $params['propertyId'], '$params["propertyId"]' );
+	public static function newFromGlobalState(Title $title, array $params) {
+		Assert::parameterType('string', $params['propertyId'], '$params["propertyId"]');
 		$repo = WikibaseRepo::getDefaultInstance();
 		return new UpdateConstraintsTableJob(
 			$title,
@@ -38,7 +38,7 @@ 
 			$params['revisionId'] ?? null,
 			MediaWikiServices::getInstance()->getMainConfig(),
 			ConstraintsServices::getConstraintRepository(),
-			$repo->getEntityRevisionLookup( Store::LOOKUP_CACHING_DISABLED ),
+			$repo->getEntityRevisionLookup(Store::LOOKUP_CACHING_DISABLED),
 			$repo->getBaseDataModelSerializerFactory()->newSnakSerializer()
 		);
 	}
@@ -93,7 +93,7 @@ 
 		EntityRevisionLookup $entityRevisionLookup,
 		Serializer $snakSerializer
 	) {
-		parent::__construct( 'constraintsTableUpdate', $title, $params );
+		parent::__construct('constraintsTableUpdate', $title, $params);
 
 		$this->propertyId = $propertyId;
 		$this->revisionId = $revisionId;
@@ -103,11 +103,11 @@ 
 		$this->snakSerializer = $snakSerializer;
 	}
 
-	public function extractParametersFromQualifiers( SnakList $qualifiers ) {
+	public function extractParametersFromQualifiers(SnakList $qualifiers) {
 		$parameters = [];
-		foreach ( $qualifiers as $qualifier ) {
+		foreach ($qualifiers as $qualifier) {
 			$qualifierId = $qualifier->getPropertyId()->getSerialization();
-			$paramSerialization = $this->snakSerializer->serialize( $qualifier );
+			$paramSerialization = $this->snakSerializer->serialize($qualifier);
 			$parameters[$qualifierId][] = $paramSerialization;
 		}
 		return $parameters;
@@ -119,7 +119,7 @@ 
 	) {
 		$constraintId = $constraintStatement->getGuid();
 		$constraintTypeQid = $constraintStatement->getMainSnak()->getDataValue()->getEntityId()->getSerialization();
-		$parameters = $this->extractParametersFromQualifiers( $constraintStatement->getQualifiers() );
+		$parameters = $this->extractParametersFromQualifiers($constraintStatement->getQualifiers());
 		return new Constraint(
 			$constraintId,
 			$propertyId,
@@ -134,17 +134,17 @@ 
 		PropertyId $propertyConstraintPropertyId
 	) {
 		$constraintsStatements = $property->getStatements()
-			->getByPropertyId( $propertyConstraintPropertyId )
-			->getByRank( [ Statement::RANK_PREFERRED, Statement::RANK_NORMAL ] );
+			->getByPropertyId($propertyConstraintPropertyId)
+			->getByRank([Statement::RANK_PREFERRED, Statement::RANK_NORMAL]);
 		$constraints = [];
-		foreach ( $constraintsStatements->getIterator() as $constraintStatement ) {
-			$constraints[] = $this->extractConstraintFromStatement( $property->getId(), $constraintStatement );
-			if ( count( $constraints ) >= self::BATCH_SIZE ) {
-				$constraintRepo->insertBatch( $constraints );
+		foreach ($constraintsStatements->getIterator() as $constraintStatement) {
+			$constraints[] = $this->extractConstraintFromStatement($property->getId(), $constraintStatement);
+			if (count($constraints) >= self::BATCH_SIZE) {
+				$constraintRepo->insertBatch($constraints);
 				$constraints = [];
 			}
 		}
-		$constraintRepo->insertBatch( $constraints );
+		$constraintRepo->insertBatch($constraints);
 	}
 
 	/**
@@ -155,26 +155,26 @@ 
 	public function run() {
 		// TODO in the future: only touch constraints affected by the edit (requires T163465)
 
-		$propertyId = new PropertyId( $this->propertyId );
+		$propertyId = new PropertyId($this->propertyId);
 		$propertyRevision = $this->entityRevisionLookup->getEntityRevision(
 			$propertyId,
 			0, // latest
 			EntityRevisionLookup::LATEST_FROM_REPLICA
 		);
 
-		if ( $this->revisionId !== null && $propertyRevision->getRevisionId() < $this->revisionId ) {
-			JobQueueGroup::singleton()->push( $this );
+		if ($this->revisionId !== null && $propertyRevision->getRevisionId() < $this->revisionId) {
+			JobQueueGroup::singleton()->push($this);
 			return true;
 		}
 
-		$this->constraintRepo->deleteForProperty( $propertyId );
+		$this->constraintRepo->deleteForProperty($propertyId);
 
 		/** @var Property $property */
 		$property = $propertyRevision->getEntity();
 		$this->importConstraintsForProperty(
 			$property,
 			$this->constraintRepo,
-			new PropertyId( $this->config->get( 'WBQualityConstraintsPropertyConstraintId' ) )
+			new PropertyId($this->config->get('WBQualityConstraintsPropertyConstraintId'))
 		);
 
 		return true;