wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/ConstraintCheck/Checker/ValueTypeChecker.php

Spacing +28 added lines, -28 removed lines

@@ -91,9 +91,9 @@ 
 	 * @throws SparqlHelperException if the checker uses SPARQL and the query times out or some other error occurs
 	 * @return CheckResult
 	 */
-	public function checkConstraint( Context $context, Constraint $constraint ) {
-		if ( $context->getSnakRank() === Statement::RANK_DEPRECATED ) {
-			return new CheckResult( $context, $constraint, [], CheckResult::STATUS_DEPRECATED );
+	public function checkConstraint(Context $context, Constraint $constraint) {
+		if ($context->getSnakRank() === Statement::RANK_DEPRECATED) {
+			return new CheckResult($context, $constraint, [], CheckResult::STATUS_DEPRECATED);
 		}
 
 		$parameters = [];
@@ -105,8 +105,8 @@ 
 			$constraintTypeItemId
 		);
 		$parameters['class'] = array_map(
-			function( $id ) {
-				return new ItemId( $id );
+			function($id) {
+				return new ItemId($id);
 			},
 			$classes
 		);
@@ -116,19 +116,19 @@ 
 			$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];
 
 		$snak = $context->getSnak();
 
-		if ( !$snak instanceof PropertyValueSnak ) {
+		if (!$snak instanceof PropertyValueSnak) {
 			// nothing to check
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE );
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_COMPLIANCE);
 		}
 
 		$dataValue = $snak->getDataValue();
@@ -137,24 +137,24 @@ 
 		 * error handling:
 		 *   type of $dataValue for properties with 'Value type' constraint has to be 'wikibase-entityid'
 		 */
-		if ( $dataValue->getType() !== 'wikibase-entityid' ) {
-			$message = ( new ViolationMessage( 'wbqc-violation-message-value-needed-of-type' ) )
-				->withEntityId( new ItemId( $constraintTypeItemId ), Role::CONSTRAINT_TYPE_ITEM )
-				->withDataValueType( 'wikibase-entityid' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		if ($dataValue->getType() !== 'wikibase-entityid') {
+			$message = (new ViolationMessage('wbqc-violation-message-value-needed-of-type'))
+				->withEntityId(new ItemId($constraintTypeItemId), Role::CONSTRAINT_TYPE_ITEM)
+				->withDataValueType('wikibase-entityid');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 		/** @var EntityIdValue $dataValue */
 
 		try {
-			$item = $this->entityLookup->getEntity( $dataValue->getEntityId() );
-		} catch ( UnresolvedEntityRedirectException $e ) {
+			$item = $this->entityLookup->getEntity($dataValue->getEntityId());
+		} catch (UnresolvedEntityRedirectException $e) {
 			// Edge case (double redirect): Pretend the entity doesn't exist
 			$item = null;
 		}
 
-		if ( !( $item instanceof StatementListProvider ) ) {
-			$message = new ViolationMessage( 'wbqc-violation-message-value-entity-must-exist' );
-			return new CheckResult( $context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message );
+		if (!($item instanceof StatementListProvider)) {
+			$message = new ViolationMessage('wbqc-violation-message-value-entity-must-exist');
+			return new CheckResult($context, $constraint, $parameters, CheckResult::STATUS_VIOLATION, $message);
 		}
 
 		$statements = $item->getStatements();
@@ -165,7 +165,7 @@ 
 			$classes
 		);
 
-		if ( $result->getBool() ) {
+		if ($result->getBool()) {
 			$message = null;
 			$status = CheckResult::STATUS_COMPLIANCE;
 		} else {
@@ -179,11 +179,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 = [];
@@ -192,7 +192,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
@@ -200,7 +200,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} 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()
 		);
@@ -86,15 +86,15 @@ 
 			$constraint->getConstraintTypeItemId()
 		);
 
-		if ( $min !== null ) {
-			$parameters['minimum_quantity'] = [ $min ];
+		if ($min !== null) {
+			$parameters['minimum_quantity'] = [$min];
 		}
-		if ( $max !== null ) {
-			$parameters['maximum_quantity'] = [ $max ];
+		if ($max !== null) {
+			$parameters['maximum_quantity'] = [$max];
 		}
-		$parameters['property'] = [ $property ];
+		$parameters['property'] = [$property];
 
-		return [ $min, $max, $property, $parameters ];
+		return [$min, $max, $property, $parameters];
 	}
 
 	/**
@@ -104,13 +104,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;
 		}
 
@@ -126,59 +126,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 {
@@ -186,17 +185,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 = [];
@@ -205,7 +204,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		try {
@@ -213,7 +212,7 @@ 
 				$constraintParameters,
 				$constraintTypeItemId
 			);
-		} catch ( ConstraintParameterException $e ) {
+		} catch (ConstraintParameterException $e) {
 			$exceptions[] = $e;
 		}
 		return $exceptions;

maintenance/ImportConstraintEntities.php

Spacing +55 added lines, -55 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,13 +52,13 @@ 
 		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(
@@ -75,8 +75,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');
 		}
 	}
 
@@ -85,20 +85,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);
 	}
 
 	/**
@@ -106,18 +106,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;
 			}
 		}
@@ -129,10 +129,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);
 	}
 
 	/**
@@ -140,23 +140,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";
 		}
 
@@ -169,12 +169,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"
@@ -184,42 +184,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,
@@ -228,7 +228,7 @@ 
 
 
 EOF;
-			$this->output( $block );
+			$this->output($block);
 		}
 	}
 

src/Api/CheckConstraintsRdf.php

Spacing +29 added lines, -29 removed lines

@@ -39,13 +39,13 @@ 
 		EntityIdLookup $entityIdLookup,
 		RdfVocabulary $rdfVocabulary
 	) {
-		parent::__construct( $page, $context );
+		parent::__construct($page, $context);
 		$this->resultsSource = $resultsSource;
 		$this->entityIdLookup = $entityIdLookup;
 		$this->rdfVocabulary = $rdfVocabulary;
 	}
 
-	public static function newFromGlobalState( Page $page, IContextSource $context ) {
+	public static function newFromGlobalState(Page $page, IContextSource $context) {
 		$repo = WikibaseRepo::getDefaultInstance();
 
 		return new static(
@@ -92,8 +92,8 @@ 
 	 * @param string $guid
 	 * @return string
 	 */
-	private function cleanupGuid( $guid ) {
-		return preg_replace( '/[^\w-]/', '-', $guid );
+	private function cleanupGuid($guid) {
+		return preg_replace('/[^\w-]/', '-', $guid);
 	}
 
 	/**
@@ -105,60 +105,60 @@ 
 		$response = $this->getRequest()->response();
 		$this->getOutput()->disable();
 
-		if ( !$this->resultsSource instanceof CachingResultsSource ) {
+		if (!$this->resultsSource instanceof CachingResultsSource) {
 			// TODO: make configurable whether only cached results are returned
-			$response->statusHeader( 501 ); // Not Implemented
+			$response->statusHeader(501); // Not Implemented
 			return null;
 		}
 
-		$entityId = $this->entityIdLookup->getEntityIdForTitle( $this->getTitle() );
-		if ( $entityId === null ) {
-			$response->statusHeader( 404 ); // Not Found
+		$entityId = $this->entityIdLookup->getEntityIdForTitle($this->getTitle());
+		if ($entityId === null) {
+			$response->statusHeader(404); // Not Found
 			return null;
 		}
-		$revId = $this->getRequest()->getVal( 'revision', 0 );
+		$revId = $this->getRequest()->getVal('revision', 0);
 
-		$results = $this->resultsSource->getStoredResults( $entityId, $revId );
-		if ( $results === null ) {
-			$response->statusHeader( 204 ); // No Content
+		$results = $this->resultsSource->getStoredResults($entityId, $revId);
+		if ($results === null) {
+			$response->statusHeader(204); // No Content
 			return null;
 		}
 
 		$format = 'ttl'; // TODO: make format an option
 
 		$writerFactory = new RdfWriterFactory();
-		$formatName = $writerFactory->getFormatName( $format );
-		$contentType = $writerFactory->getMimeTypes( $formatName )[0];
+		$formatName = $writerFactory->getFormatName($format);
+		$contentType = $writerFactory->getMimeTypes($formatName)[0];
 
-		$writer = $writerFactory->getWriter( $formatName );
-		foreach ( [ RdfVocabulary::NS_STATEMENT, RdfVocabulary::NS_ONTOLOGY ] as $ns ) {
-			$writer->prefix( $ns, $this->rdfVocabulary->getNamespaceURI( $ns ) );
+		$writer = $writerFactory->getWriter($formatName);
+		foreach ([RdfVocabulary::NS_STATEMENT, RdfVocabulary::NS_ONTOLOGY] as $ns) {
+			$writer->prefix($ns, $this->rdfVocabulary->getNamespaceURI($ns));
 		}
 		$writer->start();
 		$writtenAny = false;
 
-		foreach ( $results->getArray() as $checkResult ) {
-			if ( $checkResult instanceof NullResult ) {
+		foreach ($results->getArray() as $checkResult) {
+			if ($checkResult instanceof NullResult) {
 				continue;
 			}
-			if ( $checkResult->getStatus() === CheckResult::STATUS_BAD_PARAMETERS ) {
+			if ($checkResult->getStatus() === CheckResult::STATUS_BAD_PARAMETERS) {
 				continue;
 			}
 			$writtenAny = true;
-			$writer->about( RdfVocabulary::NS_STATEMENT,
-				$this->cleanupGuid( $checkResult->getContextCursor()->getStatementGuid() ) )
-				->say( RdfVocabulary::NS_ONTOLOGY, 'hasViolationForConstraint' )
-				->is( RdfVocabulary::NS_STATEMENT,
-					$this->cleanupGuid( $checkResult->getConstraint()->getConstraintId() ) );
+			$writer->about(RdfVocabulary::NS_STATEMENT,
+				$this->cleanupGuid($checkResult->getContextCursor()->getStatementGuid()))
+				->say(RdfVocabulary::NS_ONTOLOGY, 'hasViolationForConstraint')
+				->is(RdfVocabulary::NS_STATEMENT,
+					$this->cleanupGuid($checkResult->getConstraint()->getConstraintId()));
 		}
 		$writer->finish();
-		if ( $writtenAny ) {
-			$response->header( "Content-Type: $contentType; charset=UTF-8" );
+		if ($writtenAny) {
+			$response->header("Content-Type: $contentType; charset=UTF-8");
 			echo $writer->drain();
 		} else {
 			// Do not output RDF if we haven't written any actual statements. Output 204 instead
 			$writer->drain();
-			$response->statusHeader( 204 ); // No Content
+			$response->statusHeader(204); // No Content
 		}
 		return null;
 	}

src/Api/CachingResultsSource.php

Spacing +79 added lines, -80 removed lines

@@ -143,7 +143,7 @@ 
 			CheckResult::STATUS_WARNING,
 			CheckResult::STATUS_BAD_PARAMETERS,
 		];
-		$this->cachedStatusesFlipped = array_flip( $this->cachedStatuses );
+		$this->cachedStatusesFlipped = array_flip($this->cachedStatuses);
 	}
 
 	public function getResults(
@@ -154,15 +154,15 @@ 
 	) {
 		$results = [];
 		$metadatas = [];
-		$statusesFlipped = array_flip( $statuses );
-		if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) {
+		$statusesFlipped = array_flip($statuses);
+		if ($this->canUseStoredResults($entityIds, $claimIds, $constraintIds, $statuses)) {
 			$storedEntityIds = [];
-			foreach ( $entityIds as $entityId ) {
-				$storedResults = $this->getStoredResults( $entityId );
-				if ( $storedResults !== null ) {
-					$this->loggingHelper->logCheckConstraintsCacheHit( $entityId );
-					foreach ( $storedResults->getArray() as $checkResult ) {
-						if ( $this->statusSelected( $statusesFlipped, $checkResult ) ) {
+			foreach ($entityIds as $entityId) {
+				$storedResults = $this->getStoredResults($entityId);
+				if ($storedResults !== null) {
+					$this->loggingHelper->logCheckConstraintsCacheHit($entityId);
+					foreach ($storedResults->getArray() as $checkResult) {
+						if ($this->statusSelected($statusesFlipped, $checkResult)) {
 							$results[] = $checkResult;
 						}
 					}
@@ -170,19 +170,19 @@ 
 					$storedEntityIds[] = $entityId;
 				}
 			}
-			$entityIds = array_values( array_diff( $entityIds, $storedEntityIds ) );
+			$entityIds = array_values(array_diff($entityIds, $storedEntityIds));
 		}
-		if ( $entityIds !== [] || $claimIds !== [] ) {
-			if ( $entityIds !== [] ) {
-				$this->loggingHelper->logCheckConstraintsCacheMisses( $entityIds );
+		if ($entityIds !== [] || $claimIds !== []) {
+			if ($entityIds !== []) {
+				$this->loggingHelper->logCheckConstraintsCacheMisses($entityIds);
 			}
-			$response = $this->getAndStoreResults( $entityIds, $claimIds, $constraintIds, $statuses );
-			$results = array_merge( $results, $response->getArray() );
+			$response = $this->getAndStoreResults($entityIds, $claimIds, $constraintIds, $statuses);
+			$results = array_merge($results, $response->getArray());
 			$metadatas[] = $response->getMetadata();
 		}
 		return new CachedCheckResults(
 			$results,
-			Metadata::merge( $metadatas )
+			Metadata::merge($metadatas)
 		);
 	}
 
@@ -205,13 +205,13 @@ 
 		array $constraintIds = null,
 		array $statuses
 	) {
-		if ( $claimIds !== [] ) {
+		if ($claimIds !== []) {
 			return false;
 		}
-		if ( $constraintIds !== null ) {
+		if ($constraintIds !== null) {
 			return false;
 		}
-		if ( array_diff( $statuses, $this->cachedStatuses ) !== [] ) {
+		if (array_diff($statuses, $this->cachedStatuses) !== []) {
 			return false;
 		}
 		return true;
@@ -226,8 +226,8 @@ 
 	 * @param CheckResult $result
 	 * @return bool
 	 */
-	private function statusSelected( array $statusesFlipped, CheckResult $result ) {
-		return array_key_exists( $result->getStatus(), $statusesFlipped ) ||
+	private function statusSelected(array $statusesFlipped, CheckResult $result) {
+		return array_key_exists($result->getStatus(), $statusesFlipped) ||
 			$result instanceof NullResult;
 	}
 
@@ -244,11 +244,11 @@ 
 		array $constraintIds = null,
 		array $statuses
 	) {
-		$results = $this->resultsSource->getResults( $entityIds, $claimIds, $constraintIds, $statuses );
+		$results = $this->resultsSource->getResults($entityIds, $claimIds, $constraintIds, $statuses);
 
-		if ( $this->canStoreResults( $entityIds, $claimIds, $constraintIds, $statuses ) ) {
-			foreach ( $entityIds as $entityId ) {
-				$this->storeResults( $entityId, $results );
+		if ($this->canStoreResults($entityIds, $claimIds, $constraintIds, $statuses)) {
+			foreach ($entityIds as $entityId) {
+				$this->storeResults($entityId, $results);
 			}
 		}
 
@@ -279,10 +279,10 @@ 
 		array $constraintIds = null,
 		array $statuses
 	) {
-		if ( $constraintIds !== null ) {
+		if ($constraintIds !== null) {
 			return false;
 		}
-		if ( array_diff( $this->cachedStatuses, $statuses ) !== [] ) {
+		if (array_diff($this->cachedStatuses, $statuses) !== []) {
 			return false;
 		}
 		return true;
@@ -296,21 +296,21 @@ 
 	 * May include check results for other entity IDs as well,
 	 * or check results with statuses that we’re not interested in caching.
 	 */
-	private function storeResults( EntityId $entityId, CachedCheckResults $results ) {
+	private function storeResults(EntityId $entityId, CachedCheckResults $results) {
 		$latestRevisionIds = $this->getLatestRevisionIds(
 			$results->getMetadata()->getDependencyMetadata()->getEntityIds()
 		);
-		if ( $latestRevisionIds === null ) {
+		if ($latestRevisionIds === null) {
 			return;
 		}
 
 		$resultSerializations = [];
-		foreach ( $results->getArray() as $checkResult ) {
-			if ( $checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization() ) {
+		foreach ($results->getArray() as $checkResult) {
+			if ($checkResult->getContextCursor()->getEntityId() !== $entityId->getSerialization()) {
 				continue;
 			}
-			if ( $this->statusSelected( $this->cachedStatusesFlipped, $checkResult ) ) {
-				$resultSerializations[] = $this->checkResultSerializer->serialize( $checkResult );
+			if ($this->statusSelected($this->cachedStatusesFlipped, $checkResult)) {
+				$resultSerializations[] = $this->checkResultSerializer->serialize($checkResult);
 			}
 		}
 
@@ -319,11 +319,11 @@ 
 			'latestRevisionIds' => $latestRevisionIds,
 		];
 		$futureTime = $results->getMetadata()->getDependencyMetadata()->getFutureTime();
-		if ( $futureTime !== null ) {
+		if ($futureTime !== null) {
 			$value['futureTime'] = $futureTime->getArrayValue();
 		}
 
-		$this->cache->set( $entityId, $value, $this->ttlInSeconds );
+		$this->cache->set($entityId, $value, $this->ttlInSeconds);
 	}
 
 	/**
@@ -337,31 +337,30 @@ 
 		EntityId $entityId,
 		$forRevision = 0
 	) {
-		$value = $this->cache->get( $entityId, $curTTL, [], $asOf );
-		$now = call_user_func( $this->microtime, true );
+		$value = $this->cache->get($entityId, $curTTL, [], $asOf);
+		$now = call_user_func($this->microtime, true);
 
-		$dependencyMetadata = $this->checkDependencyMetadata( $value,
-			[ $entityId->getSerialization() => $forRevision ] );
-		if ( $dependencyMetadata === null ) {
+		$dependencyMetadata = $this->checkDependencyMetadata($value,
+			[$entityId->getSerialization() => $forRevision]);
+		if ($dependencyMetadata === null) {
 			return null;
 		}
 
-		$ageInSeconds = (int)ceil( $now - $asOf );
+		$ageInSeconds = (int) ceil($now - $asOf);
 		$cachingMetadata = $ageInSeconds > 0 ?
-			CachingMetadata::ofMaximumAgeInSeconds( $ageInSeconds ) :
-			CachingMetadata::fresh();
+			CachingMetadata::ofMaximumAgeInSeconds($ageInSeconds) : CachingMetadata::fresh();
 
 		$results = [];
-		foreach ( $value['results'] as $resultSerialization ) {
-			$results[] = $this->deserializeCheckResult( $resultSerialization, $cachingMetadata );
+		foreach ($value['results'] as $resultSerialization) {
+			$results[] = $this->deserializeCheckResult($resultSerialization, $cachingMetadata);
 		}
 
 		return new CachedCheckResults(
 			$results,
-			Metadata::merge( [
-				Metadata::ofCachingMetadata( $cachingMetadata ),
-				Metadata::ofDependencyMetadata( $dependencyMetadata ),
-			] )
+			Metadata::merge([
+				Metadata::ofCachingMetadata($cachingMetadata),
+				Metadata::ofDependencyMetadata($dependencyMetadata),
+			])
 		);
 	}
 
@@ -377,43 +376,43 @@ 
 	 * @return DependencyMetadata|null the dependency metadata,
 	 * or null if $value should no longer be used
 	 */
-	private function checkDependencyMetadata( $value, $paramRevs ) {
-		if ( $value === false ) {
+	private function checkDependencyMetadata($value, $paramRevs) {
+		if ($value === false) {
 			return null;
 		}
 
-		if ( array_key_exists( 'futureTime', $value ) ) {
-			$futureTime = TimeValue::newFromArray( $value['futureTime'] );
-			if ( !$this->timeValueComparer->isFutureTime( $futureTime ) ) {
+		if (array_key_exists('futureTime', $value)) {
+			$futureTime = TimeValue::newFromArray($value['futureTime']);
+			if (!$this->timeValueComparer->isFutureTime($futureTime)) {
 				return null;
 			}
-			$futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime( $futureTime );
+			$futureTimeDependencyMetadata = DependencyMetadata::ofFutureTime($futureTime);
 		} else {
 			$futureTimeDependencyMetadata = DependencyMetadata::blank();
 		}
 
-		foreach ( $paramRevs as $id => $revision ) {
-			if ( $revision > 0 ) {
-				$value['latestRevisionIds'][$id] = min( $revision, $value['latestRevisionIds'][$id] ?? PHP_INT_MAX );
+		foreach ($paramRevs as $id => $revision) {
+			if ($revision > 0) {
+				$value['latestRevisionIds'][$id] = min($revision, $value['latestRevisionIds'][$id] ?? PHP_INT_MAX);
 			}
 		}
 
 		$dependedEntityIds = array_map(
-			[ $this->entityIdParser, "parse" ],
-			array_keys( $value['latestRevisionIds'] )
+			[$this->entityIdParser, "parse"],
+			array_keys($value['latestRevisionIds'])
 		);
 
-		if ( $value['latestRevisionIds'] !== $this->getLatestRevisionIds( $dependedEntityIds ) ) {
+		if ($value['latestRevisionIds'] !== $this->getLatestRevisionIds($dependedEntityIds)) {
 			return null;
 		}
 
 		return array_reduce(
 			$dependedEntityIds,
-			function( DependencyMetadata $metadata, EntityId $entityId ) {
-				return DependencyMetadata::merge( [
+			function(DependencyMetadata $metadata, EntityId $entityId) {
+				return DependencyMetadata::merge([
 					$metadata,
-					DependencyMetadata::ofEntityId( $entityId )
-				] );
+					DependencyMetadata::ofEntityId($entityId)
+				]);
 			},
 			$futureTimeDependencyMetadata
 		);
@@ -433,13 +432,13 @@ 
 		array $resultSerialization,
 		CachingMetadata $cachingMetadata
 	) {
-		$result = $this->checkResultDeserializer->deserialize( $resultSerialization );
-		if ( $this->isPossiblyStaleResult( $result ) ) {
+		$result = $this->checkResultDeserializer->deserialize($resultSerialization);
+		if ($this->isPossiblyStaleResult($result)) {
 			$result->withMetadata(
-				Metadata::merge( [
+				Metadata::merge([
 					$result->getMetadata(),
-					Metadata::ofCachingMetadata( $cachingMetadata ),
-				] )
+					Metadata::ofCachingMetadata($cachingMetadata),
+				])
 			);
 		}
 		return $result;
@@ -449,8 +448,8 @@ 
 	 * @param CheckResult $result
 	 * @return bool
 	 */
-	private function isPossiblyStaleResult( CheckResult $result ) {
-		if ( $result instanceof NullResult ) {
+	private function isPossiblyStaleResult(CheckResult $result) {
+		if ($result instanceof NullResult) {
 			return false;
 		}
 
@@ -465,14 +464,14 @@ 
 	 * @return int[]|null array from entity ID serializations to revision ID,
 	 * or null to indicate that not all revision IDs could be loaded
 	 */
-	private function getLatestRevisionIds( array $entityIds ) {
-		if ( $entityIds === [] ) {
+	private function getLatestRevisionIds(array $entityIds) {
+		if ($entityIds === []) {
 			$this->loggingHelper->logEmptyDependencyMetadata();
 			return [];
 		}
-		if ( count( $entityIds ) > $this->maxRevisionIds ) {
+		if (count($entityIds) > $this->maxRevisionIds) {
 			// one of those entities will probably be edited soon, so might as well skip caching
-			$this->loggingHelper->logHugeDependencyMetadata( $entityIds, $this->maxRevisionIds );
+			$this->loggingHelper->logHugeDependencyMetadata($entityIds, $this->maxRevisionIds);
 			return null;
 		}
 
@@ -480,7 +479,7 @@ 
 			$entityIds,
 			EntityRevisionLookup::LATEST_FROM_REPLICA
 		);
-		if ( $this->hasFalseElements( $latestRevisionIds ) ) {
+		if ($this->hasFalseElements($latestRevisionIds)) {
 			return null;
 		}
 		return $latestRevisionIds;
@@ -490,8 +489,8 @@ 
 	 * @param array $array
 	 * @return bool
 	 */
-	private function hasFalseElements( array $array ) {
-		return in_array( false, $array, true );
+	private function hasFalseElements(array $array) {
+		return in_array(false, $array, true);
 	}
 
 	/**
@@ -499,7 +498,7 @@ 
 	 *
 	 * @param callable $microtime
 	 */
-	public function setMicrotimeFunction( callable $microtime ) {
+	public function setMicrotimeFunction(callable $microtime) {
 		$this->microtime = $microtime;
 	}