wikimedia / mediawiki-extensions-WikibaseQualityConstraints

src/Api/CachingResultsSource.php

Spacing +77 added lines, -78 removed lines

@@ -143,14 +143,14 @@ 
 	) {
 		$results = [];
 		$metadatas = [];
-		if ( $this->canUseStoredResults( $entityIds, $claimIds, $constraintIds, $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( $statuses, $checkResult ) ) {
+			foreach ($entityIds as $entityId) {
+				$storedResults = $this->getStoredResults($entityId);
+				if ($storedResults !== null) {
+					$this->loggingHelper->logCheckConstraintsCacheHit($entityId);
+					foreach ($storedResults->getArray() as $checkResult) {
+						if ($this->statusSelected($statuses, $checkResult)) {
 							$results[] = $checkResult;
 						}
 					}
@@ -158,19 +158,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)
 		);
 	}
 
@@ -193,13 +193,13 @@ 
 		?array $constraintIds,
 		array $statuses
 	) {
-		if ( $claimIds !== [] ) {
+		if ($claimIds !== []) {
 			return false;
 		}
-		if ( $constraintIds !== null ) {
+		if ($constraintIds !== null) {
 			return false;
 		}
-		if ( array_diff( $statuses, self::CACHED_STATUSES ) !== [] ) {
+		if (array_diff($statuses, self::CACHED_STATUSES) !== []) {
 			return false;
 		}
 		return true;
@@ -214,8 +214,8 @@ 
 	 * @param CheckResult $result
 	 * @return bool
 	 */
-	private function statusSelected( array $statuses, CheckResult $result ) {
-		return in_array( $result->getStatus(), $statuses, true ) ||
+	private function statusSelected(array $statuses, CheckResult $result) {
+		return in_array($result->getStatus(), $statuses, true) ||
 			$result instanceof NullResult;
 	}
 
@@ -232,11 +232,11 @@ 
 		?array $constraintIds,
 		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);
 			}
 		}
 
@@ -267,10 +267,10 @@ 
 		?array $constraintIds,
 		array $statuses
 	) {
-		if ( $constraintIds !== null ) {
+		if ($constraintIds !== null) {
 			return false;
 		}
-		if ( array_diff( self::CACHED_STATUSES, $statuses ) !== [] ) {
+		if (array_diff(self::CACHED_STATUSES, $statuses) !== []) {
 			return false;
 		}
 		return true;
@@ -284,21 +284,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( self::CACHED_STATUSES, $checkResult ) ) {
-				$resultSerializations[] = $this->checkResultSerializer->serialize( $checkResult );
+			if ($this->statusSelected(self::CACHED_STATUSES, $checkResult)) {
+				$resultSerializations[] = $this->checkResultSerializer->serialize($checkResult);
 			}
 		}
 
@@ -307,11 +307,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);
 	}
 
 	/**
@@ -325,31 +325,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),
+			])
 		);
 	}
 
@@ -365,43 +364,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
 		);
@@ -421,13 +420,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;
@@ -437,8 +436,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;
 		}
 
@@ -453,14 +452,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;
 		}
 
@@ -468,7 +467,7 @@ 
 			$entityIds,
 			Store::LATEST_FROM_REPLICA
 		);
-		if ( $this->hasFalseElements( $latestRevisionIds ) ) {
+		if ($this->hasFalseElements($latestRevisionIds)) {
 			return null;
 		}
 		return $latestRevisionIds;
@@ -478,8 +477,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);
 	}
 
 	/**
@@ -487,7 +486,7 @@ 
 	 *
 	 * @param callable $microtime
 	 */
-	public function setMicrotimeFunction( callable $microtime ) {
+	public function setMicrotimeFunction(callable $microtime) {
 		$this->microtime = $microtime;
 	}
 

src/Job/UpdateConstraintsTableJob.php

Spacing +20 added lines, -20 removed lines

@@ -31,8 +31,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,
@@ -41,7 +41,7 @@ 
 			$params['revisionId'] ?? null,
 			MediaWikiServices::getInstance()->getMainConfig(),
 			ConstraintsServices::getConstraintStore(),
-			$repo->getEntityRevisionLookup( Store::LOOKUP_CACHING_DISABLED ),
+			$repo->getEntityRevisionLookup(Store::LOOKUP_CACHING_DISABLED),
 			$repo->getBaseDataModelSerializerFactory()->newSnakSerializer()
 		);
 	}
@@ -96,7 +96,7 @@ 
 		EntityRevisionLookup $entityRevisionLookup,
 		Serializer $snakSerializer
 	) {
-		parent::__construct( 'constraintsTableUpdate', $title, $params );
+		parent::__construct('constraintsTableUpdate', $title, $params);
 
 		$this->propertyId = $propertyId;
 		$this->revisionId = $revisionId;
@@ -106,11 +106,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;
@@ -127,7 +127,7 @@ 
 		'@phan-var \Wikibase\DataModel\Entity\EntityIdValue $dataValue';
 		$entityId = $dataValue->getEntityId();
 		$constraintTypeQid = $entityId->getSerialization();
-		$parameters = $this->extractParametersFromQualifiers( $constraintStatement->getQualifiers() );
+		$parameters = $this->extractParametersFromQualifiers($constraintStatement->getQualifiers());
 		return new Constraint(
 			$constraintId,
 			$propertyId,
@@ -142,17 +142,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 ) {
-				$constraintStore->insertBatch( $constraints );
+		foreach ($constraintsStatements->getIterator() as $constraintStatement) {
+			$constraints[] = $this->extractConstraintFromStatement($property->getId(), $constraintStatement);
+			if (count($constraints) >= self::BATCH_SIZE) {
+				$constraintStore->insertBatch($constraints);
 				$constraints = [];
 			}
 		}
-		$constraintStore->insertBatch( $constraints );
+		$constraintStore->insertBatch($constraints);
 	}
 
 	/**
@@ -163,19 +163,19 @@ 
 	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
 			Store::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->constraintStore->deleteForProperty( $propertyId );
+		$this->constraintStore->deleteForProperty($propertyId);
 
 		/** @var Property $property */
 		$property = $propertyRevision->getEntity();
@@ -183,7 +183,7 @@ 
 		$this->importConstraintsForProperty(
 			$property,
 			$this->constraintStore,
-			new PropertyId( $this->config->get( 'WBQualityConstraintsPropertyConstraintId' ) )
+			new PropertyId($this->config->get('WBQualityConstraintsPropertyConstraintId'))
 		);
 
 		return true;